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

Unified Diff: talk/media/webrtc/webrtcvideoengine2_unittest.cc

Issue 1306813009: H.264 video codec support using OpenH264/FFmpeg (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Re-enable H264 in video_loopback and screenshare_loopback after rebase (video_quality_test) Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: talk/media/webrtc/webrtcvideoengine2_unittest.cc
diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.cc b/talk/media/webrtc/webrtcvideoengine2_unittest.cc
index 247ba96a193e4ffc70600d9e643bd3e385643c5a..2dcf1b8be76b3318d022665ba0b1ce86c0df8af9 100644
--- a/talk/media/webrtc/webrtcvideoengine2_unittest.cc
+++ b/talk/media/webrtc/webrtcvideoengine2_unittest.cc
@@ -708,10 +708,11 @@ TEST_F(WebRtcVideoEngine2Test, SimulcastDisabledForH264) {
EXPECT_EQ(1u, encoder->GetCodecSettings().numberOfSimulcastStreams);
}
-// Test external codec with be added to the end of the supported codec list.
+// Test that external codecs are 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();
@@ -722,7 +723,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);
}
TEST_F(WebRtcVideoEngine2Test, RegisterExternalDecodersIfSupported) {

Powered by Google App Engine
This is Rietveld 408576698