generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code formatting on files touched in r4447.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/modules/audio_coding/main/source/acm_amr.h
View File

@ -21,7 +21,7 @@ namespace webrtc {
enum ACMAMRPackingFormat;
class ACMAMR: public ACMGenericCodec {
class ACMAMR : public ACMGenericCodec {
public:
explicit ACMAMR(int16_t codec_id);
virtual ~ACMAMR();
@ -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,

5
webrtc/modules/audio_coding/main/source/acm_amrwb.h
View File

@ -19,7 +19,7 @@ struct AMRWB_decinst_t_;
namespace webrtc {
class ACMAMRwb: public ACMGenericCodec {
class ACMAMRwb : public ACMGenericCodec {
public:
explicit ACMAMRwb(int16_t codec_id);
virtual ~ACMAMRwb();
@ -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,

3
webrtc/modules/audio_coding/main/source/acm_celt.h
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 */,

3
webrtc/modules/audio_coding/main/source/acm_cng.h
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,

3
webrtc/modules/audio_coding/main/source/acm_dtmf_playout.h
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,

5
webrtc/modules/audio_coding/main/source/acm_g722.h
View File

@ -22,7 +22,7 @@ namespace webrtc {
struct ACMG722EncStr;
struct ACMG722DecStr;
class ACMG722: public ACMGenericCodec {
class ACMG722 : public ACMGenericCodec {
public:
explicit ACMG722(int16_t codec_id);
virtual ~ACMG722();
@ -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,

2
webrtc/modules/audio_coding/main/source/acm_isac.h
View File

@ -114,7 +114,7 @@ class ACMISAC : public ACMGenericCodec {
void UpdateFrameLen();
virtual bool DecoderParamsSafe(WebRtcACMCodecParams *dec_params,
virtual bool DecoderParamsSafe(WebRtcACMCodecParams* dec_params,
const uint8_t payload_type) OVERRIDE;
virtual void SaveDecoderParamSafe(