diff options
| author | Glenn Kasten <gkasten@android.com> | 2012-12-17 13:20:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-17 13:20:30 -0800 |
| commit | 53bc0a2fc54330534330118edd5c393f39eff8ab (patch) | |
| tree | 6395766b32c5492ca1addc4bba142b7865423969 /media/libstagefright/WAVExtractor.cpp | |
| parent | 66c8dd24358a08a59944e9fc13d686e0ff91eee9 (diff) | |
| parent | 9435b498123f3e22532391c30eb42c336bf743ec (diff) | |
| download | frameworks_av-53bc0a2fc54330534330118edd5c393f39eff8ab.zip frameworks_av-53bc0a2fc54330534330118edd5c393f39eff8ab.tar.gz frameworks_av-53bc0a2fc54330534330118edd5c393f39eff8ab.tar.bz2 | |
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
Diffstat (limited to 'media/libstagefright/WAVExtractor.cpp')
| -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 d32f4fb..22af6fb 100644 --- a/media/libstagefright/WAVExtractor.cpp +++ b/media/libstagefright/WAVExtractor.cpp @@ -426,8 +426,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) @@ -459,7 +461,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. |