Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38f45a53 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

am 95c157cc: Merge "Tolerate 0 valid bits value in WAV_EXT" into jb-dev 

* commit '95c157cc':
  Tolerate 0 valid bits value in WAV_EXT
parents 375172c4 95c157cc

media/libstagefright/WAVExtractor.cpp

+9 −3
Original line number Diff line number Diff line
@@ -227,9 +227,15 @@ status_t WAVExtractor::init() { 
            if (mWaveFormat == WAVE_FORMAT_EXTENSIBLE) {

                uint16_t validBitsPerSample = U16_LE_AT(&formatSpec[18]);

                if (validBitsPerSample != mBitsPerSample) {

                    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]);