zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for target rate constraints

Browse Source 
WebRTC video engine now configures bitrate on media transport
correctly.

Bug: webrtc:9719
Change-Id: I85884cd76644b7eca3763cec8ce9e31b5b64db27
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/127941
Commit-Queue: Peter Slatala <psla@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Bjorn Mellem <mellem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27167}
This commit is contained in:
Piotr (Peter) Slatala
2019-03-18 10:25:02 -07:00
committed by Commit Bot
parent 6b6f537e83
commit 946b968111
6 changed files with 138 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
media/engine/webrtc_video_engine_unittest.cc
View File

@ -17,6 +17,7 @@
#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "api/rtp_parameters.h"
#include "api/test/fake_media_transport.h"
#include "api/test/mock_video_bitrate_allocator.h"
#include "api/test/mock_video_bitrate_allocator_factory.h"
#include "api/test/mock_video_decoder_factory.h"
@ -3892,6 +3893,81 @@ TEST_F(WebRtcVideoChannelTest, SetSendCodecsWithBitratesAndMaxSendBandwidth) {
EXPECT_TRUE(channel_->SetSendParameters(send_parameters_));
}
// Test that when both the codec-specific bitrate params and max_bandwidth_bps
// are present in the same send parameters, the settings are combined correctly.
TEST_F(WebRtcVideoChannelTest,
SetSendCodecsWithBitratesAndMaxSendBandwidthForMediaTransport) {
// Same as SetSendCodecsWithBitratesAndMaxSendBandwidth but with Media
// Transport.
webrtc::MediaTransportSettings settings;
settings.is_caller = true;
webrtc::FakeMediaTransport fake_media_transport(settings);
std::unique_ptr<cricket::FakeNetworkInterface> network_interface(
new cricket::FakeNetworkInterface);
channel_->SetInterface(network_interface.get(), &fake_media_transport);
send_parameters_.codecs[0].params[kCodecParamMinBitrate] = "100";
send_parameters_.codecs[0].params[kCodecParamStartBitrate] = "200";
send_parameters_.codecs[0].params[kCodecParamMaxBitrate] = "300";
send_parameters_.max_bandwidth_bps = 400000;
{
// We expect max_bandwidth_bps to take priority, if set.
ASSERT_TRUE(channel_->SetSendParameters(send_parameters_));
ASSERT_EQ(1u,
fake_media_transport.target_rate_constraints_in_order().size());
const webrtc::MediaTransportTargetRateConstraints& constraint =
fake_media_transport.target_rate_constraints_in_order()[0];
ASSERT_EQ(webrtc::DataRate::bps(100000), constraint.min_bitrate);
ASSERT_EQ(webrtc::DataRate::bps(200000), constraint.starting_bitrate);
ASSERT_EQ(webrtc::DataRate::bps(400000), constraint.max_bitrate);
}
{
// Decrease max_bandwidth_bps.
send_parameters_.max_bandwidth_bps = 350000;
ASSERT_TRUE(channel_->SetSendParameters(send_parameters_));
ASSERT_EQ(2u,
fake_media_transport.target_rate_constraints_in_order().size());
const webrtc::MediaTransportTargetRateConstraints& constraint =
fake_media_transport.target_rate_constraints_in_order()[1];
// Since the codec isn't changing, start_bitrate_bps should be 0.
ASSERT_EQ(webrtc::DataRate::bps(100000), constraint.min_bitrate);
ASSERT_EQ(absl::nullopt, constraint.starting_bitrate);
ASSERT_EQ(webrtc::DataRate::bps(350000), constraint.max_bitrate);
}
{
// Now try again with the values flipped around.
send_parameters_.codecs[0].params[kCodecParamMaxBitrate] = "400";
send_parameters_.max_bandwidth_bps = 300000;
ASSERT_TRUE(channel_->SetSendParameters(send_parameters_));
ASSERT_EQ(3u,
fake_media_transport.target_rate_constraints_in_order().size());
const webrtc::MediaTransportTargetRateConstraints& constraint =
fake_media_transport.target_rate_constraints_in_order()[2];
ASSERT_EQ(webrtc::DataRate::bps(100000), constraint.min_bitrate);
ASSERT_EQ(webrtc::DataRate::bps(200000), constraint.starting_bitrate);
ASSERT_EQ(webrtc::DataRate::bps(300000), constraint.max_bitrate);
}
{
// Now try again with the values flipped around.
// If we change the codec max, max_bandwidth_bps should still apply.
send_parameters_.codecs[0].params[kCodecParamMaxBitrate] = "350";
ASSERT_TRUE(channel_->SetSendParameters(send_parameters_));
ASSERT_EQ(4u,
fake_media_transport.target_rate_constraints_in_order().size());
const webrtc::MediaTransportTargetRateConstraints& constraint =
fake_media_transport.target_rate_constraints_in_order()[3];
ASSERT_EQ(webrtc::DataRate::bps(100000), constraint.min_bitrate);
ASSERT_EQ(webrtc::DataRate::bps(200000), constraint.starting_bitrate);
ASSERT_EQ(webrtc::DataRate::bps(300000), constraint.max_bitrate);
}
}
TEST_F(WebRtcVideoChannelTest, SetMaxSendBandwidthShouldPreserveOtherBitrates) {
SetSendCodecsShouldWorkForBitrates("100", 100000, "150", 150000, "200",
200000);