commit 34d7db5dd43000cac7e8e156d79e9f97ccbb8990
author Glenn Kasten <gkasten@android.com> Mon Dec 17 13:20:30 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 17 13:20:30 2012 -0800
tree b477a8d13f7e4f3b6085a55af3b9088ca6e2d2fd
parent d272d6bf640dcaebeee7405469f9cacfa4bc1b72
parent e9a7857dc045a4465c9e59ea8df67cdd707345b7

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

* commit '9435b498123f3e22532391c30eb42c336bf743ec':
  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 d32f4fb..22af6fb 100644
--- a/media/libstagefright/WAVExtractor.cpp
+++ b/media/libstagefright/WAVExtractor.cpp
@@ -426,8 +426,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)
@@ -459,7 +461,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.