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

Make some DecisionLogic functions virtual.

Browse Source 
Bug: webrtc:11005
Change-Id: I86d1eadc85162abf77010d97917e5ab20f644d66
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/158783
Commit-Queue: Ivo Creusen <ivoc@webrtc.org>
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29684}
This commit is contained in:
Ivo Creusen
2019-11-04 16:40:04 +01:00
committed by Commit Bot
parent 054f18513e
commit ca585bb457
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
modules/audio_coding/neteq/decision_logic.h
View File

@ -99,7 +99,7 @@ class DecisionLogic : public NetEqController {
} }
bool PeakFound() const override { return delay_manager_->PeakFound(); } bool PeakFound() const override { return delay_manager_->PeakFound(); }
virtual int GetFilteredBufferLevel() const override { int GetFilteredBufferLevel() const override {
return buffer_level_filter_.filtered_current_level(); return buffer_level_filter_.filtered_current_level();
} }
@ -126,29 +126,30 @@ class DecisionLogic : public NetEqController {
// Returns the operation given that the next available packet is a comfort // Returns the operation given that the next available packet is a comfort
// noise payload (RFC 3389 only, not codec-internal). // noise payload (RFC 3389 only, not codec-internal).
NetEq::Operation CngOperation(NetEq::Mode prev_mode, virtual NetEq::Operation CngOperation(NetEq::Mode prev_mode,
uint32_t target_timestamp, uint32_t target_timestamp,
uint32_t available_timestamp, uint32_t available_timestamp,
size_t generated_noise_samples); size_t generated_noise_samples);
// Returns the operation given that no packets are available (except maybe // Returns the operation given that no packets are available (except maybe
// a DTMF event, flagged by setting |play_dtmf| true). // a DTMF event, flagged by setting |play_dtmf| true).
NetEq::Operation NoPacket(bool play_dtmf); virtual NetEq::Operation NoPacket(bool play_dtmf);
// Returns the operation to do given that the expected packet is available. // Returns the operation to do given that the expected packet is available.
NetEq::Operation ExpectedPacketAvailable(NetEq::Mode prev_mode, virtual NetEq::Operation ExpectedPacketAvailable(NetEq::Mode prev_mode,
bool play_dtmf); bool play_dtmf);
// Returns the operation to do given that the expected packet is not // Returns the operation to do given that the expected packet is not
// available, but a packet further into the future is at hand. // available, but a packet further into the future is at hand.
NetEq::Operation FuturePacketAvailable(size_t decoder_frame_length, virtual NetEq::Operation FuturePacketAvailable(
NetEq::Mode prev_mode, size_t decoder_frame_length,
uint32_t target_timestamp, NetEq::Mode prev_mode,
uint32_t available_timestamp, uint32_t target_timestamp,
bool play_dtmf, uint32_t available_timestamp,
size_t generated_noise_samples, bool play_dtmf,
size_t span_samples_in_packet_buffer, size_t generated_noise_samples,
size_t num_packets_in_packet_buffer); size_t span_samples_in_packet_buffer,
size_t num_packets_in_packet_buffer);
// Checks if enough time has elapsed since the last successful timescale // Checks if enough time has elapsed since the last successful timescale
// operation was done (i.e., accelerate or preemptive expand). // operation was done (i.e., accelerate or preemptive expand).