admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup NetEqControllerFactory interface

Browse Source 
Finalize change started in https://webrtc-review.googlesource.com/c/src/+/359243
Remove fallback to old interface and unneeded clock member in the config struct.

Bug: None
Change-Id: I4c2b65a09dd1c8a0d44ee76320b095516e2c61fb
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/359561
Reviewed-by: Jakob Ivarsson‎ <jakobi@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42782}
This commit is contained in:
Danil Chapovalov 2024-08-14 15:28:36 +02:00 committed by WebRTC LUCI CQ
parent ce807810be
commit eb26634e6a
5 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/neteq/BUILD.gn
View File

@ -56,8 +56,6 @@ rtc_source_set("neteq_controller_api") {
deps = [ deps = [
":neteq_api", ":neteq_api",
":tick_timer", ":tick_timer",
"../../rtc_base:checks",
"../../system_wrappers:system_wrappers",
"../environment", "../environment",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]

3
api/neteq/neteq_controller.h
View File

@ -19,7 +19,6 @@
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "api/neteq/neteq.h" #include "api/neteq/neteq.h"
#include "api/neteq/tick_timer.h" #include "api/neteq/tick_timer.h"
#include "system_wrappers/include/clock.h"
namespace webrtc { namespace webrtc {
@ -67,8 +66,6 @@ class NetEqController {
int max_packets_in_buffer; int max_packets_in_buffer;
int base_min_delay_ms; int base_min_delay_ms;
TickTimer* tick_timer; TickTimer* tick_timer;
// Deprecated, instead use clock passed along with Config in Environment.
webrtc::Clock* clock = nullptr;
}; };
struct PacketInfo { struct PacketInfo {

13
api/neteq/neteq_controller_factory.h
View File

@ -15,7 +15,6 @@
#include "api/environment/environment.h" #include "api/environment/environment.h"
#include "api/neteq/neteq_controller.h" #include "api/neteq/neteq_controller.h"
#include "rtc_base/checks.h"
namespace webrtc { namespace webrtc {
@ -28,17 +27,7 @@ class NetEqControllerFactory {
// Creates a new NetEqController object, with parameters set in `config`. // Creates a new NetEqController object, with parameters set in `config`.
virtual std::unique_ptr<NetEqController> Create( virtual std::unique_ptr<NetEqController> Create(
const Environment& env, const Environment& env,
const NetEqController::Config& config) const { const NetEqController::Config& config) const = 0;
return CreateNetEqController(config);
}
private:
// TODO: bugs.webrtc.org/42220378 - Remove when downstream implements Create
virtual std::unique_ptr<NetEqController> CreateNetEqController(
const NetEqController::Config& config) const {
RTC_DCHECK_NOTREACHED();
return nullptr;
}
}; };
} // namespace webrtc } // namespace webrtc

3
modules/audio_coding/neteq/neteq_impl.cc
View File

@ -112,8 +112,7 @@ NetEqImpl::Dependencies::Dependencies(
.max_packets_in_buffer = .max_packets_in_buffer =
static_cast<int>(config.max_packets_in_buffer), static_cast<int>(config.max_packets_in_buffer),
.base_min_delay_ms = config.min_delay_ms, .base_min_delay_ms = config.min_delay_ms,
.tick_timer = tick_timer.get(), .tick_timer = tick_timer.get()})),
.clock = &env.clock()})),
red_payload_splitter(new RedPayloadSplitter), red_payload_splitter(new RedPayloadSplitter),
timestamp_scaler(new TimestampScaler(*decoder_database)), timestamp_scaler(new TimestampScaler(*decoder_database)),
accelerate_factory(new AccelerateFactory), accelerate_factory(new AccelerateFactory),

1
modules/audio_coding/neteq/neteq_impl_unittest.cc
View File

@ -127,7 +127,6 @@ class NetEqImplTest : public ::testing::Test {
controller_config.base_min_delay_ms = config_.min_delay_ms; controller_config.base_min_delay_ms = config_.min_delay_ms;
controller_config.allow_time_stretching = true; controller_config.allow_time_stretching = true;
controller_config.max_packets_in_buffer = config_.max_packets_in_buffer; controller_config.max_packets_in_buffer = config_.max_packets_in_buffer;
controller_config.clock = &clock_;
deps.neteq_controller = deps.neteq_controller =
std::make_unique<DecisionLogic>(env_, std::move(controller_config)); std::make_unique<DecisionLogic>(env_, std::move(controller_config));
} }