diff options
| author | 2010-03-05 09:33:29 -0800 | |
|---|---|---|
| committer | 2010-03-05 09:33:29 -0800 | |
| commit | d197431279c20df6c0c667d747e62867ffc7c4d5 (patch) | |
| tree | 70e3b27877bea5045471031fd882fcff58f1f531 | |
| parent | 540bc0348ab40727a054cdadcf098b098c0bfb0b (diff) | |
| parent | 1d200e3b959f7562b21a6e9d94910ddd051cfe10 (diff) | |
Merge "NPR's audio streams start with a 30sec segment whose mp3 headers are subtly different from those following. Allow certain bits to vary that were thought to be fixed before."
| -rw-r--r-- | media/libstagefright/MP3Extractor.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/media/libstagefright/MP3Extractor.cpp b/media/libstagefright/MP3Extractor.cpp index ab38bca985d7..c168771b6592 100644 --- a/media/libstagefright/MP3Extractor.cpp +++ b/media/libstagefright/MP3Extractor.cpp @@ -36,8 +36,10 @@ namespace android { // Everything must match except for -// protection, bitrate, padding, private bits and mode extension. -static const uint32_t kMask = 0xfffe0ccf; +// protection, bitrate, padding, private bits, mode extension, +// copyright bit, original bit and emphasis. +// Yes ... there are things that must indeed match... +static const uint32_t kMask = 0xfffe0cc0; static bool get_mp3_frame_size( uint32_t header, size_t *frame_size, @@ -669,7 +671,7 @@ status_t MP3Source::read( } // Lost sync. - LOGV("lost sync!\n"); + LOGV("lost sync! header = 0x%08x, old header = 0x%08x\n", header, mFixedHeader); off_t pos = mCurrentPos; if (!Resync(mDataSource, mFixedHeader, &pos, NULL)) { |