Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6d35d4c2: Merge change Ib16e5543 into eclair-mr2

Browse Source 
Merge commit '6d35d4c2cff4ad411fe7d6fde3fda0467d1016c5' into eclair-mr2-plus-aosp

* commit '6d35d4c2cff4ad411fe7d6fde3fda0467d1016c5':
  Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
This commit is contained in:
Andreas Huber
2009-12-09 15:46:43 -08:00
committed by Android Git Automerger
parent a42b8f160f 6d35d4c2cf
commit b16cf676bd
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
media/libstagefright/MP3Extractor.cpp
View File

@@ -33,6 +33,10 @@
namespace android { namespace android {
// Everything must match except for
// protection, bitrate, padding, private bits and mode extension.
static const uint32_t kMask = 0xfffe0ccf;
static bool get_mp3_frame_size( static bool get_mp3_frame_size(
uint32_t header, size_t *frame_size, uint32_t header, size_t *frame_size,
int *out_sampling_rate = NULL, int *out_channels = NULL, int *out_sampling_rate = NULL, int *out_channels = NULL,
@@ -60,7 +64,7 @@ static bool get_mp3_frame_size(
if (version == 0x01) { if (version == 0x01) {
return false; return false;
} }
unsigned layer = (header >> 17) & 3; unsigned layer = (header >> 17) & 3;
if (layer == 0x00) { if (layer == 0x00) {
@@ -199,13 +203,9 @@ static bool Resync(
} }
} }
// Everything must match except for
// protection, bitrate, padding, private bits and mode extension.
const uint32_t kMask = 0xfffe0ccf;
const size_t kMaxFrameSize = 4096; const size_t kMaxFrameSize = 4096;
uint8_t *buffer = new uint8_t[kMaxFrameSize]; uint8_t *buffer = new uint8_t[kMaxFrameSize];
off_t pos = *inout_pos - kMaxFrameSize; off_t pos = *inout_pos - kMaxFrameSize;
size_t buffer_offset = kMaxFrameSize; size_t buffer_offset = kMaxFrameSize;
size_t buffer_length = kMaxFrameSize; size_t buffer_length = kMaxFrameSize;
@@ -269,7 +269,7 @@ static bool Resync(
valid = false; valid = false;
break; break;
} }
uint32_t test_header = U32_AT(tmp); uint32_t test_header = U32_AT(tmp);
LOGV("subsequent header is %08x", test_header); LOGV("subsequent header is %08x", test_header);
@@ -489,8 +489,9 @@ status_t MP3Source::read(
} }
uint32_t header = U32_AT((const uint8_t *)buffer->data()); uint32_t header = U32_AT((const uint8_t *)buffer->data());
if (get_mp3_frame_size(header, &frame_size)) { if ((header & kMask) == (mFixedHeader & kMask)
&& get_mp3_frame_size(header, &frame_size)) {
break; break;
} }