Run "git cl format --full" on a pair of files with ancient formatting

Review-Url: https://codereview.webrtc.org/1946873003
Cr-Commit-Position: refs/heads/master@{#12625}
This commit is contained in:
kwiberg
2016-05-04 05:12:19 -07:00
committed by Commit bot
parent 053f917741
commit 73987c9932
2 changed files with 74 additions and 83 deletions

View File

@ -22,45 +22,47 @@
namespace webrtc {
class AudioFrame;
class AudioCoder : public AudioPacketizationCallback
{
public:
AudioCoder(uint32_t instanceID);
~AudioCoder();
class AudioCoder : public AudioPacketizationCallback {
public:
AudioCoder(uint32_t instanceID);
~AudioCoder();
int32_t SetEncodeCodec(const CodecInst& codecInst);
int32_t SetEncodeCodec(const CodecInst& codecInst);
int32_t SetDecodeCodec(const CodecInst& codecInst);
int32_t SetDecodeCodec(const CodecInst& codecInst);
int32_t Decode(AudioFrame& decodedAudio, uint32_t sampFreqHz,
const int8_t* incomingPayload, size_t payloadLength);
int32_t Decode(AudioFrame& decodedAudio,
uint32_t sampFreqHz,
const int8_t* incomingPayload,
size_t payloadLength);
int32_t PlayoutData(AudioFrame& decodedAudio, uint16_t& sampFreqHz);
int32_t PlayoutData(AudioFrame& decodedAudio, uint16_t& sampFreqHz);
int32_t Encode(const AudioFrame& audio, int8_t* encodedData,
size_t& encodedLengthInBytes);
int32_t Encode(const AudioFrame& audio,
int8_t* encodedData,
size_t& encodedLengthInBytes);
protected:
int32_t SendData(FrameType frameType,
uint8_t payloadType,
uint32_t timeStamp,
const uint8_t* payloadData,
size_t payloadSize,
const RTPFragmentationHeader* fragmentation) override;
protected:
int32_t SendData(FrameType frameType,
uint8_t payloadType,
uint32_t timeStamp,
const uint8_t* payloadData,
size_t payloadSize,
const RTPFragmentationHeader* fragmentation) override;
private:
std::unique_ptr<AudioCodingModule> _acm;
acm2::CodecManager codec_manager_;
acm2::RentACodec rent_a_codec_;
private:
std::unique_ptr<AudioCodingModule> _acm;
acm2::CodecManager codec_manager_;
acm2::RentACodec rent_a_codec_;
CodecInst _receiveCodec;
CodecInst _receiveCodec;
uint32_t _encodeTimestamp;
int8_t* _encodedData;
size_t _encodedLengthInBytes;
uint32_t _encodeTimestamp;
int8_t* _encodedData;
size_t _encodedLengthInBytes;
uint32_t _decodeTimestamp;
uint32_t _decodeTimestamp;
};
} // namespace webrtc
#endif // WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_
#endif // WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_