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

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

Issue 2623513002: Explicitly only add transport-cc RTCP feedback param to default FlexFEC codec. (Closed)
Patch Set: Created 3 years, 11 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: 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();
« webrtc/media/engine/webrtcvideoengine2.cc ('K') | « webrtc/media/engine/webrtcvideoengine2.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698