Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(252)

Side by Side Diff: webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.cc

Issue 2808333006: Don't make a top-level namespace called "internal" (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 * 9 *
10 */ 10 */
11 11
12 #include "webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.h" 12 #include "webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.h"
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #if defined(WEBRTC_IOS) 16 #if defined(WEBRTC_IOS)
17 #include "RTCUIApplication.h" 17 #include "RTCUIApplication.h"
18 #endif 18 #endif
19 #include "libyuv/convert.h" 19 #include "libyuv/convert.h"
20 #include "webrtc/api/video/video_frame.h" 20 #include "webrtc/api/video/video_frame.h"
21 #include "webrtc/base/checks.h" 21 #include "webrtc/base/checks.h"
22 #include "webrtc/base/logging.h" 22 #include "webrtc/base/logging.h"
23 #include "webrtc/common_video/include/corevideo_frame_buffer.h" 23 #include "webrtc/common_video/include/corevideo_frame_buffer.h"
24 #include "webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_nalu.h" 24 #include "webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_nalu.h"
25 #include "webrtc/video_frame.h" 25 #include "webrtc/video_frame.h"
26 26
27 namespace webrtc {
27 namespace internal { 28 namespace internal {
magjed_webrtc 2017/04/13 09:35:44 Can you make this an anonymous namespace instead?
kwiberg-webrtc 2017/04/13 11:49:03 Done.
28 29
29 static const int64_t kMsPerSec = 1000; 30 static const int64_t kMsPerSec = 1000;
30 31
31 // Convenience function for creating a dictionary. 32 // Convenience function for creating a dictionary.
32 inline CFDictionaryRef CreateCFDictionary(CFTypeRef* keys, 33 inline CFDictionaryRef CreateCFDictionary(CFTypeRef* keys,
33 CFTypeRef* values, 34 CFTypeRef* values,
34 size_t size) { 35 size_t size) {
35 return CFDictionaryCreate(nullptr, keys, values, size, 36 return CFDictionaryCreate(nullptr, keys, values, size,
36 &kCFTypeDictionaryKeyCallBacks, 37 &kCFTypeDictionaryKeyCallBacks,
37 &kCFTypeDictionaryValueCallBacks); 38 &kCFTypeDictionaryValueCallBacks);
(...skipping 27 matching lines...) Expand all
65 rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer = 66 rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer =
66 new rtc::RefCountedObject<webrtc::CoreVideoFrameBuffer>(image_buffer); 67 new rtc::RefCountedObject<webrtc::CoreVideoFrameBuffer>(image_buffer);
67 webrtc::VideoFrame decoded_frame(buffer, decode_params->timestamp, 68 webrtc::VideoFrame decoded_frame(buffer, decode_params->timestamp,
68 CMTimeGetSeconds(timestamp) * kMsPerSec, 69 CMTimeGetSeconds(timestamp) * kMsPerSec,
69 webrtc::kVideoRotation_0); 70 webrtc::kVideoRotation_0);
70 decode_params->callback->Decoded(decoded_frame); 71 decode_params->callback->Decoded(decoded_frame);
71 } 72 }
72 73
73 } // namespace internal 74 } // namespace internal
74 75
75 namespace webrtc {
76
77 H264VideoToolboxDecoder::H264VideoToolboxDecoder() 76 H264VideoToolboxDecoder::H264VideoToolboxDecoder()
78 : callback_(nullptr), 77 : callback_(nullptr),
79 video_format_(nullptr), 78 video_format_(nullptr),
80 decompression_session_(nullptr) {} 79 decompression_session_(nullptr) {}
81 80
82 H264VideoToolboxDecoder::~H264VideoToolboxDecoder() { 81 H264VideoToolboxDecoder::~H264VideoToolboxDecoder() {
83 DestroyDecompressionSession(); 82 DestroyDecompressionSession();
84 SetVideoFormat(nullptr); 83 SetVideoFormat(nullptr);
85 } 84 }
86 85
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 if (video_format_) { 268 if (video_format_) {
270 CFRetain(video_format_); 269 CFRetain(video_format_);
271 } 270 }
272 } 271 }
273 272
274 const char* H264VideoToolboxDecoder::ImplementationName() const { 273 const char* H264VideoToolboxDecoder::ImplementationName() const {
275 return "VideoToolbox"; 274 return "VideoToolbox";
276 } 275 }
277 276
278 } // namespace webrtc 277 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698