zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modernize variable names

Browse Source 
As promised in
https://codereview.webrtc.org/1946873003/diff/1/webrtc/modules/utility/source/coder.h#newcode54

NOTRY=True

Review-Url: https://codereview.webrtc.org/1968853002
Cr-Commit-Position: refs/heads/master@{#12683}
This commit is contained in:
kwiberg
2016-05-11 04:26:39 -07:00
committed by Commit bot
parent cd6ae6652f
commit 8a70714851
2 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
webrtc/modules/utility/source/coder.cc
View File

@ -14,83 +14,83 @@
namespace webrtc { namespace webrtc {
AudioCoder::AudioCoder(uint32_t instanceID) AudioCoder::AudioCoder(uint32_t instance_id)
: _acm(AudioCodingModule::Create(instanceID)), : acm_(AudioCodingModule::Create(instance_id)),
_receiveCodec(), receive_codec_(),
_encodeTimestamp(0), encode_timestamp_(0),
_encodedData(NULL), encoded_data_(nullptr),
_encodedLengthInBytes(0), encoded_length_in_bytes_(0),
_decodeTimestamp(0) { decode_timestamp_(0) {
_acm->InitializeReceiver(); acm_->InitializeReceiver();
_acm->RegisterTransportCallback(this); acm_->RegisterTransportCallback(this);
} }
AudioCoder::~AudioCoder() {} AudioCoder::~AudioCoder() {}
int32_t AudioCoder::SetEncodeCodec(const CodecInst& codecInst) { int32_t AudioCoder::SetEncodeCodec(const CodecInst& codec_inst) {
const bool success = codec_manager_.RegisterEncoder(codecInst) && const bool success = codec_manager_.RegisterEncoder(codec_inst) &&
codec_manager_.MakeEncoder(&rent_a_codec_, _acm.get()); codec_manager_.MakeEncoder(&rent_a_codec_, acm_.get());
return success ? 0 : -1; return success ? 0 : -1;
} }
int32_t AudioCoder::SetDecodeCodec(const CodecInst& codecInst) { int32_t AudioCoder::SetDecodeCodec(const CodecInst& codec_inst) {
if (_acm->RegisterReceiveCodec( if (acm_->RegisterReceiveCodec(
codecInst, [&] { return rent_a_codec_.RentIsacDecoder(); }) == -1) { codec_inst, [&] { return rent_a_codec_.RentIsacDecoder(); }) == -1) {
return -1; return -1;
} }
memcpy(&_receiveCodec, &codecInst, sizeof(CodecInst)); memcpy(&receive_codec_, &codec_inst, sizeof(CodecInst));
return 0; return 0;
} }
int32_t AudioCoder::Decode(AudioFrame& decodedAudio, int32_t AudioCoder::Decode(AudioFrame& decoded_audio,
uint32_t sampFreqHz, uint32_t samp_freq_hz,
const int8_t* incomingPayload, const int8_t* incoming_payload,
size_t payloadLength) { size_t payload_length) {
if (payloadLength > 0) { if (payload_length > 0) {
const uint8_t payloadType = _receiveCodec.pltype; const uint8_t payload_type = receive_codec_.pltype;
_decodeTimestamp += _receiveCodec.pacsize; decode_timestamp_ += receive_codec_.pacsize;
if (_acm->IncomingPayload((const uint8_t*)incomingPayload, payloadLength, if (acm_->IncomingPayload((const uint8_t*)incoming_payload, payload_length,
payloadType, _decodeTimestamp) == -1) { payload_type, decode_timestamp_) == -1) {
return -1; return -1;
} }
} }
return _acm->PlayoutData10Ms((uint16_t)sampFreqHz, &decodedAudio); return acm_->PlayoutData10Ms((uint16_t)samp_freq_hz, &decoded_audio);
} }
int32_t AudioCoder::PlayoutData(AudioFrame& decodedAudio, int32_t AudioCoder::PlayoutData(AudioFrame& decoded_audio,
uint16_t& sampFreqHz) { uint16_t& samp_freq_hz) {
return _acm->PlayoutData10Ms(sampFreqHz, &decodedAudio); return acm_->PlayoutData10Ms(samp_freq_hz, &decoded_audio);
} }
int32_t AudioCoder::Encode(const AudioFrame& audio, int32_t AudioCoder::Encode(const AudioFrame& audio,
int8_t* encodedData, int8_t* encoded_data,
size_t& encodedLengthInBytes) { size_t& encoded_length_in_bytes) {
// Fake a timestamp in case audio doesn't contain a correct timestamp. // Fake a timestamp in case audio doesn't contain a correct timestamp.
// Make a local copy of the audio frame since audio is const // Make a local copy of the audio frame since audio is const
AudioFrame audioFrame; AudioFrame audio_frame;
audioFrame.CopyFrom(audio); audio_frame.CopyFrom(audio);
audioFrame.timestamp_ = _encodeTimestamp; audio_frame.timestamp_ = encode_timestamp_;
_encodeTimestamp += static_cast<uint32_t>(audioFrame.samples_per_channel_); encode_timestamp_ += static_cast<uint32_t>(audio_frame.samples_per_channel_);
// For any codec with a frame size that is longer than 10 ms the encoded // For any codec with a frame size that is longer than 10 ms the encoded
// length in bytes should be zero until a a full frame has been encoded. // length in bytes should be zero until a a full frame has been encoded.
_encodedLengthInBytes = 0; encoded_length_in_bytes_ = 0;
if (_acm->Add10MsData((AudioFrame&)audioFrame) == -1) { if (acm_->Add10MsData((AudioFrame&)audio_frame) == -1) {
return -1; return -1;
} }
_encodedData = encodedData; encoded_data_ = encoded_data;
encodedLengthInBytes = _encodedLengthInBytes; encoded_length_in_bytes = encoded_length_in_bytes_;
return 0; return 0;
} }
int32_t AudioCoder::SendData(FrameType /* frameType */, int32_t AudioCoder::SendData(FrameType /* frame_type */,
uint8_t /* payloadType */, uint8_t /* payload_type */,
uint32_t /* timeStamp */, uint32_t /* time_stamp */,
const uint8_t* payloadData, const uint8_t* payload_data,
size_t payloadSize, size_t payload_size,
const RTPFragmentationHeader* /* fragmentation*/) { const RTPFragmentationHeader* /* fragmentation*/) {
memcpy(_encodedData, payloadData, sizeof(uint8_t) * payloadSize); memcpy(encoded_data_, payload_data, sizeof(uint8_t) * payload_size);
_encodedLengthInBytes = payloadSize; encoded_length_in_bytes_ = payload_size;
return 0; return 0;
} }

42
webrtc/modules/utility/source/coder.h
View File

@ -24,44 +24,44 @@ class AudioFrame;
class AudioCoder : public AudioPacketizationCallback { class AudioCoder : public AudioPacketizationCallback {
public: public:
AudioCoder(uint32_t instanceID); AudioCoder(uint32_t instance_id);
~AudioCoder(); ~AudioCoder();
int32_t SetEncodeCodec(const CodecInst& codecInst); int32_t SetEncodeCodec(const CodecInst& codec_inst);
int32_t SetDecodeCodec(const CodecInst& codecInst); int32_t SetDecodeCodec(const CodecInst& codec_inst);
int32_t Decode(AudioFrame& decodedAudio, int32_t Decode(AudioFrame& decoded_audio,
uint32_t sampFreqHz, uint32_t samp_freq_hz,
const int8_t* incomingPayload, const int8_t* incoming_payload,
size_t payloadLength); size_t payload_length);
int32_t PlayoutData(AudioFrame& decodedAudio, uint16_t& sampFreqHz); int32_t PlayoutData(AudioFrame& decoded_audio, uint16_t& samp_freq_hz);
int32_t Encode(const AudioFrame& audio, int32_t Encode(const AudioFrame& audio,
int8_t* encodedData, int8_t* encoded_data,
size_t& encodedLengthInBytes); size_t& encoded_length_in_bytes);
protected: protected:
int32_t SendData(FrameType frameType, int32_t SendData(FrameType frame_type,
uint8_t payloadType, uint8_t payload_type,
uint32_t timeStamp, uint32_t time_stamp,
const uint8_t* payloadData, const uint8_t* payload_data,
size_t payloadSize, size_t payload_size,
const RTPFragmentationHeader* fragmentation) override; const RTPFragmentationHeader* fragmentation) override;
private: private:
std::unique_ptr<AudioCodingModule> _acm; std::unique_ptr<AudioCodingModule> acm_;
acm2::CodecManager codec_manager_; acm2::CodecManager codec_manager_;
acm2::RentACodec rent_a_codec_; acm2::RentACodec rent_a_codec_;
CodecInst _receiveCodec; CodecInst receive_codec_;
uint32_t _encodeTimestamp; uint32_t encode_timestamp_;
int8_t* _encodedData; int8_t* encoded_data_;
size_t _encodedLengthInBytes; size_t encoded_length_in_bytes_;
uint32_t _decodeTimestamp; uint32_t decode_timestamp_;
}; };
} // namespace webrtc } // namespace webrtc