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

Side by Side Diff: webrtc/modules/video_coding/codecs/h264/include/h264.h

Issue 2474993002: Pass selected cricket::VideoCodec down to internal H264 encoder (Closed)
Patch Set: Fix includes. Created 4 years 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 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_H_ 12 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_H_
13 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_H_ 13 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_H_
14 14
15 #if defined(WEBRTC_IOS) || defined(WEBRTC_MAC) 15 #include "webrtc/media/base/codec.h"
16
17 #include <Availability.h>
18 #if defined(WEBRTC_IOS) || \
19 defined(__MAC_10_8) && __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_8
20 #define WEBRTC_VIDEO_TOOLBOX_SUPPORTED 1
21 #endif
22
23 #endif // defined(WEBRTC_IOS) || defined(WEBRTC_MAC)
24
25 #include "webrtc/modules/video_coding/include/video_codec_interface.h" 16 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
26 17
27 namespace webrtc { 18 namespace webrtc {
28 19
29 // Set to disable the H.264 encoder/decoder implementations that are provided if 20 // Set to disable the H.264 encoder/decoder implementations that are provided if
30 // |rtc_use_h264| build flag is true (if false, this function does nothing). 21 // |rtc_use_h264| build flag is true (if false, this function does nothing).
31 // This function should only be called before or during WebRTC initialization 22 // This function should only be called before or during WebRTC initialization
32 // and is not thread-safe. 23 // and is not thread-safe.
33 void DisableRtcUseH264(); 24 void DisableRtcUseH264();
34 25
35 class H264Encoder : public VideoEncoder { 26 class H264Encoder : public VideoEncoder {
36 public: 27 public:
37 static H264Encoder* Create(); 28 static H264Encoder* Create(const cricket::VideoCodec& codec);
38 // If H.264 is supported (any implementation). 29 // If H.264 is supported (any implementation).
39 static bool IsSupported(); 30 static bool IsSupported();
40 31
41 ~H264Encoder() override {} 32 ~H264Encoder() override {}
42 }; 33 };
43 34
44 class H264Decoder : public VideoDecoder { 35 class H264Decoder : public VideoDecoder {
45 public: 36 public:
46 static H264Decoder* Create(); 37 static H264Decoder* Create();
47 static bool IsSupported(); 38 static bool IsSupported();
48 39
49 ~H264Decoder() override {} 40 ~H264Decoder() override {}
50 }; 41 };
51 42
52 } // namespace webrtc 43 } // namespace webrtc
53 44
54 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_H_ 45 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_INCLUDE_H264_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698