commit e9a7857dc045a4465c9e59ea8df67cdd707345b7
author Glenn Kasten <gkasten@android.com> Mon Dec 17 13:18:08 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 17 13:18:08 2012 -0800
tree 31a5f3cc1e5af890d48ec0abc3fcbd18564c4c8f
parent db09629a6dcedf6c9e301a93a8da9524b40c77a0
parent 43c32aaaf222c13357cf8fccfa6ffc34c5872947

am f38259cf: Merge "Fix bug in WAVExtractor for 24-bit per sample wav"

* commit 'f38259cfe5566914a49f5b0f8b11aa6a951d667a':
  Fix bug in WAVExtractor for 24-bit per sample wav

media/libstagefright/WAVExtractor.cpp

diff --git a/media/libstagefright/WAVExtractor.cpp b/media/libstagefright/WAVExtractor.cpp
index a38400b..2a7f628 100644
--- a/media/libstagefright/WAVExtractor.cpp
+++ b/media/libstagefright/WAVExtractor.cpp
@@ -401,8 +401,10 @@
         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 @@
 
     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.