diff options
| author | Glenn Kasten <gkasten@android.com> | 2012-12-17 12:29:06 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-17 12:29:06 -0800 |
| commit | f38259cfe5566914a49f5b0f8b11aa6a951d667a (patch) | |
| tree | adf8844f33a15f6bd2d7ddf5ff3dc5e34a1309b2 | |
| parent | 0cd75629a8f7a6bd47b2abc6dd8d9f66e70d76a4 (diff) | |
| parent | 9b1797fed7065be05f8fb7a36d1a27e0df3cb7ab (diff) | |
Merge "Fix bug in WAVExtractor for 24-bit per sample wav"
| -rw-r--r-- | media/libstagefright/WAVExtractor.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/WAVExtractor.cpp b/media/libstagefright/WAVExtractor.cpp index a38400be..2a7f6284 100644 --- a/media/libstagefright/WAVExtractor.cpp +++ b/media/libstagefright/WAVExtractor.cpp @@ -401,8 +401,10 @@ status_t WAVSource::read( return err; } + // make sure that maxBytesToRead is multiple of 3, in 24-bit case size_t maxBytesToRead = - mBitsPerSample == 8 ? kMaxFrameSize / 2 : kMaxFrameSize; + mBitsPerSample == 8 ? kMaxFrameSize / 2 : + (mBitsPerSample == 24 ? 3*(kMaxFrameSize/3): kMaxFrameSize); size_t maxBytesAvailable = (mCurrentPos - mOffset >= (off64_t)mSize) @@ -425,7 +427,7 @@ status_t WAVSource::read( buffer->set_range(0, n); - if (mWaveFormat == WAVE_FORMAT_PCM) { + if (mWaveFormat == WAVE_FORMAT_PCM || mWaveFormat == WAVE_FORMAT_EXTENSIBLE) { if (mBitsPerSample == 8) { // Convert 8-bit unsigned samples to 16-bit signed. |