Remove min bitrate from simulcast streams.
Bitrates are still set using SetBitrateConfig() either way, and this code causes assertion failures in VideoSendStream::ReconfigureVideoEncoder: Assertion `streams[i].target_bitrate_bps >= streams[i].min_bitrate_bps' failed. R=pthatcher@webrtc.org BUG=1788 Review URL: https://webrtc-codereview.appspot.com/38529004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7990 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
bac0012120
commit
896888b7e4
@ -235,7 +235,6 @@ std::vector<webrtc::VideoStream> GetSimulcastConfig(
|
||||
SimulcastBitrateMode bitrate_mode,
|
||||
int width,
|
||||
int height,
|
||||
int min_bitrate_bps,
|
||||
int max_bitrate_bps,
|
||||
int max_qp,
|
||||
int max_framerate) {
|
||||
@ -286,11 +285,6 @@ std::vector<webrtc::VideoStream> GetSimulcastConfig(
|
||||
streams.back().max_bitrate_bps += bitrate_left_bps;
|
||||
}
|
||||
|
||||
// Make sure the first stream respects the bitrate minimum.
|
||||
if (streams[0].min_bitrate_bps < min_bitrate_bps) {
|
||||
streams[0].min_bitrate_bps = min_bitrate_bps;
|
||||
}
|
||||
|
||||
return streams;
|
||||
}
|
||||
|
||||
@ -303,7 +297,6 @@ bool ConfigureSimulcastCodec(
|
||||
bitrate_mode,
|
||||
static_cast<int>(codec->width),
|
||||
static_cast<int>(codec->height),
|
||||
codec->minBitrate * 1000,
|
||||
codec->maxBitrate * 1000,
|
||||
codec->qpMax,
|
||||
codec->maxFramerate);
|
||||
|
@ -81,7 +81,6 @@ std::vector<webrtc::VideoStream> GetSimulcastConfig(
|
||||
SimulcastBitrateMode bitrate_mode,
|
||||
int width,
|
||||
int height,
|
||||
int min_bitrate_bps,
|
||||
int max_bitrate_bps,
|
||||
int max_qp,
|
||||
int max_framerate);
|
||||
|
@ -208,7 +208,6 @@ WebRtcVideoEncoderFactory2::CreateSimulcastVideoStreams(
|
||||
GetSimulcastBitrateMode(options),
|
||||
codec.width,
|
||||
codec.height,
|
||||
min_bitrate_kbps * 1000,
|
||||
max_bitrate_kbps * 1000,
|
||||
max_qp,
|
||||
codec.framerate != 0 ? codec.framerate : kDefaultVideoMaxFramerate);
|
||||
|
@ -43,7 +43,6 @@
|
||||
namespace {
|
||||
static const int kDefaultQpMax = 56;
|
||||
static const int kDefaultFramerate = 30;
|
||||
static const int kMinBitrateBps = 30000;
|
||||
|
||||
static const cricket::VideoCodec kVp8Codec720p(100, "VP8", 1280, 720, 30, 0);
|
||||
static const cricket::VideoCodec kVp8Codec360p(100, "VP8", 640, 360, 30, 0);
|
||||
@ -1977,7 +1976,6 @@ class WebRtcVideoChannel2SimulcastTest : public WebRtcVideoEngine2SimulcastTest,
|
||||
simulcast_bitrate_mode,
|
||||
codec.width,
|
||||
codec.height,
|
||||
kMinBitrateBps,
|
||||
0,
|
||||
kDefaultQpMax,
|
||||
codec.framerate != 0 ? codec.framerate : kDefaultFramerate);
|
||||
@ -2012,8 +2010,6 @@ class WebRtcVideoChannel2SimulcastTest : public WebRtcVideoEngine2SimulcastTest,
|
||||
EXPECT_EQ(expected_streams[i].temporal_layer_thresholds_bps,
|
||||
video_streams[i].temporal_layer_thresholds_bps);
|
||||
}
|
||||
|
||||
EXPECT_EQ(kMinBitrateBps, video_streams[0].min_bitrate_bps);
|
||||
}
|
||||
|
||||
FakeVideoSendStream* AddSendStream() {
|
||||
|
Loading…
Reference in New Issue
Block a user