generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AudioEncoderCng: CHECK that encode calls don't fail

Browse Source 
Calls to WebRtcCng_Encode, AudioEncoder::Encode and Vad::VoiceActivity fail only if fed bad input, so instead of handling failure, we can just CHECK. This also makes it unnecessary for methods AudioEncoderCng::EncodePassive and AudioEncoderCng::EncodeActive to return a value, so we can make them void.

R=kwiberg@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/39279004

Cr-Commit-Position: refs/heads/master@{#8475}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8475 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
jmarusic@webrtc.org 2015-02-24 14:58:10 +00:00
parent 5e3fea1049
commit f88791d783
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc
View File

@ -146,12 +146,10 @@ bool AudioEncoderCng::EncodeInternal(uint32_t rtp_timestamp,
&speech_buffer_[samples_per_10ms_frame * blocks_in_first_vad_call], &speech_buffer_[samples_per_10ms_frame * blocks_in_first_vad_call],
samples_per_10ms_frame * blocks_in_second_vad_call, SampleRateHz()); samples_per_10ms_frame * blocks_in_second_vad_call, SampleRateHz());
} }
DCHECK_NE(activity, Vad::kError);
bool return_val = true;
switch (activity) { switch (activity) {
case Vad::kPassive: { case Vad::kPassive: {
return_val = EncodePassive(encoded, &info->encoded_bytes); EncodePassive(encoded, &info->encoded_bytes);
info->encoded_timestamp = first_timestamp_in_buffer_; info->encoded_timestamp = first_timestamp_in_buffer_;
info->payload_type = cng_payload_type_; info->payload_type = cng_payload_type_;
info->send_even_if_empty = true; info->send_even_if_empty = true;
@ -159,32 +157,31 @@ bool AudioEncoderCng::EncodeInternal(uint32_t rtp_timestamp,
break; break;
} }
case Vad::kActive: { case Vad::kActive: {
return_val = EncodeActive(max_encoded_bytes, encoded, info); EncodeActive(max_encoded_bytes, encoded, info);
last_frame_active_ = true; last_frame_active_ = true;
break; break;
} }
case Vad::kError: { case Vad::kError: {
return_val = false; FATAL(); // Fails only if fed invalid data.
break; break;
} }
} }
speech_buffer_.clear(); speech_buffer_.clear();
frames_in_buffer_ = 0; frames_in_buffer_ = 0;
return return_val; return true;
} }
bool AudioEncoderCng::EncodePassive(uint8_t* encoded, size_t* encoded_bytes) { void AudioEncoderCng::EncodePassive(uint8_t* encoded, size_t* encoded_bytes) {
bool force_sid = last_frame_active_; bool force_sid = last_frame_active_;
bool output_produced = false; bool output_produced = false;
const size_t samples_per_10ms_frame = 10 * SampleRateHz() / 1000; const size_t samples_per_10ms_frame = 10 * SampleRateHz() / 1000;
for (int i = 0; i < frames_in_buffer_; ++i) { for (int i = 0; i < frames_in_buffer_; ++i) {
int16_t encoded_bytes_tmp = 0; int16_t encoded_bytes_tmp = 0;
if (WebRtcCng_Encode(cng_inst_.get(), CHECK_GE(WebRtcCng_Encode(cng_inst_.get(),
&speech_buffer_[i * samples_per_10ms_frame], &speech_buffer_[i * samples_per_10ms_frame],
static_cast<int16_t>(samples_per_10ms_frame), encoded, static_cast<int16_t>(samples_per_10ms_frame),
&encoded_bytes_tmp, force_sid) < 0) encoded, &encoded_bytes_tmp, force_sid), 0);
return false;
if (encoded_bytes_tmp > 0) { if (encoded_bytes_tmp > 0) {
CHECK(!output_produced); CHECK(!output_produced);
*encoded_bytes = static_cast<size_t>(encoded_bytes_tmp); *encoded_bytes = static_cast<size_t>(encoded_bytes_tmp);
@ -192,24 +189,21 @@ bool AudioEncoderCng::EncodePassive(uint8_t* encoded, size_t* encoded_bytes) {
force_sid = false; force_sid = false;
} }
} }
return true;
} }
bool AudioEncoderCng::EncodeActive(size_t max_encoded_bytes, void AudioEncoderCng::EncodeActive(size_t max_encoded_bytes,
uint8_t* encoded, uint8_t* encoded,
EncodedInfo* info) { EncodedInfo* info) {
const size_t samples_per_10ms_frame = 10 * SampleRateHz() / 1000; const size_t samples_per_10ms_frame = 10 * SampleRateHz() / 1000;
for (int i = 0; i < frames_in_buffer_; ++i) { for (int i = 0; i < frames_in_buffer_; ++i) {
if (!speech_encoder_->Encode(first_timestamp_in_buffer_, CHECK(speech_encoder_->Encode(first_timestamp_in_buffer_,
&speech_buffer_[i * samples_per_10ms_frame], &speech_buffer_[i * samples_per_10ms_frame],
samples_per_10ms_frame, max_encoded_bytes, samples_per_10ms_frame, max_encoded_bytes,
encoded, info)) encoded, info));
return false;
if (i < frames_in_buffer_ - 1) { if (i < frames_in_buffer_ - 1) {
CHECK_EQ(info->encoded_bytes, 0u) << "Encoder delivered data too early."; CHECK_EQ(info->encoded_bytes, 0u) << "Encoder delivered data too early.";
} }
} }
return true;
} }
} // namespace webrtc } // namespace webrtc

4
webrtc/modules/audio_coding/codecs/cng/include/audio_encoder_cng.h
View File

@ -68,9 +68,9 @@ class AudioEncoderCng final : public AudioEncoder {
inline void operator()(CNG_enc_inst* ptr) const { WebRtcCng_FreeEnc(ptr); } inline void operator()(CNG_enc_inst* ptr) const { WebRtcCng_FreeEnc(ptr); }
}; };
bool EncodePassive(uint8_t* encoded, size_t* encoded_bytes); void EncodePassive(uint8_t* encoded, size_t* encoded_bytes);
bool EncodeActive(size_t max_encoded_bytes, void EncodeActive(size_t max_encoded_bytes,
uint8_t* encoded, uint8_t* encoded,
EncodedInfo* info); EncodedInfo* info);