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

Delete deprecated methods on AudioCodingModule

Browse Source 
Bug: None
Change-Id: I05f1ab6cdd6ac52972835af7ea94aacf5f64d673
Reviewed-on: https://webrtc-review.googlesource.com/95482
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24388}
This commit is contained in:
Niels Möller
2018-08-22 14:22:58 +02:00
committed by Commit Bot
parent 8dad9b414a
commit ec93075c00
2 changed files with 0 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/audio_coding/acm2/audio_coding_module.cc
View File

@ -158,8 +158,6 @@ class AudioCodingModuleImpl final : public AudioCodingModule {
// Smallest latency NetEq will maintain.
int LeastRequiredDelayMs() const override;
RTC_DEPRECATED int32_t PlayoutTimestamp(uint32_t* timestamp) override;
absl::optional<uint32_t> PlayoutTimestamp() override;
int FilteredCurrentDelayMs() const override;
@ -171,7 +169,6 @@ class AudioCodingModuleImpl final : public AudioCodingModule {
int PlayoutData10Ms(int desired_freq_hz,
AudioFrame* audio_frame,
bool* muted) override;
int PlayoutData10Ms(int desired_freq_hz, AudioFrame* audio_frame) override;
/////////////////////////////////////////
// Statistics
@ -1109,14 +1106,6 @@ int AudioCodingModuleImpl::PlayoutData10Ms(int desired_freq_hz,
return 0;
}
int AudioCodingModuleImpl::PlayoutData10Ms(int desired_freq_hz,
AudioFrame* audio_frame) {
bool muted;
int ret = PlayoutData10Ms(desired_freq_hz, audio_frame, &muted);
RTC_DCHECK(!muted);
return ret;
}
/////////////////////////////////////////
// Statistics
//
@ -1181,14 +1170,6 @@ int AudioCodingModuleImpl::DisableOpusDtx() {
return encoder_stack_->SetDtx(false) ? 0 : -1;
}
int32_t AudioCodingModuleImpl::PlayoutTimestamp(uint32_t* timestamp) {
absl::optional<uint32_t> ts = PlayoutTimestamp();
if (!ts)
return -1;
*timestamp = *ts;
return 0;
}
absl::optional<uint32_t> AudioCodingModuleImpl::PlayoutTimestamp() {
return receiver_.GetPlayoutTimestamp();
}

23
modules/audio_coding/include/audio_coding_module.h
View File

@ -21,7 +21,6 @@
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/include/audio_coding_module_typedefs.h"
#include "modules/audio_coding/neteq/include/neteq.h"
#include "rtc_base/deprecation.h"
#include "rtc_base/function_view.h"
#include "system_wrappers/include/clock.h"
@ -612,20 +611,6 @@ class AudioCodingModule {
//
virtual int LeastRequiredDelayMs() const = 0;
// int32_t PlayoutTimestamp()
// The send timestamp of an RTP packet is associated with the decoded
// audio of the packet in question. This function returns the timestamp of
// the latest audio obtained by calling PlayoutData10ms().
//
// Input:
// -timestamp : a reference to a uint32_t to receive the
// timestamp.
// Return value:
// 0 if the output is a correct timestamp.
// -1 if failed to output the correct timestamp.
//
RTC_DEPRECATED virtual int32_t PlayoutTimestamp(uint32_t* timestamp) = 0;
///////////////////////////////////////////////////////////////////////////
// int32_t PlayoutTimestamp()
// The send timestamp of an RTP packet is associated with the decoded
@ -674,14 +659,6 @@ class AudioCodingModule {
AudioFrame* audio_frame,
bool* muted) = 0;
/////////////////////////////////////////////////////////////////////////////
// Same as above, but without the muted parameter. This methods should not be
// used if enable_fast_accelerate was set to true in NetEq::Config.
// TODO(henrik.lundin) Remove this method when downstream dependencies are
// ready.
virtual int32_t PlayoutData10Ms(int32_t desired_freq_hz,
AudioFrame* audio_frame) = 0;
///////////////////////////////////////////////////////////////////////////
// Codec specific
//