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

Error in update of read index in ACM

Browse Source 
Fixing a bug where we increase read index with too few samples when the input is stereo.

BUG=https://code.google.com/p/webrtc/issues/detail?id=714
R=andrew@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4290 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tina.legrand@webrtc.org
2013-07-03 09:25:34 +00:00
parent ecd3c800c4
commit b1698ab827
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/modules/audio_coding/main/source/acm_generic_codec.cc
View File

@@ -303,8 +303,7 @@ int16_t ACMGenericCodec::Encode(uint8_t* bitstream,
// Reset the variables which will be incremented in the loop. // Reset the variables which will be incremented in the loop.
*bitstream_len_byte = 0; *bitstream_len_byte = 0;
bool done = false; do {
while (!done) {
status = InternalEncode(&bitstream[*bitstream_len_byte], status = InternalEncode(&bitstream[*bitstream_len_byte],
&tmp_bitstream_len_byte); &tmp_bitstream_len_byte);
*bitstream_len_byte += tmp_bitstream_len_byte; *bitstream_len_byte += tmp_bitstream_len_byte;
@@ -323,12 +322,7 @@ int16_t ACMGenericCodec::Encode(uint8_t* bitstream,
// break from the loop // break from the loop
break; break;
} }
} while (in_audio_ix_read_ < frame_len_smpl_ * num_channels_);
// TODO(andrew): This should be multiplied by the number of
// channels, right?
// http://code.google.com/p/webrtc/issues/detail?id=714
done = in_audio_ix_read_ >= frame_len_smpl_;
}
} }
if (status >= 0) { if (status >= 0) {
*encoding_type = (vad_label_[0] == 1) ? kActiveNormalEncoded : *encoding_type = (vad_label_[0] == 1) ? kActiveNormalEncoded :