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

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

@ -21,7 +21,7 @@ namespace webrtc {
enum ACMAMRPackingFormat; enum ACMAMRPackingFormat;
class ACMAMR: public ACMGenericCodec { class ACMAMR : public ACMGenericCodec {
public: public:
explicit ACMAMR(int16_t codec_id); explicit ACMAMR(int16_t codec_id);
virtual ~ACMAMR(); virtual ~ACMAMR();
@ -30,7 +30,7 @@ class ACMAMR: public ACMGenericCodec {
virtual ACMGenericCodec* CreateInstance(void) OVERRIDE; virtual ACMGenericCodec* CreateInstance(void) OVERRIDE;
virtual int16_t InternalEncode(uint8_t* bitstream, virtual int16_t InternalEncode(uint8_t* bitstream,
int16_t* bitstream_len_byte) OVERRIDE; int16_t* bitstream_len_byte) OVERRIDE;
virtual int16_t InternalInitEncoder( virtual int16_t InternalInitEncoder(
WebRtcACMCodecParams* codec_params) OVERRIDE; WebRtcACMCodecParams* codec_params) OVERRIDE;
@ -38,24 +38,23 @@ class ACMAMR: public ACMGenericCodec {
virtual int16_t InternalInitDecoder( virtual int16_t InternalInitDecoder(
WebRtcACMCodecParams* codec_params) OVERRIDE; WebRtcACMCodecParams* codec_params) OVERRIDE;
int16_t SetAMREncoderPackingFormat( int16_t SetAMREncoderPackingFormat(const ACMAMRPackingFormat packing_format);
const ACMAMRPackingFormat packing_format);
ACMAMRPackingFormat AMREncoderPackingFormat() const; ACMAMRPackingFormat AMREncoderPackingFormat() const;
int16_t SetAMRDecoderPackingFormat( int16_t SetAMRDecoderPackingFormat(const ACMAMRPackingFormat packing_format);
const ACMAMRPackingFormat packing_format);
ACMAMRPackingFormat AMRDecoderPackingFormat() const; ACMAMRPackingFormat AMRDecoderPackingFormat() const;
protected: protected:
virtual int16_t DecodeSafe(uint8_t* bitstream, virtual int16_t DecodeSafe(uint8_t* bitstream,
int16_t bitstream_len_byte, int16_t bitstream_len_byte,
int16_t* audio, int16_t* audio_samples, int16_t* audio,
int8_t* speech_type) OVERRIDE; int16_t* audio_samples,
int8_t* speech_type) OVERRIDE;
virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def,
const CodecInst& codec_inst) OVERRIDE; const CodecInst& codec_inst) OVERRIDE;
virtual void DestructEncoderSafe() OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE;

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

@ -19,7 +19,7 @@ struct AMRWB_decinst_t_;
namespace webrtc { namespace webrtc {
class ACMAMRwb: public ACMGenericCodec { class ACMAMRwb : public ACMGenericCodec {
public: public:
explicit ACMAMRwb(int16_t codec_id); explicit ACMAMRwb(int16_t codec_id);
virtual ~ACMAMRwb(); virtual ~ACMAMRwb();
@ -28,7 +28,7 @@ class ACMAMRwb: public ACMGenericCodec {
virtual ACMGenericCodec* CreateInstance(void) OVERRIDE; virtual ACMGenericCodec* CreateInstance(void) OVERRIDE;
virtual int16_t InternalEncode(uint8_t* bitstream, virtual int16_t InternalEncode(uint8_t* bitstream,
int16_t* bitstream_len_byte) OVERRIDE; int16_t* bitstream_len_byte) OVERRIDE;
virtual int16_t InternalInitEncoder( virtual int16_t InternalInitEncoder(
WebRtcACMCodecParams* codec_params) OVERRIDE; WebRtcACMCodecParams* codec_params) OVERRIDE;
@ -48,12 +48,13 @@ class ACMAMRwb: public ACMGenericCodec {
protected: protected:
virtual int16_t DecodeSafe(uint8_t* bitstream, virtual int16_t DecodeSafe(uint8_t* bitstream,
int16_t bitstream_len_byte, int16_t bitstream_len_byte,
int16_t* audio, int16_t* audio_samples, int16_t* audio,
int8_t* speech_type) OVERRIDE; int16_t* audio_samples,
int8_t* speech_type) OVERRIDE;
virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def,
const CodecInst& codec_inst) OVERRIDE; const CodecInst& codec_inst) OVERRIDE;
virtual void DestructEncoderSafe() OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE;

13
webrtc/modules/audio_coding/main/source/acm_celt.h
View File

@ -36,15 +36,14 @@ class ACMCELT : public ACMGenericCodec {
WebRtcACMCodecParams* codec_params) OVERRIDE; WebRtcACMCodecParams* codec_params) OVERRIDE;
protected: protected:
virtual int16_t DecodeSafe( virtual int16_t DecodeSafe(uint8_t* /* bitstream */,
uint8_t* /* bitstream */, int16_t /* bitstream_len_byte */,
int16_t /* bitstream_len_byte */, int16_t* /* audio */,
int16_t* /* audio */, int16_t* /* audio_samples */,
int16_t* /* audio_samples */, int8_t* /* speech_type */) OVERRIDE;
int8_t* /* speech_type */) OVERRIDE;
virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def,
const CodecInst& codec_inst) OVERRIDE; const CodecInst& codec_inst) OVERRIDE;
virtual void DestructEncoderSafe() OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE;

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

@ -28,7 +28,7 @@ class ACMCNG: public ACMGenericCodec {
virtual ACMGenericCodec* CreateInstance(void) OVERRIDE; virtual ACMGenericCodec* CreateInstance(void) OVERRIDE;
virtual int16_t InternalEncode(uint8_t* bitstream, virtual int16_t InternalEncode(uint8_t* bitstream,
int16_t* bitstream_len_byte) OVERRIDE; int16_t* bitstream_len_byte) OVERRIDE;
virtual int16_t InternalInitEncoder( virtual int16_t InternalInitEncoder(
WebRtcACMCodecParams* codec_params) OVERRIDE; WebRtcACMCodecParams* codec_params) OVERRIDE;
@ -38,12 +38,13 @@ class ACMCNG: public ACMGenericCodec {
protected: protected:
virtual int16_t DecodeSafe(uint8_t* bitstream, virtual int16_t DecodeSafe(uint8_t* bitstream,
int16_t bitstream_len_byte, int16_t bitstream_len_byte,
int16_t* audio, int16_t* audio_samples, int16_t* audio,
int8_t* speech_type) OVERRIDE; int16_t* audio_samples,
int8_t* speech_type) OVERRIDE;
virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def,
const CodecInst& codec_inst) OVERRIDE; const CodecInst& codec_inst) OVERRIDE;
virtual void DestructEncoderSafe() OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE;

9
webrtc/modules/audio_coding/main/source/acm_dtmf_playout.h
View File

@ -34,12 +34,13 @@ class ACMDTMFPlayout: public ACMGenericCodec {
protected: protected:
virtual int16_t DecodeSafe(uint8_t* bitstream, virtual int16_t DecodeSafe(uint8_t* bitstream,
int16_t bitstream_len_byte, int16_t bitstream_len_byte,
int16_t* audio, int16_t* audio_samples, int16_t* audio,
int8_t* speech_type) OVERRIDE; int16_t* audio_samples,
int8_t* speech_type) OVERRIDE;
virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def,
const CodecInst& codec_inst) OVERRIDE; const CodecInst& codec_inst) OVERRIDE;
virtual void DestructEncoderSafe() OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE;

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

@ -22,7 +22,7 @@ namespace webrtc {
struct ACMG722EncStr; struct ACMG722EncStr;
struct ACMG722DecStr; struct ACMG722DecStr;
class ACMG722: public ACMGenericCodec { class ACMG722 : public ACMGenericCodec {
public: public:
explicit ACMG722(int16_t codec_id); explicit ACMG722(int16_t codec_id);
virtual ~ACMG722(); virtual ~ACMG722();
@ -41,17 +41,18 @@ class ACMG722: public ACMGenericCodec {
protected: protected:
virtual int16_t DecodeSafe(uint8_t* bitstream, virtual int16_t DecodeSafe(uint8_t* bitstream,
int16_t bitstream_len_byte, int16_t bitstream_len_byte,
int16_t* audio, int16_t* audio_samples, int16_t* audio,
int8_t* speech_type) OVERRIDE; int16_t* audio_samples,
int8_t* speech_type) OVERRIDE;
virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def,
const CodecInst& codec_inst) OVERRIDE; const CodecInst& codec_inst) OVERRIDE;
virtual int32_t Add10MsDataSafe(const uint32_t timestamp, virtual int32_t Add10MsDataSafe(const uint32_t timestamp,
const int16_t* data, const int16_t* data,
const uint16_t length_smpl, const uint16_t length_smpl,
const uint8_t audio_channel) OVERRIDE; const uint8_t audio_channel) OVERRIDE;
virtual void DestructEncoderSafe() OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE;
@ -70,7 +71,7 @@ class ACMG722: public ACMGenericCodec {
ACMG722DecStr* ptr_dec_str_; ACMG722DecStr* ptr_dec_str_;
G722EncInst* encoder_inst_ptr_; G722EncInst* encoder_inst_ptr_;
G722EncInst* encoder_inst_ptr_right_; // Prepared for stereo G722EncInst* encoder_inst_ptr_right_; // Prepared for stereo
G722DecInst* decoder_inst_ptr_; G722DecInst* decoder_inst_ptr_;
}; };

12
webrtc/modules/audio_coding/main/source/acm_ilbc.h
View File

@ -28,7 +28,7 @@ class ACMILBC : public ACMGenericCodec {
virtual ACMGenericCodec* CreateInstance(void) OVERRIDE; virtual ACMGenericCodec* CreateInstance(void) OVERRIDE;
virtual int16_t InternalEncode(uint8_t* bitstream, virtual int16_t InternalEncode(uint8_t* bitstream,
int16_t* bitstream_len_byte) OVERRIDE; int16_t* bitstream_len_byte) OVERRIDE;
virtual int16_t InternalInitEncoder( virtual int16_t InternalInitEncoder(
WebRtcACMCodecParams* codec_params) OVERRIDE; WebRtcACMCodecParams* codec_params) OVERRIDE;
@ -38,13 +38,13 @@ class ACMILBC : public ACMGenericCodec {
protected: protected:
virtual int16_t DecodeSafe(uint8_t* bitstream, virtual int16_t DecodeSafe(uint8_t* bitstream,
int16_t bitstream_len_byte, int16_t bitstream_len_byte,
int16_t* audio, int16_t* audio,
int16_t* audio_samples, int16_t* audio_samples,
int8_t* speech_type) OVERRIDE; int8_t* speech_type) OVERRIDE;
virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def,
const CodecInst& codec_inst) OVERRIDE; const CodecInst& codec_inst) OVERRIDE;
virtual int16_t SetBitRateSafe(const int32_t rate) OVERRIDE; virtual int16_t SetBitRateSafe(const int32_t rate) OVERRIDE;

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

@ -31,7 +31,7 @@ class ACMISAC : public ACMGenericCodec {
virtual ACMGenericCodec* CreateInstance(void) OVERRIDE; virtual ACMGenericCodec* CreateInstance(void) OVERRIDE;
virtual int16_t InternalEncode(uint8_t* bitstream, virtual int16_t InternalEncode(uint8_t* bitstream,
int16_t* bitstream_len_byte) OVERRIDE; int16_t* bitstream_len_byte) OVERRIDE;
virtual int16_t InternalInitEncoder( virtual int16_t InternalInitEncoder(
WebRtcACMCodecParams* codec_params) OVERRIDE; WebRtcACMCodecParams* codec_params) OVERRIDE;
@ -70,19 +70,19 @@ class ACMISAC : public ACMGenericCodec {
virtual int32_t SetISACMaxRate(const uint32_t max_rate_bit_per_sec) OVERRIDE; virtual int32_t SetISACMaxRate(const uint32_t max_rate_bit_per_sec) OVERRIDE;
virtual int16_t REDPayloadISAC(const int32_t isac_rate, virtual int16_t REDPayloadISAC(const int32_t isac_rate,
const int16_t isac_bw_estimate, const int16_t isac_bw_estimate,
uint8_t* payload, uint8_t* payload,
int16_t* payload_len_bytes) OVERRIDE; int16_t* payload_len_bytes) OVERRIDE;
protected: protected:
virtual int16_t DecodeSafe(uint8_t* bitstream, virtual int16_t DecodeSafe(uint8_t* bitstream,
int16_t bitstream_len_byte, int16_t bitstream_len_byte,
int16_t* audio, int16_t* audio,
int16_t* audio_samples, int16_t* audio_samples,
int8_t* speech_type) OVERRIDE; int8_t* speech_type) OVERRIDE;
virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def,
const CodecInst& codec_inst) OVERRIDE; const CodecInst& codec_inst) OVERRIDE;
virtual void DestructEncoderSafe() OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE;
@ -96,7 +96,7 @@ class ACMISAC : public ACMGenericCodec {
int32_t estimated_bandwidth) OVERRIDE; int32_t estimated_bandwidth) OVERRIDE;
virtual int32_t GetRedPayloadSafe(uint8_t* red_payload, virtual int32_t GetRedPayloadSafe(uint8_t* red_payload,
int16_t* payload_bytes) OVERRIDE; int16_t* payload_bytes) OVERRIDE;
virtual int16_t InternalCreateEncoder() OVERRIDE; virtual int16_t InternalCreateEncoder() OVERRIDE;
@ -114,8 +114,8 @@ class ACMISAC : public ACMGenericCodec {
void UpdateFrameLen(); void UpdateFrameLen();
virtual bool DecoderParamsSafe(WebRtcACMCodecParams *dec_params, virtual bool DecoderParamsSafe(WebRtcACMCodecParams* dec_params,
const uint8_t payload_type) OVERRIDE; const uint8_t payload_type) OVERRIDE;
virtual void SaveDecoderParamSafe( virtual void SaveDecoderParamSafe(
const WebRtcACMCodecParams* codec_params) OVERRIDE; const WebRtcACMCodecParams* codec_params) OVERRIDE;

10
webrtc/modules/audio_coding/main/source/acm_opus.h
View File

@ -37,13 +37,13 @@ class ACMOpus : public ACMGenericCodec {
protected: protected:
virtual int16_t DecodeSafe(uint8_t* bitstream, virtual int16_t DecodeSafe(uint8_t* bitstream,
int16_t bitstream_len_byte, int16_t bitstream_len_byte,
int16_t* audio, int16_t* audio,
int16_t* audio_samples, int16_t* audio_samples,
int8_t* speech_type) OVERRIDE; int8_t* speech_type) OVERRIDE;
virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def,
const CodecInst& codec_inst) OVERRIDE; const CodecInst& codec_inst) OVERRIDE;
virtual void DestructEncoderSafe() OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE;

12
webrtc/modules/audio_coding/main/source/acm_pcm16b.h
View File

@ -24,7 +24,7 @@ class ACMPCM16B : public ACMGenericCodec {
virtual ACMGenericCodec* CreateInstance(void) OVERRIDE; virtual ACMGenericCodec* CreateInstance(void) OVERRIDE;
virtual int16_t InternalEncode(uint8_t* bitstream, virtual int16_t InternalEncode(uint8_t* bitstream,
int16_t* bitstream_len_byte) OVERRIDE; int16_t* bitstream_len_byte) OVERRIDE;
virtual int16_t InternalInitEncoder( virtual int16_t InternalInitEncoder(
WebRtcACMCodecParams* codec_params) OVERRIDE; WebRtcACMCodecParams* codec_params) OVERRIDE;
@ -34,13 +34,13 @@ class ACMPCM16B : public ACMGenericCodec {
protected: protected:
virtual int16_t DecodeSafe(uint8_t* bitstream, virtual int16_t DecodeSafe(uint8_t* bitstream,
int16_t bitstream_len_byte, int16_t bitstream_len_byte,
int16_t* audio, int16_t* audio,
int16_t* audio_samples, int16_t* audio_samples,
int8_t* speech_type) OVERRIDE; int8_t* speech_type) OVERRIDE;
virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def,
const CodecInst& codec_inst) OVERRIDE; const CodecInst& codec_inst) OVERRIDE;
virtual void DestructEncoderSafe() OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE;

12
webrtc/modules/audio_coding/main/source/acm_red.h
View File

@ -24,7 +24,7 @@ class ACMRED : public ACMGenericCodec {
virtual ACMGenericCodec* CreateInstance(void) OVERRIDE; virtual ACMGenericCodec* CreateInstance(void) OVERRIDE;
virtual int16_t InternalEncode(uint8_t* bitstream, virtual int16_t InternalEncode(uint8_t* bitstream,
int16_t* bitstream_len_byte) OVERRIDE; int16_t* bitstream_len_byte) OVERRIDE;
virtual int16_t InternalInitEncoder( virtual int16_t InternalInitEncoder(
WebRtcACMCodecParams* codec_params) OVERRIDE; WebRtcACMCodecParams* codec_params) OVERRIDE;
@ -34,13 +34,13 @@ class ACMRED : public ACMGenericCodec {
protected: protected:
virtual int16_t DecodeSafe(uint8_t* bitstream, virtual int16_t DecodeSafe(uint8_t* bitstream,
int16_t bitstream_len_byte, int16_t bitstream_len_byte,
int16_t* audio, int16_t* audio,
int16_t* audio_samples, int16_t* audio_samples,
int8_t* speech_type) OVERRIDE; int8_t* speech_type) OVERRIDE;
virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def,
const CodecInst& codec_inst) OVERRIDE; const CodecInst& codec_inst) OVERRIDE;
virtual void DestructEncoderSafe() OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE;