commit bab934bffe5c4b7e5cd6e8fee2c9c2682002d59b
author hbos <hbos@webrtc.org> Wed Jan 27 09:36:03 2016
committer Commit bot <commit-bot@chromium.org> Wed Jan 27 09:36:07 2016
tree 66acffccc61eabcf460ad2df268045a40a99c0b8
parent fab0a2886d7ad3d664d1ef4d1c92190514c57764

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}

webrtc/test/encoder_settings.cc

diff --git a/webrtc/test/encoder_settings.cc b/webrtc/test/encoder_settings.cc
index bae1350..64339df 100644
--- a/webrtc/test/encoder_settings.cc
+++ b/webrtc/test/encoder_settings.cc
@@ -58,7 +58,9 @@
   VideoReceiveStream::Decoder decoder;
   decoder.payload_type = encoder_settings.payload_type;
   decoder.payload_name = encoder_settings.payload_name;
-  if (encoder_settings.payload_name == "VP8") {
+  if (encoder_settings.payload_name == "H264") {
+    decoder.decoder = VideoDecoder::Create(VideoDecoder::kH264);
+  } else if (encoder_settings.payload_name == "VP8") {
     decoder.decoder = VideoDecoder::Create(VideoDecoder::kVp8);
   } else if (encoder_settings.payload_name == "VP9") {
     decoder.decoder = VideoDecoder::Create(VideoDecoder::kVp9);