mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 13:50:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add method PeerConfigurer::SetBitrateSettings

Browse source 
It replaces the method SetBitrateParameters, which uses the
deprecated type PeerConnectionInterface::BitrateParameters.

Bug: None
No-try: True
Change-Id: I3690d391d679c3ff5b79e088f6c7f79bc3571064
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/177667
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31557}
This commit is contained in:
Niels Möller 2020-06-22 14:48:10 +02:00 committed by Commit Bot
parent d95138b684
commit 29d59a1402
7 changed files with 35 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
api/BUILD.gn
View file

@ -379,6 +379,7 @@ rtc_source_set("peer_connection_quality_test_fixture_api") {
":stats_observer_interface", ":stats_observer_interface",
":video_quality_analyzer_api", ":video_quality_analyzer_api",
"../media:rtc_media_base", "../media:rtc_media_base",
"../rtc_base:deprecation",
"../rtc_base:rtc_base", "../rtc_base:rtc_base",
"rtc_event_log", "rtc_event_log",
"task_queue", "task_queue",

4
api/test/peerconnection_quality_test_fixture.h
View file

@ -39,6 +39,7 @@
#include "api/video_codecs/video_encoder.h" #include "api/video_codecs/video_encoder.h"
#include "api/video_codecs/video_encoder_factory.h" #include "api/video_codecs/video_encoder_factory.h"
#include "media/base/media_constants.h" #include "media/base/media_constants.h"
#include "rtc_base/deprecation.h"
#include "rtc_base/network.h" #include "rtc_base/network.h"
#include "rtc_base/rtc_certificate_generator.h" #include "rtc_base/rtc_certificate_generator.h"
#include "rtc_base/ssl_certificate.h" #include "rtc_base/ssl_certificate.h"
@ -334,6 +335,9 @@ class PeerConnectionE2EQualityTestFixture {
PeerConnectionInterface::RTCConfiguration configuration) = 0; PeerConnectionInterface::RTCConfiguration configuration) = 0;
// Set bitrate parameters on PeerConnection. This constraints will be // Set bitrate parameters on PeerConnection. This constraints will be
// applied to all summed RTP streams for this peer. // applied to all summed RTP streams for this peer.
virtual PeerConfigurer* SetBitrateSettings(
BitrateSettings bitrate_settings) = 0;
RTC_DEPRECATED
virtual PeerConfigurer* SetBitrateParameters( virtual PeerConfigurer* SetBitrateParameters(
PeerConnectionInterface::BitrateParameters bitrate_params) = 0; PeerConnectionInterface::BitrateParameters bitrate_params) = 0;
}; };

10
test/pc/e2e/peer_configurer.h
View file

@ -165,7 +165,15 @@ class PeerConfigurerImpl final
} }
PeerConfigurer* SetBitrateParameters( PeerConfigurer* SetBitrateParameters(
PeerConnectionInterface::BitrateParameters bitrate_params) override { PeerConnectionInterface::BitrateParameters bitrate_params) override {
params_->bitrate_params = bitrate_params; BitrateSettings bitrate_settings;
bitrate_settings.min_bitrate_bps = bitrate_params.min_bitrate_bps;
bitrate_settings.start_bitrate_bps = bitrate_params.current_bitrate_bps;
bitrate_settings.max_bitrate_bps = bitrate_params.max_bitrate_bps;
return SetBitrateSettings(bitrate_settings);
}
PeerConfigurer* SetBitrateSettings(
BitrateSettings bitrate_settings) override {
params_->bitrate_settings = bitrate_settings;
return this; return this;
} }

8
test/pc/e2e/peer_connection_e2e_smoke_test.cc
View file

