diff options
| author | Marco Nelissen <marcone@google.com> | 2015-07-29 13:40:26 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2015-07-29 13:40:26 -0700 |
| commit | 8af1b90d4161e287bdcb03c91832c425363ded16 (patch) | |
| tree | 8f82ea67b1d0fe0c5b99f5c3140cb79001ff3a8c /media/libstagefright/FLACExtractor.cpp | |
| parent | 6134ad6fdeab91e54a1abc8f00eafc956e42fb3d (diff) | |
| download | frameworks_av-8af1b90d4161e287bdcb03c91832c425363ded16.zip frameworks_av-8af1b90d4161e287bdcb03c91832c425363ded16.tar.gz frameworks_av-8af1b90d4161e287bdcb03c91832c425363ded16.tar.bz2 | |
We don't support mid-stream format changes
Bug: 22808150
Change-Id: If6354b3be19110020eeb29f02e76c8a16e57b837
Diffstat (limited to 'media/libstagefright/FLACExtractor.cpp')
| -rw-r--r-- | media/libstagefright/FLACExtractor.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/FLACExtractor.cpp b/media/libstagefright/FLACExtractor.cpp index 8b972b7..89a91f7 100644 --- a/media/libstagefright/FLACExtractor.cpp +++ b/media/libstagefright/FLACExtractor.cpp @@ -674,7 +674,10 @@ MediaBuffer *FLACParser::readBuffer(bool doSeek, FLAC__uint64 sample) if (mWriteHeader.sample_rate != getSampleRate() || mWriteHeader.channels != getChannels() || mWriteHeader.bits_per_sample != getBitsPerSample()) { - ALOGE("FLACParser::readBuffer write changed parameters mid-stream"); + ALOGE("FLACParser::readBuffer write changed parameters mid-stream: %d/%d/%d -> %d/%d/%d", + getSampleRate(), getChannels(), getBitsPerSample(), + mWriteHeader.sample_rate, mWriteHeader.channels, mWriteHeader.bits_per_sample); + return NULL; } // acquire a media buffer CHECK(mGroup != NULL); |