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@7801 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
d1fac61e8f
commit
8dc21dc238
@ -45,7 +45,7 @@ class AudioEncoder {
|
|||||||
EncodedInfo* info) {
|
EncodedInfo* info) {
|
||||||
CHECK_EQ(num_samples_per_channel,
|
CHECK_EQ(num_samples_per_channel,
|
||||||
static_cast<size_t>(sample_rate_hz() / 100));
|
static_cast<size_t>(sample_rate_hz() / 100));
|
||||||
bool ret = Encode(timestamp,
|
bool ret = EncodeInternal(timestamp,
|
||||||
audio,
|
audio,
|
||||||
max_encoded_bytes,
|
max_encoded_bytes,
|
||||||
encoded,
|
encoded,
|
||||||
@ -68,7 +68,7 @@ class AudioEncoder {
|
|||||||
virtual int Num10MsFramesInNextPacket() const = 0;
|
virtual int Num10MsFramesInNextPacket() const = 0;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual bool Encode(uint32_t timestamp,
|
virtual bool EncodeInternal(uint32_t timestamp,
|
||||||
const int16_t* audio,
|
const int16_t* audio,
|
||||||
size_t max_encoded_bytes,
|
size_t max_encoded_bytes,
|
||||||
uint8_t* encoded,
|
uint8_t* encoded,
|
||||||
|
@ -53,7 +53,7 @@ int AudioEncoderPcm::Num10MsFramesInNextPacket() const {
|
|||||||
return num_10ms_frames_per_packet_;
|
return num_10ms_frames_per_packet_;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AudioEncoderPcm::Encode(uint32_t timestamp,
|
bool AudioEncoderPcm::EncodeInternal(uint32_t timestamp,
|
||||||
const int16_t* audio,
|
const int16_t* audio,
|
||||||
size_t max_encoded_bytes,
|
size_t max_encoded_bytes,
|
||||||
uint8_t* encoded,
|
uint8_t* encoded,
|
||||||
|
@ -39,7 +39,7 @@ class AudioEncoderPcm : public AudioEncoder {
|
|||||||
virtual int Num10MsFramesInNextPacket() const OVERRIDE;
|
virtual int Num10MsFramesInNextPacket() const OVERRIDE;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual bool Encode(uint32_t timestamp,
|
virtual bool EncodeInternal(uint32_t timestamp,
|
||||||
const int16_t* audio,
|
const int16_t* audio,
|
||||||
size_t max_encoded_bytes,
|
size_t max_encoded_bytes,
|
||||||
uint8_t* encoded,
|
uint8_t* encoded,
|
||||||
|
@ -61,7 +61,7 @@ int AudioEncoderG722::Num10MsFramesInNextPacket() const {
|
|||||||
return num_10ms_frames_per_packet_;
|
return num_10ms_frames_per_packet_;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AudioEncoderG722::Encode(uint32_t timestamp,
|
bool AudioEncoderG722::EncodeInternal(uint32_t timestamp,
|
||||||
const int16_t* audio,
|
const int16_t* audio,
|
||||||
size_t max_encoded_bytes,
|
size_t max_encoded_bytes,
|
||||||
uint8_t* encoded,
|
uint8_t* encoded,
|
||||||
|
@ -35,7 +35,7 @@ class AudioEncoderG722 : public AudioEncoder {
|
|||||||
virtual int Num10MsFramesInNextPacket() const OVERRIDE;
|
virtual int Num10MsFramesInNextPacket() const OVERRIDE;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual bool Encode(uint32_t timestamp,
|
virtual bool EncodeInternal(uint32_t timestamp,
|
||||||
const int16_t* audio,
|
const int16_t* audio,
|
||||||
size_t max_encoded_bytes,
|
size_t max_encoded_bytes,
|
||||||
uint8_t* encoded,
|
uint8_t* encoded,
|
||||||
|
@ -74,7 +74,7 @@ int AudioEncoderOpus::Num10MsFramesInNextPacket() const {
|
|||||||
return num_10ms_frames_per_packet_;
|
return num_10ms_frames_per_packet_;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AudioEncoderOpus::Encode(uint32_t timestamp,
|
bool AudioEncoderOpus::EncodeInternal(uint32_t timestamp,
|
||||||
const int16_t* audio,
|
const int16_t* audio,
|
||||||
size_t max_encoded_bytes,
|
size_t max_encoded_bytes,
|
||||||
uint8_t* encoded,
|
uint8_t* encoded,
|
||||||
|
@ -36,7 +36,7 @@ class AudioEncoderOpus : public AudioEncoder {
|
|||||||
virtual int Num10MsFramesInNextPacket() const OVERRIDE;
|
virtual int Num10MsFramesInNextPacket() const OVERRIDE;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual bool Encode(uint32_t timestamp,
|
virtual bool EncodeInternal(uint32_t timestamp,
|
||||||
const int16_t* audio,
|
const int16_t* audio,
|
||||||
size_t max_encoded_bytes,
|
size_t max_encoded_bytes,
|
||||||
uint8_t* encoded,
|
uint8_t* encoded,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user