| Index: webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc
|
| diff --git a/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc b/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc
|
| index 9b23607f0b57f1d8b6e20492c49f58cc19f2bbfb..c662b5ba5abb5440d2219961528a39070b6ccc15 100644
|
| --- a/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc
|
| +++ b/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc
|
| @@ -136,9 +136,9 @@ AudioEncoder::EncodedInfo AudioEncoderCng::EncodeInternal(
|
| (frames_to_encode > 3 ? 3 : frames_to_encode);
|
| if (frames_to_encode == 4)
|
| blocks_in_first_vad_call = 2;
|
| + CHECK_GE(frames_to_encode, blocks_in_first_vad_call);
|
| const int blocks_in_second_vad_call =
|
| frames_to_encode - blocks_in_first_vad_call;
|
| - CHECK_GE(blocks_in_second_vad_call, 0);
|
|
|
| // Check if all of the buffer is passive speech. Start with checking the first
|
| // block.
|
| @@ -217,7 +217,7 @@ AudioEncoder::EncodedInfo AudioEncoderCng::EncodeActive(
|
| info = speech_encoder_->Encode(
|
| rtp_timestamps_.front(), &speech_buffer_[i * samples_per_10ms_frame],
|
| samples_per_10ms_frame, max_encoded_bytes, encoded);
|
| - if (i == frames_to_encode - 1) {
|
| + if (i + 1 == frames_to_encode) {
|
| CHECK_GT(info.encoded_bytes, 0u) << "Encoder didn't deliver data.";
|
| } else {
|
| CHECK_EQ(info.encoded_bytes, 0u) << "Encoder delivered data too early.";
|
|
|