summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-03-04 11:25:17 -0800
committerJames Dong <jdong@google.com>2011-03-04 11:28:50 -0800
commit858b673a3518b2b15302cfdbf9433f111536c72c (patch)
tree2e473068c2667082c83ac01d19dc2d4d7b8160f8 /media/libstagefright
parente70c6607e0316fe390d52a544f6832c60223881f (diff)
downloadframeworks_base-858b673a3518b2b15302cfdbf9433f111536c72c.zip
frameworks_base-858b673a3518b2b15302cfdbf9433f111536c72c.tar.gz
frameworks_base-858b673a3518b2b15302cfdbf9433f111536c72c.tar.bz2
Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode
For some mp3 files, the mode can be changed from one audio frame to another. Without the capability to switch modes, the decoded audio may have lots of artifacts. bug - 3253310 Change-Id: Id57bb1f204642d15e38a800c72214f6794cfaa37
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/MP3Extractor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/MP3Extractor.cpp b/media/libstagefright/MP3Extractor.cpp
index eb4c68d..03ce202 100644
--- a/media/libstagefright/MP3Extractor.cpp
+++ b/media/libstagefright/MP3Extractor.cpp
@@ -39,10 +39,10 @@
namespace android {
// Everything must match except for
-// protection, bitrate, padding, private bits, mode extension,
+// protection, bitrate, padding, private bits, mode, mode extension,
// copyright bit, original bit and emphasis.
// Yes ... there are things that must indeed match...
-static const uint32_t kMask = 0xfffe0cc0;
+static const uint32_t kMask = 0xfffe0c00;
// static
bool MP3Extractor::get_mp3_frame_size(