Rename internal AudioEncoder::Encode method to EncodeInternal BUG=3926 R=kwiberg@webrtc.org Review URL: https://webrtc-codereview.appspot.com/28129004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7801 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/modules/audio_coding/codecs/audio_encoder.h b/modules/audio_coding/codecs/audio_encoder.h index c0790a2..15d6bea 100644 --- a/modules/audio_coding/codecs/audio_encoder.h +++ b/modules/audio_coding/codecs/audio_encoder.h
@@ -45,12 +45,12 @@ EncodedInfo* info) { CHECK_EQ(num_samples_per_channel, static_cast<size_t>(sample_rate_hz() / 100)); - bool ret = Encode(timestamp, - audio, - max_encoded_bytes, - encoded, - encoded_bytes, - info); + bool ret = EncodeInternal(timestamp, + audio, + max_encoded_bytes, + encoded, + encoded_bytes, + info); CHECK_LE(*encoded_bytes, max_encoded_bytes); return ret; } @@ -68,12 +68,12 @@ virtual int Num10MsFramesInNextPacket() const = 0; protected: - virtual bool Encode(uint32_t timestamp, - const int16_t* audio, - size_t max_encoded_bytes, - uint8_t* encoded, - size_t* encoded_bytes, - EncodedInfo* info) = 0; + virtual bool EncodeInternal(uint32_t timestamp, + const int16_t* audio, + size_t max_encoded_bytes, + uint8_t* encoded, + size_t* encoded_bytes, + EncodedInfo* info) = 0; }; } // namespace webrtc
diff --git a/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc b/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc index 7f0cc0d..7882242 100644 --- a/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc +++ b/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc
@@ -53,12 +53,12 @@ return num_10ms_frames_per_packet_; } -bool AudioEncoderPcm::Encode(uint32_t timestamp, - const int16_t* audio, - size_t max_encoded_bytes, - uint8_t* encoded, - size_t* encoded_bytes, - EncodedInfo* info) { +bool AudioEncoderPcm::EncodeInternal(uint32_t timestamp, + const int16_t* audio, + size_t max_encoded_bytes, + uint8_t* encoded, + size_t* encoded_bytes, + EncodedInfo* info) { const int num_samples = sample_rate_hz() / 100 * num_channels(); if (speech_buffer_.empty()) { first_timestamp_in_buffer_ = timestamp;
diff --git a/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h b/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h index 71a72c8..a3a1676 100644 --- a/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h +++ b/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h
@@ -39,12 +39,12 @@ virtual int Num10MsFramesInNextPacket() const OVERRIDE; protected: - virtual bool Encode(uint32_t timestamp, - const int16_t* audio, - size_t max_encoded_bytes, - uint8_t* encoded, - size_t* encoded_bytes, - EncodedInfo* info) OVERRIDE; + virtual bool EncodeInternal(uint32_t timestamp, + const int16_t* audio, + size_t max_encoded_bytes, + uint8_t* encoded, + size_t* encoded_bytes, + EncodedInfo* info) OVERRIDE; virtual int16_t EncodeCall(const int16_t* audio, size_t input_len,
diff --git a/modules/audio_coding/codecs/g722/audio_encoder_g722.cc b/modules/audio_coding/codecs/g722/audio_encoder_g722.cc index d64f830..cb57e6b 100644 --- a/modules/audio_coding/codecs/g722/audio_encoder_g722.cc +++ b/modules/audio_coding/codecs/g722/audio_encoder_g722.cc
@@ -61,12 +61,12 @@ return num_10ms_frames_per_packet_; } -bool AudioEncoderG722::Encode(uint32_t timestamp, - const int16_t* audio, - size_t max_encoded_bytes, - uint8_t* encoded, - size_t* encoded_bytes, - EncodedInfo* info) { +bool AudioEncoderG722::EncodeInternal(uint32_t timestamp, + const int16_t* audio, + size_t max_encoded_bytes, + uint8_t* encoded, + size_t* encoded_bytes, + EncodedInfo* info) { const int samples_per_channel = kSampleRateHz / 100 * num_10ms_frames_per_packet_; CHECK_GE(max_encoded_bytes,
diff --git a/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h b/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h index 51cba7b..499d225 100644 --- a/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h +++ b/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h
@@ -35,12 +35,12 @@ virtual int Num10MsFramesInNextPacket() const OVERRIDE; protected: - virtual bool Encode(uint32_t timestamp, - const int16_t* audio, - size_t max_encoded_bytes, - uint8_t* encoded, - size_t* encoded_bytes, - EncodedInfo* info) OVERRIDE; + virtual bool EncodeInternal(uint32_t timestamp, + const int16_t* audio, + size_t max_encoded_bytes, + uint8_t* encoded, + size_t* encoded_bytes, + EncodedInfo* info) OVERRIDE; private: // The encoder state for one channel.
diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc index 35261bc..6297c35 100644 --- a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc +++ b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
@@ -74,12 +74,12 @@ return num_10ms_frames_per_packet_; } -bool AudioEncoderOpus::Encode(uint32_t timestamp, - const int16_t* audio, - size_t max_encoded_bytes, - uint8_t* encoded, - size_t* encoded_bytes, - EncodedInfo* info) { +bool AudioEncoderOpus::EncodeInternal(uint32_t timestamp, + const int16_t* audio, + size_t max_encoded_bytes, + uint8_t* encoded, + size_t* encoded_bytes, + EncodedInfo* info) { if (input_buffer_.empty()) first_timestamp_in_buffer_ = timestamp; input_buffer_.insert(input_buffer_.end(), audio,
diff --git a/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h b/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h index 3cbb25b..f669f7e 100644 --- a/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h +++ b/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h
@@ -36,12 +36,12 @@ virtual int Num10MsFramesInNextPacket() const OVERRIDE; protected: - virtual bool Encode(uint32_t timestamp, - const int16_t* audio, - size_t max_encoded_bytes, - uint8_t* encoded, - size_t* encoded_bytes, - EncodedInfo* info) OVERRIDE; + virtual bool EncodeInternal(uint32_t timestamp, + const int16_t* audio, + size_t max_encoded_bytes, + uint8_t* encoded, + size_t* encoded_bytes, + EncodedInfo* info) OVERRIDE; private: const int num_10ms_frames_per_packet_;