Update test::CreateVideoStreams to use the configured min bitrate if set.

VideoSendStreamTest.ReconfigureBitratesSetsEncoderBitratesCorrectly:
Configure min_bitrate_bps via VideoEncoderConfig (and remove
implementations of VideoStreamFactoryInterface used to override
the default min_bitrate_bps configuration).

Bug: none
Change-Id: I488f78d8d145b24fd65dd29fdc979e543fcb0b7c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132798
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27711}
This commit is contained in:
Åsa Persson
2019-04-15 14:00:30 +02:00
committed by Commit Bot
parent d0aec913d6
commit 217405344a
2 changed files with 7 additions and 25 deletions

View File

@ -66,6 +66,10 @@ std::vector<VideoStream> CreateVideoStreams(
: DefaultVideoStreamFactory::kMaxBitratePerStream[i];
target_bitrate_bps = std::min(max_bitrate_bps, target_bitrate_bps);
if (stream.min_bitrate_bps > 0) {
RTC_DCHECK_LE(stream.min_bitrate_bps, target_bitrate_bps);
stream_settings[i].min_bitrate_bps = stream.min_bitrate_bps;
}
if (stream.max_framerate > 0) {
stream_settings[i].max_framerate = stream.max_framerate;
}