From a165d9c0a4238170e1a93c2a131fbcea3e5d3df6 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Wed, 7 Aug 2013 14:17:05 +0000 Subject: [PATCH] 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 --- .../audio_coding/main/source/acm_amr.h | 19 +++++++-------- .../audio_coding/main/source/acm_amrwb.h | 13 +++++----- .../audio_coding/main/source/acm_celt.h | 13 +++++----- .../audio_coding/main/source/acm_cng.h | 11 +++++---- .../main/source/acm_dtmf_playout.h | 9 +++---- .../audio_coding/main/source/acm_g722.h | 19 ++++++++------- .../audio_coding/main/source/acm_ilbc.h | 12 +++++----- .../audio_coding/main/source/acm_isac.h | 24 +++++++++---------- .../audio_coding/main/source/acm_opus.h | 10 ++++---- .../audio_coding/main/source/acm_pcm16b.h | 12 +++++----- .../audio_coding/main/source/acm_red.h | 12 +++++----- 11 files changed, 78 insertions(+), 76 deletions(-) diff --git a/webrtc/modules/audio_coding/main/source/acm_amr.h b/webrtc/modules/audio_coding/main/source/acm_amr.h index e077ad6c28..72ed0a22bd 100644 --- a/webrtc/modules/audio_coding/main/source/acm_amr.h +++ b/webrtc/modules/audio_coding/main/source/acm_amr.h @@ -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(); @@ -30,7 +30,7 @@ class ACMAMR: public ACMGenericCodec { virtual ACMGenericCodec* CreateInstance(void) OVERRIDE; virtual int16_t InternalEncode(uint8_t* bitstream, - int16_t* bitstream_len_byte) OVERRIDE; + int16_t* bitstream_len_byte) OVERRIDE; virtual int16_t InternalInitEncoder( WebRtcACMCodecParams* codec_params) OVERRIDE; @@ -38,24 +38,23 @@ 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, - int8_t* speech_type) OVERRIDE; + int16_t bitstream_len_byte, + int16_t* audio, + int16_t* audio_samples, + int8_t* speech_type) OVERRIDE; virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, - const CodecInst& codec_inst) OVERRIDE; + const CodecInst& codec_inst) OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE; diff --git a/webrtc/modules/audio_coding/main/source/acm_amrwb.h b/webrtc/modules/audio_coding/main/source/acm_amrwb.h index e209bce38e..485f1395ab 100644 --- a/webrtc/modules/audio_coding/main/source/acm_amrwb.h +++ b/webrtc/modules/audio_coding/main/source/acm_amrwb.h @@ -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(); @@ -28,7 +28,7 @@ class ACMAMRwb: public ACMGenericCodec { virtual ACMGenericCodec* CreateInstance(void) OVERRIDE; virtual int16_t InternalEncode(uint8_t* bitstream, - int16_t* bitstream_len_byte) OVERRIDE; + int16_t* bitstream_len_byte) OVERRIDE; virtual int16_t InternalInitEncoder( WebRtcACMCodecParams* codec_params) OVERRIDE; @@ -48,12 +48,13 @@ class ACMAMRwb: public ACMGenericCodec { protected: virtual int16_t DecodeSafe(uint8_t* bitstream, - int16_t bitstream_len_byte, - int16_t* audio, int16_t* audio_samples, - int8_t* speech_type) OVERRIDE; + int16_t bitstream_len_byte, + int16_t* audio, + int16_t* audio_samples, + int8_t* speech_type) OVERRIDE; virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, - const CodecInst& codec_inst) OVERRIDE; + const CodecInst& codec_inst) OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE; diff --git a/webrtc/modules/audio_coding/main/source/acm_celt.h b/webrtc/modules/audio_coding/main/source/acm_celt.h index a24338de4e..0bc1afe13c 100644 --- a/webrtc/modules/audio_coding/main/source/acm_celt.h +++ b/webrtc/modules/audio_coding/main/source/acm_celt.h @@ -36,15 +36,14 @@ class ACMCELT : public ACMGenericCodec { WebRtcACMCodecParams* codec_params) OVERRIDE; protected: - virtual int16_t DecodeSafe( - uint8_t* /* bitstream */, - int16_t /* bitstream_len_byte */, - int16_t* /* audio */, - int16_t* /* audio_samples */, - int8_t* /* speech_type */) OVERRIDE; + virtual int16_t DecodeSafe(uint8_t* /* bitstream */, + int16_t /* bitstream_len_byte */, + int16_t* /* audio */, + int16_t* /* audio_samples */, + int8_t* /* speech_type */) OVERRIDE; virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, - const CodecInst& codec_inst) OVERRIDE; + const CodecInst& codec_inst) OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE; diff --git a/webrtc/modules/audio_coding/main/source/acm_cng.h b/webrtc/modules/audio_coding/main/source/acm_cng.h index 37391745c4..32df580603 100644 --- a/webrtc/modules/audio_coding/main/source/acm_cng.h +++ b/webrtc/modules/audio_coding/main/source/acm_cng.h @@ -28,7 +28,7 @@ class ACMCNG: public ACMGenericCodec { virtual ACMGenericCodec* CreateInstance(void) OVERRIDE; virtual int16_t InternalEncode(uint8_t* bitstream, - int16_t* bitstream_len_byte) OVERRIDE; + int16_t* bitstream_len_byte) OVERRIDE; virtual int16_t InternalInitEncoder( WebRtcACMCodecParams* codec_params) OVERRIDE; @@ -38,12 +38,13 @@ class ACMCNG: public ACMGenericCodec { protected: virtual int16_t DecodeSafe(uint8_t* bitstream, - int16_t bitstream_len_byte, - int16_t* audio, int16_t* audio_samples, - int8_t* speech_type) OVERRIDE; + int16_t bitstream_len_byte, + int16_t* audio, + int16_t* audio_samples, + int8_t* speech_type) OVERRIDE; virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, - const CodecInst& codec_inst) OVERRIDE; + const CodecInst& codec_inst) OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE; diff --git a/webrtc/modules/audio_coding/main/source/acm_dtmf_playout.h b/webrtc/modules/audio_coding/main/source/acm_dtmf_playout.h index 2f8a28b9d3..11af23495a 100644 --- a/webrtc/modules/audio_coding/main/source/acm_dtmf_playout.h +++ b/webrtc/modules/audio_coding/main/source/acm_dtmf_playout.h @@ -34,12 +34,13 @@ class ACMDTMFPlayout: public ACMGenericCodec { protected: virtual int16_t DecodeSafe(uint8_t* bitstream, - int16_t bitstream_len_byte, - int16_t* audio, int16_t* audio_samples, - int8_t* speech_type) OVERRIDE; + int16_t bitstream_len_byte, + int16_t* audio, + int16_t* audio_samples, + int8_t* speech_type) OVERRIDE; virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, - const CodecInst& codec_inst) OVERRIDE; + const CodecInst& codec_inst) OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE; diff --git a/webrtc/modules/audio_coding/main/source/acm_g722.h b/webrtc/modules/audio_coding/main/source/acm_g722.h index 70014229e6..8dea5a7a5e 100644 --- a/webrtc/modules/audio_coding/main/source/acm_g722.h +++ b/webrtc/modules/audio_coding/main/source/acm_g722.h @@ -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(); @@ -41,17 +41,18 @@ class ACMG722: public ACMGenericCodec { protected: virtual int16_t DecodeSafe(uint8_t* bitstream, - int16_t bitstream_len_byte, - int16_t* audio, int16_t* audio_samples, - int8_t* speech_type) OVERRIDE; + int16_t bitstream_len_byte, + int16_t* audio, + int16_t* audio_samples, + int8_t* speech_type) OVERRIDE; 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, - const int16_t* data, - const uint16_t length_smpl, - const uint8_t audio_channel) OVERRIDE; + const int16_t* data, + const uint16_t length_smpl, + const uint8_t audio_channel) OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE; @@ -70,7 +71,7 @@ class ACMG722: public ACMGenericCodec { ACMG722DecStr* ptr_dec_str_; G722EncInst* encoder_inst_ptr_; - G722EncInst* encoder_inst_ptr_right_; // Prepared for stereo + G722EncInst* encoder_inst_ptr_right_; // Prepared for stereo G722DecInst* decoder_inst_ptr_; }; diff --git a/webrtc/modules/audio_coding/main/source/acm_ilbc.h b/webrtc/modules/audio_coding/main/source/acm_ilbc.h index 1f0a48dff1..50b6df9a9a 100644 --- a/webrtc/modules/audio_coding/main/source/acm_ilbc.h +++ b/webrtc/modules/audio_coding/main/source/acm_ilbc.h @@ -28,7 +28,7 @@ class ACMILBC : public ACMGenericCodec { virtual ACMGenericCodec* CreateInstance(void) OVERRIDE; virtual int16_t InternalEncode(uint8_t* bitstream, - int16_t* bitstream_len_byte) OVERRIDE; + int16_t* bitstream_len_byte) OVERRIDE; virtual int16_t InternalInitEncoder( WebRtcACMCodecParams* codec_params) OVERRIDE; @@ -38,13 +38,13 @@ class ACMILBC : public ACMGenericCodec { protected: virtual int16_t DecodeSafe(uint8_t* bitstream, - int16_t bitstream_len_byte, - int16_t* audio, - int16_t* audio_samples, - int8_t* speech_type) OVERRIDE; + int16_t bitstream_len_byte, + int16_t* audio, + int16_t* audio_samples, + int8_t* speech_type) OVERRIDE; 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; diff --git a/webrtc/modules/audio_coding/main/source/acm_isac.h b/webrtc/modules/audio_coding/main/source/acm_isac.h index 8f55969215..9588723cb5 100644 --- a/webrtc/modules/audio_coding/main/source/acm_isac.h +++ b/webrtc/modules/audio_coding/main/source/acm_isac.h @@ -31,7 +31,7 @@ class ACMISAC : public ACMGenericCodec { virtual ACMGenericCodec* CreateInstance(void) OVERRIDE; virtual int16_t InternalEncode(uint8_t* bitstream, - int16_t* bitstream_len_byte) OVERRIDE; + int16_t* bitstream_len_byte) OVERRIDE; virtual int16_t InternalInitEncoder( 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 int16_t REDPayloadISAC(const int32_t isac_rate, - const int16_t isac_bw_estimate, - uint8_t* payload, - int16_t* payload_len_bytes) OVERRIDE; + const int16_t isac_bw_estimate, + uint8_t* payload, + int16_t* payload_len_bytes) OVERRIDE; protected: virtual int16_t DecodeSafe(uint8_t* bitstream, - int16_t bitstream_len_byte, - int16_t* audio, - int16_t* audio_samples, - int8_t* speech_type) OVERRIDE; + int16_t bitstream_len_byte, + int16_t* audio, + int16_t* audio_samples, + int8_t* speech_type) OVERRIDE; virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, - const CodecInst& codec_inst) OVERRIDE; + const CodecInst& codec_inst) OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE; @@ -96,7 +96,7 @@ class ACMISAC : public ACMGenericCodec { int32_t estimated_bandwidth) OVERRIDE; virtual int32_t GetRedPayloadSafe(uint8_t* red_payload, - int16_t* payload_bytes) OVERRIDE; + int16_t* payload_bytes) OVERRIDE; virtual int16_t InternalCreateEncoder() OVERRIDE; @@ -114,8 +114,8 @@ class ACMISAC : public ACMGenericCodec { void UpdateFrameLen(); - virtual bool DecoderParamsSafe(WebRtcACMCodecParams *dec_params, - const uint8_t payload_type) OVERRIDE; + virtual bool DecoderParamsSafe(WebRtcACMCodecParams* dec_params, + const uint8_t payload_type) OVERRIDE; virtual void SaveDecoderParamSafe( const WebRtcACMCodecParams* codec_params) OVERRIDE; diff --git a/webrtc/modules/audio_coding/main/source/acm_opus.h b/webrtc/modules/audio_coding/main/source/acm_opus.h index 68685d44d4..fa188a1cb0 100644 --- a/webrtc/modules/audio_coding/main/source/acm_opus.h +++ b/webrtc/modules/audio_coding/main/source/acm_opus.h @@ -37,13 +37,13 @@ class ACMOpus : public ACMGenericCodec { protected: virtual int16_t DecodeSafe(uint8_t* bitstream, - int16_t bitstream_len_byte, - int16_t* audio, - int16_t* audio_samples, - int8_t* speech_type) OVERRIDE; + int16_t bitstream_len_byte, + int16_t* audio, + int16_t* audio_samples, + int8_t* speech_type) OVERRIDE; virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, - const CodecInst& codec_inst) OVERRIDE; + const CodecInst& codec_inst) OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE; diff --git a/webrtc/modules/audio_coding/main/source/acm_pcm16b.h b/webrtc/modules/audio_coding/main/source/acm_pcm16b.h index 3c4654b9d8..38de343760 100644 --- a/webrtc/modules/audio_coding/main/source/acm_pcm16b.h +++ b/webrtc/modules/audio_coding/main/source/acm_pcm16b.h @@ -24,7 +24,7 @@ class ACMPCM16B : public ACMGenericCodec { virtual ACMGenericCodec* CreateInstance(void) OVERRIDE; virtual int16_t InternalEncode(uint8_t* bitstream, - int16_t* bitstream_len_byte) OVERRIDE; + int16_t* bitstream_len_byte) OVERRIDE; virtual int16_t InternalInitEncoder( WebRtcACMCodecParams* codec_params) OVERRIDE; @@ -34,13 +34,13 @@ class ACMPCM16B : public ACMGenericCodec { protected: virtual int16_t DecodeSafe(uint8_t* bitstream, - int16_t bitstream_len_byte, - int16_t* audio, - int16_t* audio_samples, - int8_t* speech_type) OVERRIDE; + int16_t bitstream_len_byte, + int16_t* audio, + int16_t* audio_samples, + int8_t* speech_type) OVERRIDE; virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, - const CodecInst& codec_inst) OVERRIDE; + const CodecInst& codec_inst) OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE; diff --git a/webrtc/modules/audio_coding/main/source/acm_red.h b/webrtc/modules/audio_coding/main/source/acm_red.h index 7034f6eec2..c7bad41630 100644 --- a/webrtc/modules/audio_coding/main/source/acm_red.h +++ b/webrtc/modules/audio_coding/main/source/acm_red.h @@ -24,7 +24,7 @@ class ACMRED : public ACMGenericCodec { virtual ACMGenericCodec* CreateInstance(void) OVERRIDE; virtual int16_t InternalEncode(uint8_t* bitstream, - int16_t* bitstream_len_byte) OVERRIDE; + int16_t* bitstream_len_byte) OVERRIDE; virtual int16_t InternalInitEncoder( WebRtcACMCodecParams* codec_params) OVERRIDE; @@ -34,13 +34,13 @@ class ACMRED : public ACMGenericCodec { protected: virtual int16_t DecodeSafe(uint8_t* bitstream, - int16_t bitstream_len_byte, - int16_t* audio, - int16_t* audio_samples, - int8_t* speech_type) OVERRIDE; + int16_t bitstream_len_byte, + int16_t* audio, + int16_t* audio_samples, + int8_t* speech_type) OVERRIDE; virtual int32_t CodecDef(WebRtcNetEQ_CodecDef& codec_def, - const CodecInst& codec_inst) OVERRIDE; + const CodecInst& codec_inst) OVERRIDE; virtual void DestructEncoderSafe() OVERRIDE;