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

Remove deprecated PacketArrived method from NetEqController interface.

Browse Source 
A new version of this method was added in https://webrtc-review.googlesource.com/c/src/+/188385

Bug: webrtc:11005
Change-Id: I8ee959b6b0239462ee3caf784962ed2bb2d349ea
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/188622
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Ivo Creusen <ivoc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32508}
This commit is contained in:
Ivo Creusen
2020-10-15 17:13:31 +02:00
committed by Commit Bot
parent ee24eb66d2
commit 2963d303b0
2 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
api/neteq/neteq_controller.h
View File

@ -162,33 +162,12 @@ class NetEqController {
// Returns the target buffer level in ms.
virtual int TargetLevelMs() const = 0;
// Deprecated.
// TODO(ivoc): Remove when downstream is updated.
virtual absl::optional<int> PacketArrived(bool last_cng_or_dtmf,
size_t packet_length_samples,
bool should_update_stats,
uint16_t main_sequence_number,
uint32_t main_timestamp,
int fs_hz) {
PacketArrivedInfo info;
info.is_dtx = false;
info.is_cng_or_dtmf = last_cng_or_dtmf;
info.packet_length_samples = packet_length_samples;
info.main_sequence_number = main_sequence_number;
info.main_timestamp = main_timestamp;
return PacketArrived(fs_hz, should_update_stats, info);
}
// Notify the NetEqController that a packet has arrived. Returns the relative
// arrival delay, if it can be computed.
// TODO(ivoc): Make pure virtual when downstream is updated.
virtual absl::optional<int> PacketArrived(int fs_hz,
bool should_update_stats,
const PacketArrivedInfo& info) {
return PacketArrived(info.is_cng_or_dtmf, info.packet_length_samples,
should_update_stats, info.main_sequence_number,
info.main_timestamp, fs_hz);
}
const PacketArrivedInfo& info) = 0;
// Notify the NetEqController that we are currently in muted state.
// TODO(ivoc): Make pure virtual when downstream is updated.
virtual void NotifyMutedState() {}

9
modules/audio_coding/neteq/mock/mock_neteq_controller.h
View File

@ -42,15 +42,6 @@ class MockNetEqController : public NetEqController {
MOCK_METHOD(void, ExpandDecision, (NetEq::Operation operation), (override));
MOCK_METHOD(void, AddSampleMemory, (int32_t value), (override));
MOCK_METHOD(int, TargetLevelMs, (), (const, override));
MOCK_METHOD(absl::optional<int>,
PacketArrived,
(bool last_cng_or_dtmf,
size_t packet_length_samples,
bool should_update_stats,
uint16_t main_sequence_number,
uint32_t main_timestamp,
int fs_hz),
(override));
MOCK_METHOD(absl::optional<int>,
PacketArrived,
(int fs_hz,