oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Reworking xing parsing so lame tags will fit in better

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@4456 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman 2006-07-25 20:08:22 +00:00
parent 0979b0f75e
commit e65fb6e14f
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/inputPlugins/mp3_plugin.c
View File

@ -453,14 +453,14 @@ enum {
XING_SCALE = 0x00000008L, XING_SCALE = 0x00000008L,
}; };
static int parse_xing(struct xing *xing, struct mad_bitptr *ptr, int bitlen) static int parse_xing(struct xing *xing, struct mad_bitptr *ptr, int *oldbitlen)
{ {
unsigned long bits; unsigned long bits;
int oldbitlen; int bitlen;
int bitsleft; int bitsleft;
int i; int i;
oldbitlen = bitlen; bitlen = *oldbitlen;
if (bitlen < 16) goto fail; if (bitlen < 16) goto fail;
bits = mad_bit_read(ptr, 16); bits = mad_bit_read(ptr, 16);
@ -511,38 +511,31 @@ static int parse_xing(struct xing *xing, struct mad_bitptr *ptr, int bitlen)
/* Make sure we consume no less than 120 bytes (960 bits) in hopes that /* Make sure we consume no less than 120 bytes (960 bits) in hopes that
* the LAME tag is found there, and not right after the Xing header */ * the LAME tag is found there, and not right after the Xing header */
bitsleft = 960 - (oldbitlen - bitlen); bitsleft = 960 - ((*oldbitlen) - bitlen);
if (bitsleft < 0) goto fail; if (bitsleft < 0) goto fail;
else if (bitsleft > 0) { else if (bitsleft > 0) {
mad_bit_read(ptr, bitsleft); mad_bit_read(ptr, bitsleft);
bitlen -= bitsleft; bitlen -= bitsleft;
} }
return bitlen; *oldbitlen = bitlen;
fail:
xing->flags = 0;
return -1;
}
static int parse_extensions(struct xing *xing, struct mad_bitptr ptr,
int bitlen)
{
bitlen = parse_xing(xing, &ptr, bitlen);
if (bitlen < 0) return 0;
return 1; return 1;
fail:
xing->flags = 0;
return 0;
} }
static int decodeFirstFrame(mp3DecodeData * data, DecoderControl * dc, static int decodeFirstFrame(mp3DecodeData * data, DecoderControl * dc,
MpdTag ** tag, ReplayGainInfo ** replayGainInfo) MpdTag ** tag, ReplayGainInfo ** replayGainInfo)
{ {
struct xing xing; struct xing xing;
struct mad_bitptr ptr;
int bitlen;
int found_xing;
int ret; int ret;
int skip; int skip;
memset(&xing, 0, sizeof(struct xing));
xing.flags = 0;
while (1) { while (1) {
skip = 0; skip = 0;
while ((ret = decodeNextFrameHeader(data, tag, replayGainInfo)) == DECODE_CONT && while ((ret = decodeNextFrameHeader(data, tag, replayGainInfo)) == DECODE_CONT &&
@ -558,9 +551,15 @@ static int decodeFirstFrame(mp3DecodeData * data, DecoderControl * dc,
if (!skip && ret == DECODE_OK) break; if (!skip && ret == DECODE_OK) break;
} }
if (parse_extensions(&xing, data->stream.anc_ptr, ptr = data->stream.anc_ptr;
(int)data->stream.anc_bitlen)) { bitlen = data->stream.anc_bitlen;
found_xing = parse_xing(&xing, &ptr, &bitlen);
if (found_xing) {
DEBUG("yay xing works!\n");
if (xing.flags & XING_FRAMES) { if (xing.flags & XING_FRAMES) {
DEBUG("yay we got frames from xing!\n");
mad_timer_t duration = data->frame.header.duration; mad_timer_t duration = data->frame.header.duration;
mad_timer_multiply(&duration, xing.frames); mad_timer_multiply(&duration, xing.frames);
data->muteFrame = MUTEFRAME_SKIP; data->muteFrame = MUTEFRAME_SKIP;