From d5a2d9ad0cbfa38f58582c19920c24733059d2a2 Mon Sep 17 00:00:00 2001 From: zstein Date: Mon, 6 Mar 2017 12:09:24 -0800 Subject: [PATCH] WebRtcVideoChannel2Test::SetRecvCodecsAcceptsMultipleVideoCodecs passes now. WebRtcVideoChannel2Test::SetRecvCodecsSetsFecForAllVideoCodecs was never fully implemented and hasn't been touched in over a year. BUG=NONE Review-Url: https://codereview.webrtc.org/2736483002 Cr-Commit-Position: refs/heads/master@{#17075} --- webrtc/media/engine/webrtcvideoengine2_unittest.cc | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/webrtc/media/engine/webrtcvideoengine2_unittest.cc b/webrtc/media/engine/webrtcvideoengine2_unittest.cc index 62e1ea760c..bf5537f161 100644 --- a/webrtc/media/engine/webrtcvideoengine2_unittest.cc +++ b/webrtc/media/engine/webrtcvideoengine2_unittest.cc @@ -2973,24 +2973,13 @@ TEST_F(WebRtcVideoChannel2Test, SetRecvCodecsRejectUnsupportedCodec) { EXPECT_FALSE(channel_->SetRecvParameters(parameters)); } -// TODO(pbos): Enable VP9 through external codec support -TEST_F(WebRtcVideoChannel2Test, - DISABLED_SetRecvCodecsAcceptsMultipleVideoCodecs) { +TEST_F(WebRtcVideoChannel2Test, SetRecvCodecsAcceptsMultipleVideoCodecs) { cricket::VideoRecvParameters parameters; parameters.codecs.push_back(GetEngineCodec("VP8")); parameters.codecs.push_back(GetEngineCodec("VP9")); EXPECT_TRUE(channel_->SetRecvParameters(parameters)); } -TEST_F(WebRtcVideoChannel2Test, - DISABLED_SetRecvCodecsSetsFecForAllVideoCodecs) { - cricket::VideoRecvParameters parameters; - parameters.codecs.push_back(GetEngineCodec("VP8")); - parameters.codecs.push_back(GetEngineCodec("VP9")); - EXPECT_TRUE(channel_->SetRecvParameters(parameters)); - FAIL(); // TODO(pbos): Verify that the FEC parameters are set for all codecs. -} - TEST_F(WebRtcVideoChannel2Test, SetRecvCodecsWithoutFecDisablesFec) { cricket::VideoSendParameters send_parameters; send_parameters.codecs.push_back(GetEngineCodec("VP8"));