From f22374652197d6526b30d59d795ac06bfb99f741 Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Tue, 29 Apr 2014 12:38:42 +0000 Subject: [PATCH] Upping start bitrate to min, if set to a lower value i SetSendCodec. BUG=3276 R=stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/21379005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6014 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../test/auto_test/source/vie_autotest_codec.cc | 7 +++++++ webrtc/video_engine/vie_codec_impl.cc | 3 +++ 2 files changed, 10 insertions(+) diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_codec.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_codec.cc index d806b47b4c..93738c2a17 100644 --- a/webrtc/video_engine/test/auto_test/source/vie_autotest_codec.cc +++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_codec.cc @@ -510,6 +510,13 @@ void ViEAutoTest::ViECodecAPITest() { break; } } + const unsigned int kMinBitrate = 123; + video_codec.minBitrate = kMinBitrate; + video_codec.startBitrate = 50; + EXPECT_EQ(0, codec->SetSendCodec(video_channel, video_codec)); + EXPECT_EQ(0, codec->GetSendCodec(video_channel, video_codec)); + EXPECT_EQ(kMinBitrate, video_codec.startBitrate); + memset(&video_codec, 0, sizeof(video_codec)); EXPECT_EQ(0, codec->GetSendCodec(video_channel, video_codec)); EXPECT_EQ(webrtc::kVideoCodecVP8, video_codec.codecType); diff --git a/webrtc/video_engine/vie_codec_impl.cc b/webrtc/video_engine/vie_codec_impl.cc index 9ea3c9c09a..3ba56de54d 100644 --- a/webrtc/video_engine/vie_codec_impl.cc +++ b/webrtc/video_engine/vie_codec_impl.cc @@ -169,6 +169,9 @@ int ViECodecImpl::SetSendCodec(const int video_channel, LOG(LS_INFO) << "New max bitrate set " << video_codec_internal.maxBitrate; } + if (video_codec_internal.startBitrate < video_codec_internal.minBitrate) { + video_codec_internal.startBitrate = video_codec_internal.minBitrate; + } if (video_codec_internal.startBitrate > video_codec_internal.maxBitrate) { video_codec_internal.startBitrate = video_codec_internal.maxBitrate; }