From 7e3968e46ccdeaeeb21474985effb8b4ff35cbcb Mon Sep 17 00:00:00 2001 From: ossu Date: Wed, 11 May 2016 04:39:55 -0700 Subject: [PATCH] Removed MaxEncodedBytes from AudioEncoder. This is the last step in changing the signature of AudioEncoder::Encode to taking an rtc::Buffer as its output parameter, rather than a pointer to and a size parameter. The notry parameter has been added specifically to work around android_compile_x86_dbg bot failing. NOTRY=True BUG=webrtc:5591 Review-Url: https://codereview.webrtc.org/1962013003 Cr-Commit-Position: refs/heads/master@{#12685} --- webrtc/modules/audio_coding/codecs/audio_encoder.cc | 5 ----- webrtc/modules/audio_coding/codecs/audio_encoder.h | 9 --------- 2 files changed, 14 deletions(-) diff --git a/webrtc/modules/audio_coding/codecs/audio_encoder.cc b/webrtc/modules/audio_coding/codecs/audio_encoder.cc index 2b08dd8594..000371d28a 100644 --- a/webrtc/modules/audio_coding/codecs/audio_encoder.cc +++ b/webrtc/modules/audio_coding/codecs/audio_encoder.cc @@ -60,9 +60,4 @@ void AudioEncoder::SetProjectedPacketLossRate(double fraction) {} void AudioEncoder::SetTargetBitrate(int target_bps) {} -size_t AudioEncoder::MaxEncodedBytes() const { - RTC_CHECK(false); - return 0; -} - } // namespace webrtc diff --git a/webrtc/modules/audio_coding/codecs/audio_encoder.h b/webrtc/modules/audio_coding/codecs/audio_encoder.h index a0f1839e73..c1c3cb3d2a 100644 --- a/webrtc/modules/audio_coding/codecs/audio_encoder.h +++ b/webrtc/modules/audio_coding/codecs/audio_encoder.h @@ -135,15 +135,6 @@ class AudioEncoder { virtual EncodedInfo EncodeImpl(uint32_t rtp_timestamp, rtc::ArrayView audio, rtc::Buffer* encoded) = 0; - - private: - // This function is deprecated. It was used to return the maximum number of - // bytes that can be produced by the encoder at each Encode() call. Since the - // Encode interface was changed to use rtc::Buffer, this is no longer - // applicable. It is only kept in to avoid breaking subclasses that still have - // it implemented (with the override attribute). It will be removed as soon - // as these subclasses have been given a chance to change. - virtual size_t MaxEncodedBytes() const; }; } // namespace webrtc #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_ENCODER_H_