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

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

Issue 1602523004: Added EncodedImage::GetBufferPaddingBytes. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 0 additional bytes, make ios compile Created 4 years, 11 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
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/modules/video_coding/codecs/h264/include/h264.h" 12 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
13 13
14 #if defined(WEBRTC_IOS) 14 #if defined(WEBRTC_IOS)
15 #include "webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.h" 15 #include "webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.h"
16 #include "webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h" 16 #include "webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h"
17 #endif 17 #endif
18 18
19 #include "webrtc/base/checks.h" 19 #include "webrtc/base/checks.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 22
23 // TODO(hbos): The FFmpeg video decoder will require up to 8 bytes, update this
24 // when the FFmpeg decoder is added.
stefan-webrtc 2016/01/19 15:06:20 Should we also file a bug to the ffmpeg project? S
hbos 2016/01/19 16:50:34 It is documented in their source code (https://cod
stefan-webrtc 2016/01/21 10:34:47 I think we should at least ask whether they would
hbos 2016/01/21 11:17:26 Agreed, I created a ticket (https://trac.ffmpeg.or
25 const size_t kEncodedImagePaddingH264 = 0;
26
23 // We need this file to be C++ only so it will compile properly for all 27 // We need this file to be C++ only so it will compile properly for all
24 // platforms. In order to write ObjC specific implementations we use private 28 // platforms. In order to write ObjC specific implementations we use private
25 // externs. This function is defined in h264.mm. 29 // externs. This function is defined in h264.mm.
26 #if defined(WEBRTC_IOS) 30 #if defined(WEBRTC_IOS)
27 extern bool IsH264CodecSupportedObjC(); 31 extern bool IsH264CodecSupportedObjC();
28 #endif 32 #endif
29 33
30 bool IsH264CodecSupported() { 34 bool IsH264CodecSupported() {
31 #if defined(WEBRTC_IOS) 35 #if defined(WEBRTC_IOS)
32 return IsH264CodecSupportedObjC(); 36 return IsH264CodecSupportedObjC();
(...skipping 24 matching lines...) Expand all
57 RTC_NOTREACHED(); 61 RTC_NOTREACHED();
58 return nullptr; 62 return nullptr;
59 #endif 63 #endif
60 } 64 }
61 65
62 bool H264Decoder::IsSupported() { 66 bool H264Decoder::IsSupported() {
63 return IsH264CodecSupported(); 67 return IsH264CodecSupported();
64 } 68 }
65 69
66 } // namespace webrtc 70 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698