diff options
| author | jmarusic@webrtc.org <jmarusic@webrtc.org> | 2015-03-19 08:50:26 +0000 |
|---|---|---|
| committer | jmarusic@webrtc.org <jmarusic@webrtc.org> | 2015-03-19 08:51:20 +0000 |
| commit | 9afaee74ab1ef36c8b4ea4c22f4c5aebf2359da2 (patch) | |
| tree | 030ea2aab326bda19157d9e776b21dc628342d48 /webrtc/modules/audio_coding/codecs/audio_encoder.cc | |
| parent | d21406d333981db824d6007da9dd4f927236fbe1 (diff) | |
| download | webrtc-9afaee74ab1ef36c8b4ea4c22f4c5aebf2359da2.tar.gz | |
Reland 8749: AudioEncoder: return EncodedInfo from Encode() and EncodeInternal()
Old review at:
https://webrtc-codereview.appspot.com/43839004/
R=kwiberg@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/45769004
Cr-Commit-Position: refs/heads/master@{#8788}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8788 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/modules/audio_coding/codecs/audio_encoder.cc')
| -rw-r--r-- | webrtc/modules/audio_coding/codecs/audio_encoder.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/webrtc/modules/audio_coding/codecs/audio_encoder.cc b/webrtc/modules/audio_coding/codecs/audio_encoder.cc index 1d83e54a0d..72e4265e98 100644 --- a/webrtc/modules/audio_coding/codecs/audio_encoder.cc +++ b/webrtc/modules/audio_coding/codecs/audio_encoder.cc @@ -19,16 +19,17 @@ AudioEncoder::EncodedInfo::EncodedInfo() : EncodedInfoLeaf() { AudioEncoder::EncodedInfo::~EncodedInfo() { } -void AudioEncoder::Encode(uint32_t rtp_timestamp, - const int16_t* audio, - size_t num_samples_per_channel, - size_t max_encoded_bytes, - uint8_t* encoded, - EncodedInfo* info) { +AudioEncoder::EncodedInfo AudioEncoder::Encode(uint32_t rtp_timestamp, + const int16_t* audio, + size_t num_samples_per_channel, + size_t max_encoded_bytes, + uint8_t* encoded) { CHECK_EQ(num_samples_per_channel, static_cast<size_t>(SampleRateHz() / 100)); - EncodeInternal(rtp_timestamp, audio, max_encoded_bytes, encoded, info); - CHECK_LE(info->encoded_bytes, max_encoded_bytes); + EncodedInfo info = + EncodeInternal(rtp_timestamp, audio, max_encoded_bytes, encoded); + CHECK_LE(info.encoded_bytes, max_encoded_bytes); + return info; } int AudioEncoder::RtpTimestampRateHz() const { |