H.264 video codec support using OpenH264/FFmpeg

talk/media/webrtc/webrtcvideoengine2_unittest.cc

Index: talk/media/webrtc/webrtcvideoengine2_unittest.cc
diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.cc b/talk/media/webrtc/webrtcvideoengine2_unittest.cc
index e488ad70ad7ed789fad8d3b6ee8db4c8019200f2..587bbd7fded7b63a7fa2f00ab650a5adce80f310 100644
--- a/talk/media/webrtc/webrtcvideoengine2_unittest.cc
+++ b/talk/media/webrtc/webrtcvideoengine2_unittest.cc
@@ -670,7 +670,8 @@ TEST_F(WebRtcVideoEngine2Test, SimulcastDisabledForH264) {
 // Test external codec with be added to the end of the supported codec list.
 TEST_F(WebRtcVideoEngine2Test, ReportSupportedExternalCodecs) {
   cricket::FakeWebRtcVideoEncoderFactory encoder_factory;
-  encoder_factory.AddSupportedVideoCodecType(webrtc::kVideoCodecH264, "H264");
+  encoder_factory.AddSupportedVideoCodecType(webrtc::kVideoCodecUnknown,
+                                             "FakeExternalCodec");
   engine_.SetExternalEncoderFactory(&encoder_factory);
   engine_.Init();
 
@@ -681,7 +682,7 @@ TEST_F(WebRtcVideoEngine2Test, ReportSupportedExternalCodecs) {
 
   // The external codec will appear at last.
   EXPECT_EQ("VP8", internal_codec.name);
-  EXPECT_EQ("H264", external_codec.name);
+  EXPECT_EQ("FakeExternalCodec", external_codec.name);

[hbos, 2015/09/15 15:25:34]

(This test was assuming H264 was not an "internal" codec, changed to bogus codec
that will always be an "external" codec so that test passes even if OpenH264 is
enabled.)

 }
 
 TEST_F(WebRtcVideoEngine2Test, RegisterExternalDecodersIfSupported) {