Code formatting on files touched in r4447.

BUG=
R=tina.legrand@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1979004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4500 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-08-07 14:17:05 +00:00
parent 401ef361ac
commit a165d9c0a4
11 changed files with 78 additions and 76 deletions

View File

@ -38,20 +38,19 @@ class ACMAMR: public ACMGenericCodec {
virtual int16_t InternalInitDecoder(
WebRtcACMCodecParams* codec_params) OVERRIDE;
int16_t SetAMREncoderPackingFormat(
const ACMAMRPackingFormat packing_format);
int16_t SetAMREncoderPackingFormat(const ACMAMRPackingFormat packing_format);
ACMAMRPackingFormat AMREncoderPackingFormat() const;
int16_t SetAMRDecoderPackingFormat(
const ACMAMRPackingFormat packing_format);
int16_t SetAMRDecoderPackingFormat(const ACMAMRPackingFormat packing_format);
ACMAMRPackingFormat AMRDecoderPackingFormat() const;
protected:
virtual int16_t DecodeSafe(uint8_t* bitstream,
int16_t bitstream_len_byte,
int16_t* audio, int16_t* audio_samples,
int16_t* audio,
int16_t* audio_samples,
int8_t* speech_type) OVERRIDE;
virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def,

View File

@ -49,7 +49,8 @@ class ACMAMRwb: public ACMGenericCodec {
protected:
virtual int16_t DecodeSafe(uint8_t* bitstream,
int16_t bitstream_len_byte,
int16_t* audio, int16_t* audio_samples,
int16_t* audio,
int16_t* audio_samples,
int8_t* speech_type) OVERRIDE;
virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def,

View File

@ -36,8 +36,7 @@ class ACMCELT : public ACMGenericCodec {
WebRtcACMCodecParams* codec_params) OVERRIDE;
protected:
virtual int16_t DecodeSafe(
uint8_t* /* bitstream */,
virtual int16_t DecodeSafe(uint8_t* /* bitstream */,
int16_t /* bitstream_len_byte */,
int16_t* /* audio */,
int16_t* /* audio_samples */,

View File

@ -39,7 +39,8 @@ class ACMCNG: public ACMGenericCodec {
protected:
virtual int16_t DecodeSafe(uint8_t* bitstream,
int16_t bitstream_len_byte,
int16_t* audio, int16_t* audio_samples,
int16_t* audio,
int16_t* audio_samples,
int8_t* speech_type) OVERRIDE;
virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def,

View File

@ -35,7 +35,8 @@ class ACMDTMFPlayout: public ACMGenericCodec {
protected:
virtual int16_t DecodeSafe(uint8_t* bitstream,
int16_t bitstream_len_byte,
int16_t* audio, int16_t* audio_samples,
int16_t* audio,
int16_t* audio_samples,
int8_t* speech_type) OVERRIDE;
virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def,

View File

@ -42,7 +42,8 @@ class ACMG722: public ACMGenericCodec {
protected:
virtual int16_t DecodeSafe(uint8_t* bitstream,
int16_t bitstream_len_byte,
int16_t* audio, int16_t* audio_samples,
int16_t* audio,
int16_t* audio_samples,
int8_t* speech_type) OVERRIDE;
virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def,