Index: webrtc/media/engine/webrtcvideoengine2_unittest.cc |
diff --git a/webrtc/media/engine/webrtcvideoengine2_unittest.cc b/webrtc/media/engine/webrtcvideoengine2_unittest.cc |
index 5944883e1c20d68b799e20d7dfcb59b94e7ddb77..f3816e682f6fa6c6d745d94bd02b6236017fb4f7 100644 |
--- a/webrtc/media/engine/webrtcvideoengine2_unittest.cc |
+++ b/webrtc/media/engine/webrtcvideoengine2_unittest.cc |
@@ -50,7 +50,8 @@ cricket::VideoCodec RemoveFeedbackParams(cricket::VideoCodec&& codec) { |
return codec; |
} |
-void VerifyCodecHasDefaultFeedbackParams(const cricket::VideoCodec& codec) { |
+void VerifyCodecHasDefaultMediaFeedbackParams( |
+ const cricket::VideoCodec& codec) { |
EXPECT_TRUE(codec.HasFeedbackParam(cricket::FeedbackParam( |
cricket::kRtcpFbParamNack, cricket::kParamValueEmpty))); |
EXPECT_TRUE(codec.HasFeedbackParam(cricket::FeedbackParam( |
@@ -1533,7 +1534,7 @@ TEST_F(WebRtcVideoChannel2Test, TransportCcCanBeEnabledAndDisabled) { |
} |
TEST_F(WebRtcVideoChannel2Test, NackIsEnabledByDefault) { |
- VerifyCodecHasDefaultFeedbackParams(default_codec_); |
+ VerifyCodecHasDefaultMediaFeedbackParams(default_codec_); |
cricket::VideoSendParameters parameters; |
parameters.codecs = engine_.codecs(); |
@@ -2370,6 +2371,16 @@ class WebRtcVideoChannel2FlexfecTest : public WebRtcVideoChannel2Test { |
// TODO(brandtr): Merge into "non-field trial" test when FlexFEC is enabled |
// by default. |
+TEST_F(WebRtcVideoChannel2FlexfecTest, |
+ DefaultFlexfecCodecHasTransportCcFeedbackParam) { |
+ EXPECT_TRUE( |
+ GetEngineCodec("flexfec-03") |
+ .HasFeedbackParam(cricket::FeedbackParam( |
+ cricket::kRtcpFbParamTransportCc, cricket::kParamValueEmpty))); |
+} |
+ |
+// TODO(brandtr): Merge into "non-field trial" test when FlexFEC is enabled |
+// by default. |
TEST_F(WebRtcVideoChannel2FlexfecTest, SetDefaultSendCodecsWithoutSsrc) { |
FakeVideoSendStream* stream = AddSendStream(); |
webrtc::VideoSendStream::Config config = stream->GetConfig().Copy(); |