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

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

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

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

@ -13,21 +13,19 @@
#include "webrtc/modules/utility/source/coder.h" #include "webrtc/modules/utility/source/coder.h"
namespace webrtc { namespace webrtc {
AudioCoder::AudioCoder(uint32_t instanceID) AudioCoder::AudioCoder(uint32_t instanceID)
: _acm(AudioCodingModule::Create(instanceID)), : _acm(AudioCodingModule::Create(instanceID)),
_receiveCodec(), _receiveCodec(),
_encodeTimestamp(0), _encodeTimestamp(0),
_encodedData(NULL), _encodedData(NULL),
_encodedLengthInBytes(0), _encodedLengthInBytes(0),
_decodeTimestamp(0) _decodeTimestamp(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& codecInst) {
const bool success = codec_manager_.RegisterEncoder(codecInst) && const bool success = codec_manager_.RegisterEncoder(codecInst) &&
@ -46,63 +44,54 @@ int32_t AudioCoder::SetDecodeCodec(const CodecInst& codecInst) {
int32_t AudioCoder::Decode(AudioFrame& decodedAudio, int32_t AudioCoder::Decode(AudioFrame& decodedAudio,
uint32_t sampFreqHz, uint32_t sampFreqHz,
const int8_t* incomingPayload, const int8_t* incomingPayload,
size_t payloadLength) size_t payloadLength) {
{ if (payloadLength > 0) {
if (payloadLength > 0) const uint8_t payloadType = _receiveCodec.pltype;
{ _decodeTimestamp += _receiveCodec.pacsize;
const uint8_t payloadType = _receiveCodec.pltype; if (_acm->IncomingPayload((const uint8_t*)incomingPayload, payloadLength,
_decodeTimestamp += _receiveCodec.pacsize; payloadType, _decodeTimestamp) == -1) {
if(_acm->IncomingPayload((const uint8_t*) incomingPayload, return -1;
payloadLength,
payloadType,
_decodeTimestamp) == -1)
{
return -1;
}
} }
return _acm->PlayoutData10Ms((uint16_t)sampFreqHz, &decodedAudio); }
return _acm->PlayoutData10Ms((uint16_t)sampFreqHz, &decodedAudio);
} }
int32_t AudioCoder::PlayoutData(AudioFrame& decodedAudio, int32_t AudioCoder::PlayoutData(AudioFrame& decodedAudio,
uint16_t& sampFreqHz) uint16_t& sampFreqHz) {
{ return _acm->PlayoutData10Ms(sampFreqHz, &decodedAudio);
return _acm->PlayoutData10Ms(sampFreqHz, &decodedAudio);
} }
int32_t AudioCoder::Encode(const AudioFrame& audio, int32_t AudioCoder::Encode(const AudioFrame& audio,
int8_t* encodedData, int8_t* encodedData,
size_t& encodedLengthInBytes) size_t& encodedLengthInBytes) {
{ // 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 audioFrame; audioFrame.CopyFrom(audio);
audioFrame.CopyFrom(audio); audioFrame.timestamp_ = _encodeTimestamp;
audioFrame.timestamp_ = _encodeTimestamp; _encodeTimestamp += static_cast<uint32_t>(audioFrame.samples_per_channel_);
_encodeTimestamp += static_cast<uint32_t>(audioFrame.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; _encodedLengthInBytes = 0;
if(_acm->Add10MsData((AudioFrame&)audioFrame) == -1) if (_acm->Add10MsData((AudioFrame&)audioFrame) == -1) {
{ return -1;
return -1; }
} _encodedData = encodedData;
_encodedData = encodedData; encodedLengthInBytes = _encodedLengthInBytes;
encodedLengthInBytes = _encodedLengthInBytes; return 0;
return 0;
} }
int32_t AudioCoder::SendData( int32_t AudioCoder::SendData(FrameType /* frameType */,
FrameType /* frameType */, uint8_t /* payloadType */,
uint8_t /* payloadType */, uint32_t /* timeStamp */,
uint32_t /* timeStamp */, const uint8_t* payloadData,
const uint8_t* payloadData, size_t payloadSize,
size_t payloadSize, const RTPFragmentationHeader* /* fragmentation*/) {
const RTPFragmentationHeader* /* fragmentation*/) memcpy(_encodedData, payloadData, sizeof(uint8_t) * payloadSize);
{ _encodedLengthInBytes = payloadSize;
memcpy(_encodedData,payloadData,sizeof(uint8_t) * payloadSize); return 0;
_encodedLengthInBytes = payloadSize;
return 0;
} }
} // namespace webrtc } // namespace webrtc

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

@ -22,45 +22,47 @@
namespace webrtc { namespace webrtc {
class AudioFrame; class AudioFrame;
class AudioCoder : public AudioPacketizationCallback class AudioCoder : public AudioPacketizationCallback {
{ public:
public: AudioCoder(uint32_t instanceID);
AudioCoder(uint32_t instanceID); ~AudioCoder();
~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, int32_t Decode(AudioFrame& decodedAudio,
const int8_t* incomingPayload, size_t payloadLength); 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, int32_t Encode(const AudioFrame& audio,
size_t& encodedLengthInBytes); int8_t* encodedData,
size_t& encodedLengthInBytes);
protected: protected:
int32_t SendData(FrameType frameType, int32_t SendData(FrameType frameType,
uint8_t payloadType, uint8_t payloadType,
uint32_t timeStamp, uint32_t timeStamp,
const uint8_t* payloadData, const uint8_t* payloadData,
size_t payloadSize, size_t payloadSize,
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 _receiveCodec;
uint32_t _encodeTimestamp; uint32_t _encodeTimestamp;
int8_t* _encodedData; int8_t* _encodedData;
size_t _encodedLengthInBytes; size_t _encodedLengthInBytes;
uint32_t _decodeTimestamp; uint32_t _decodeTimestamp;
}; };
} // namespace webrtc } // namespace webrtc
#endif // WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_ #endif // WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_