commit 359f90cea8a59c4a8d25b422fd0b0569e31db2fa
author James Dong <jdong@google.com> Wed May 02 11:34:06 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 02 11:34:06 2012 -0700
tree 05021b3aa01e00fce65f3ba0be9111442eb5dfda
parent 06f6ae34c735640dccdaca6ab1567d8afc9d3938
parent 2d94235a343151bed9aa74e86697fa01241ea5cf

Merge "The presence of the kKeyAACProfile is optional, we should not mandate its presence in AACWriter." into jb-dev

media/libmedia/AudioTrack.cpp

diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 9391d16..b5b7adc 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -1461,7 +1461,7 @@
 {
     // must be in this order to avoid a race condition
     Thread::requestExit();
-    mMyCond.signal();
+    resume();
 }
 
 void AudioTrack::AudioTrackThread::pause()

media/libstagefright/WAVExtractor.cpp

diff --git a/media/libstagefright/WAVExtractor.cpp b/media/libstagefright/WAVExtractor.cpp
index c35a77a..851321d 100644
--- a/media/libstagefright/WAVExtractor.cpp
+++ b/media/libstagefright/WAVExtractor.cpp
@@ -227,9 +227,15 @@
             if (mWaveFormat == WAVE_FORMAT_EXTENSIBLE) {
                 uint16_t validBitsPerSample = U16_LE_AT(&formatSpec[18]);
                 if (validBitsPerSample != mBitsPerSample) {
-                    ALOGE("validBits(%d) != bitsPerSample(%d) are not supported",
-                            validBitsPerSample, mBitsPerSample);
-                    return ERROR_UNSUPPORTED;
+                    if (validBitsPerSample != 0) {
+                        ALOGE("validBits(%d) != bitsPerSample(%d) are not supported",
+                                validBitsPerSample, mBitsPerSample);
+                        return ERROR_UNSUPPORTED;
+                    } else {
+                        // we only support valitBitsPerSample == bitsPerSample but some WAV_EXT
+                        // writers don't correctly set the valid bits value, and leave it at 0.
+                        ALOGW("WAVE_EXT has 0 valid bits per sample, ignoring");
+                    }
                 }
 
                 mChannelMask = U32_LE_AT(&formatSpec[20]);