Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 865448a0 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Do not enforce the rule in MP3Extractor that all audio frames in an mp3...

Merge "Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode" into honeycomb-mr1
parents 78e76847 858b673a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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(