Bug 1329061 - parse ESDS in wave atom container for QT format. r=jya
MozReview-Commit-ID: 4G15pqakse9
--- a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
@@ -1643,17 +1643,18 @@ status_t MPEG4Extractor::parseChunk(off6
if (!mLastTrack) {
return ERROR_MALFORMED;
}
mLastTrack->meta->setData(
kKeyESDS, kTypeESDS, &buffer[4], chunk_data_size - 4);
if (mPath.Length() >= 2
&& (mPath[mPath.Length() - 2] == FOURCC('m', 'p', '4', 'a') ||
- (mPath[mPath.Length() - 2] == FOURCC('e', 'n', 'c', 'a')))) {
+ (mPath[mPath.Length() - 2] == FOURCC('e', 'n', 'c', 'a')) ||
+ (mPath[mPath.Length() - 2] == FOURCC('w', 'a', 'v', 'e')))) {
// Information from the ESDS must be relied on for proper
// setup of sample rate and channel count for MPEG4 Audio.
// The generic header appears to only contain generic
// information...
status_t err = updateAudioTrackInfoFromESDS_MPEG4Audio(
&buffer[4], chunk_data_size - 4);