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

Side by Side Diff: webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc

Issue 2483273002: Revert of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (Closed)
Patch Set: Created 4 years, 1 month 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
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/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.h"
13
14 #if defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
13 15
14 #include <memory> 16 #include <memory>
15 17
16 #if defined(WEBRTC_IOS) 18 #if defined(WEBRTC_IOS)
17 #include "RTCUIApplication.h" 19 #include "RTCUIApplication.h"
18 #endif 20 #endif
19 #include "libyuv/convert.h" 21 #include "libyuv/convert.h"
20 #include "webrtc/base/checks.h" 22 #include "webrtc/base/checks.h"
21 #include "webrtc/base/logging.h" 23 #include "webrtc/base/logging.h"
22 #include "webrtc/common_video/include/corevideo_frame_buffer.h" 24 #include "webrtc/common_video/include/corevideo_frame_buffer.h"
23 #include "webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_nalu.h" 25 #include "webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_nalu.h"
24 #include "webrtc/video_frame.h" 26 #include "webrtc/video_frame.h"
25 27
26 namespace internal { 28 namespace internal {
27 29
28 static const int64_t kMsPerSec = 1000; 30 static const int64_t kMsPerSec = 1000;
29 31
30 // Convenience function for creating a dictionary. 32 // Convenience function for creating a dictionary.
31 inline CFDictionaryRef CreateCFDictionary(CFTypeRef* keys, 33 inline CFDictionaryRef CreateCFDictionary(CFTypeRef* keys,
32 CFTypeRef* values, 34 CFTypeRef* values,
33 size_t size) { 35 size_t size) {
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 if (video_format_) { 270 if (video_format_) {
269 CFRetain(video_format_); 271 CFRetain(video_format_);
270 } 272 }
271 } 273 }
272 274
273 const char* H264VideoToolboxDecoder::ImplementationName() const { 275 const char* H264VideoToolboxDecoder::ImplementationName() const {
274 return "VideoToolbox"; 276 return "VideoToolbox";
275 } 277 }
276 278
277 } // namespace webrtc 279 } // namespace webrtc
280
281 #endif // defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698