@ -308,10 +308,10 @@ TEST_F(PeerConnectionE2EQualityTestSmokeTest, MAYBE_HighBitrate) {
RunTest( RunTest(
"smoke", run_params, "smoke", run_params,
[](PeerConfigurer* alice) { [](PeerConfigurer* alice) {
PeerConnectionInterface::BitrateParameters bitrate_params; BitrateSettings bitrate_settings;
bitrate_params.current_bitrate_bps = 3'000'000; bitrate_settings.start_bitrate_bps = 3'000'000;
bitrate_params.max_bitrate_bps = 3'000'000; bitrate_settings.max_bitrate_bps = 3'000'000;
alice->SetBitrateParameters(bitrate_params); alice->SetBitrateSettings(bitrate_settings);
VideoConfig video(800, 600, 15); VideoConfig video(800, 600, 15);
video.stream_label = "alice-video"; video.stream_label = "alice-video";
video.min_encode_bitrate_bps = 500'000; video.min_encode_bitrate_bps = 500'000;

2
test/pc/e2e/peer_connection_quality_test_params.h
View file

@ -112,7 +112,7 @@ struct Params {
absl::optional<std::string> aec_dump_path; absl::optional<std::string> aec_dump_path;
PeerConnectionInterface::RTCConfiguration rtc_configuration; PeerConnectionInterface::RTCConfiguration rtc_configuration;
PeerConnectionInterface::BitrateParameters bitrate_params; BitrateSettings bitrate_settings;
}; };
} // namespace webrtc_pc_e2e } // namespace webrtc_pc_e2e

2
test/pc/e2e/test_peer_factory.cc
View file

@ -329,7 +329,7 @@ std::unique_ptr<TestPeer> TestPeerFactory::CreateTestPeer(
rtc::scoped_refptr<PeerConnectionInterface> peer_connection = rtc::scoped_refptr<PeerConnectionInterface> peer_connection =
peer_connection_factory->CreatePeerConnection(params->rtc_configuration, peer_connection_factory->CreatePeerConnection(params->rtc_configuration,
std::move(pc_deps)); std::move(pc_deps));
peer_connection->SetBitrate(params->bitrate_params); peer_connection->SetBitrate(params->bitrate_settings);
return absl::WrapUnique(new TestPeer( return absl::WrapUnique(new TestPeer(
peer_connection_factory, peer_connection, std::move(observer), peer_connection_factory, peer_connection, std::move(observer),

30
video/pc_full_stack_tests.cc
View file

@ -281,11 +281,11 @@ TEST(PCGenericDescriptorTest, ForemanCif30kbpsWithoutPacketLoss) {
video, ClipNameToClipPath("foreman_cif")); video, ClipNameToClipPath("foreman_cif"));
alice->AddVideoConfig(std::move(video), std::move(frame_generator)); alice->AddVideoConfig(std::move(video), std::move(frame_generator));
PeerConnectionInterface::BitrateParameters bitrate_params; BitrateSettings bitrate_settings;
bitrate_params.min_bitrate_bps = 30000; bitrate_settings.min_bitrate_bps = 30000;
bitrate_params.current_bitrate_bps = 30000; bitrate_settings.start_bitrate_bps = 30000;
bitrate_params.max_bitrate_bps = 30000; bitrate_settings.max_bitrate_bps = 30000;
alice->SetBitrateParameters(bitrate_params); alice->SetBitrateSettings(bitrate_settings);
}, },
[](PeerConfigurer* bob) {}); [](PeerConfigurer* bob) {});
RunParams run_params(TimeDelta::Seconds(kTestDurationSec)); RunParams run_params(TimeDelta::Seconds(kTestDurationSec));
@ -314,11 +314,11 @@ TEST(PCGenericDescriptorTest,
video, ClipNameToClipPath("foreman_cif")); video, ClipNameToClipPath("foreman_cif"));
alice->AddVideoConfig(std::move(video), std::move(frame_generator)); alice->AddVideoConfig(std::move(video), std::move(frame_generator));
PeerConnectionInterface::BitrateParameters bitrate_params; BitrateSettings bitrate_settings;
bitrate_params.min_bitrate_bps = 30000; bitrate_settings.min_bitrate_bps = 30000;
bitrate_params.current_bitrate_bps = 30000; bitrate_settings.start_bitrate_bps = 30000;
bitrate_params.max_bitrate_bps = 30000; bitrate_settings.max_bitrate_bps = 30000;
alice->SetBitrateParameters(bitrate_params); alice->SetBitrateSettings(bitrate_settings);
}, },
[](PeerConfigurer* bob) {}); [](PeerConfigurer* bob) {});
RunParams run_params(TimeDelta::Seconds(kTestDurationSec)); RunParams run_params(TimeDelta::Seconds(kTestDurationSec));
@ -619,11 +619,11 @@ TEST(PCFullStackTest, ForemanCif30kbpsWithoutPacketlossH264) {
video, ClipNameToClipPath("foreman_cif")); video, ClipNameToClipPath("foreman_cif"));
alice->AddVideoConfig(std::move(video), std::move(frame_generator)); alice->AddVideoConfig(std::move(video), std::move(frame_generator));
PeerConnectionInterface::BitrateParameters bitrate_params; BitrateSettings bitrate_settings;
bitrate_params.min_bitrate_bps = 30000; bitrate_settings.min_bitrate_bps = 30000;
bitrate_params.current_bitrate_bps = 30000; bitrate_settings.start_bitrate_bps = 30000;
bitrate_params.max_bitrate_bps = 30000; bitrate_settings.max_bitrate_bps = 30000;
alice->SetBitrateParameters(bitrate_params); alice->SetBitrateSettings(bitrate_settings);
}, },
[](PeerConfigurer* bob) {}); [](PeerConfigurer* bob) {});
RunParams run_params(TimeDelta::Seconds(kTestDurationSec)); RunParams run_params(TimeDelta::Seconds(kTestDurationSec));