H.264 video codec support using OpenH264 (http://www.openh264.org/) for encoding and FFmpeg (https://www.ffmpeg.org/) for decoding.
It works on all platforms except Android and iOS (FFmpeg limitation). Implemented behind compile time flags, off by default. The plan is to have it enabled in Chrome (see bug), but not in Chromium/webrtc by default. Flags to turn it on: - rtc_use_h264 = true - ffmpeg_branding = "Chrome" (or other brand that includes H.264 decoder) Tests using H264: - video_loopback --codec=H264 - screenshare_loopback --codec=H264 - video_engine_tests (EndToEndTest.SendsAndReceivesH264) NOTRY=True BUG=500605, 468365 BUG=https://bugs.chromium.org/p/webrtc/issues/detail?id=5424 Review URL: https://codereview.webrtc.org/1306813009 Cr-Commit-Position: refs/heads/master@{#11390}
This commit is contained in:
@ -11,12 +11,17 @@
|
||||
|
||||
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
|
||||
|
||||
#if defined(WEBRTC_THIRD_PARTY_H264)
|
||||
#include "webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h"
|
||||
#include "webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h"
|
||||
#endif
|
||||
#if defined(WEBRTC_IOS)
|
||||
#include "webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.h"
|
||||
#include "webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h"
|
||||
#endif
|
||||
|
||||
#include "webrtc/base/checks.h"
|
||||
#include "webrtc/base/logging.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
@ -27,9 +32,15 @@ namespace webrtc {
|
||||
extern bool IsH264CodecSupportedObjC();
|
||||
#endif
|
||||
|
||||
// If any H.264 codec is supported (iOS HW or OpenH264/FFmpeg).
|
||||
bool IsH264CodecSupported() {
|
||||
#if defined(WEBRTC_IOS)
|
||||
return IsH264CodecSupportedObjC();
|
||||
if (IsH264CodecSupportedObjC()) {
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
#if defined(WEBRTC_THIRD_PARTY_H264)
|
||||
return true;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
@ -38,7 +49,14 @@ bool IsH264CodecSupported() {
|
||||
H264Encoder* H264Encoder::Create() {
|
||||
RTC_DCHECK(H264Encoder::IsSupported());
|
||||
#if defined(WEBRTC_IOS) && defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
|
||||
return new H264VideoToolboxEncoder();
|
||||
if (IsH264CodecSupportedObjC()) {
|
||||
LOG(LS_INFO) << "Creating H264VideoToolboxEncoder.";
|
||||
return new H264VideoToolboxEncoder();
|
||||
}
|
||||
#endif
|
||||
#if defined(WEBRTC_THIRD_PARTY_H264)
|
||||
LOG(LS_INFO) << "Creating H264EncoderImpl.";
|
||||
return new H264EncoderImpl();
|
||||
#else
|
||||
RTC_NOTREACHED();
|
||||
return nullptr;
|
||||
@ -52,7 +70,14 @@ bool H264Encoder::IsSupported() {
|
||||
H264Decoder* H264Decoder::Create() {
|
||||
RTC_DCHECK(H264Decoder::IsSupported());
|
||||
#if defined(WEBRTC_IOS) && defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
|
||||
return new H264VideoToolboxDecoder();
|
||||
if (IsH264CodecSupportedObjC()) {
|
||||
LOG(LS_INFO) << "Creating H264VideoToolboxDecoder.";
|
||||
return new H264VideoToolboxDecoder();
|
||||
}
|
||||
#endif
|
||||
#if defined(WEBRTC_THIRD_PARTY_H264)
|
||||
LOG(LS_INFO) << "Creating H264DecoderImpl.";
|
||||
return new H264DecoderImpl();
|
||||
#else
|
||||
RTC_NOTREACHED();
|
||||
return nullptr;
|
||||
|
||||
Reference in New Issue
Block a user