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

Presume that the Xing frame count is accurate, and stop decoding when we hit the last frame

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@4618 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman 2006-08-13 02:53:20 +00:00
parent 0511e14db0
commit 66512edb6c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/inputPlugins/mp3_plugin.c
View File

@ -138,6 +138,7 @@ typedef struct _mp3DecodeData {
int dropFramesAtEnd; int dropFramesAtEnd;
int dropSamplesAtStart; int dropSamplesAtStart;
int dropSamplesAtEnd; int dropSamplesAtEnd;
int foundXing;
int foundFirstFrame; int foundFirstFrame;
int decodedFirstFrame; int decodedFirstFrame;
int flush; int flush;
@ -161,6 +162,7 @@ static void initMp3DecodeData(mp3DecodeData * data, InputStream * inStream)
data->dropFramesAtEnd = 0; data->dropFramesAtEnd = 0;
data->dropSamplesAtStart = 0; data->dropSamplesAtStart = 0;
data->dropSamplesAtEnd = 0; data->dropSamplesAtEnd = 0;
data->foundXing = 0;
data->foundFirstFrame = 0; data->foundFirstFrame = 0;
data->decodedFirstFrame = 0; data->decodedFirstFrame = 0;
data->flush = 1; data->flush = 1;
@ -640,6 +642,7 @@ static int decodeFirstFrame(mp3DecodeData * data, DecoderControl * dc,
bitlen = data->stream.anc_bitlen; bitlen = data->stream.anc_bitlen;
if (parse_xing(&xing, &ptr, &bitlen)) { if (parse_xing(&xing, &ptr, &bitlen)) {
data->foundXing = 1;
data->muteFrame = MUTEFRAME_SKIP; data->muteFrame = MUTEFRAME_SKIP;
if (parse_lame(&lame, &ptr, &bitlen)) { if (parse_lame(&lame, &ptr, &bitlen)) {
@ -737,9 +740,12 @@ static int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc,
mad_timer_add(&data->timer, (data->frame).header.duration); mad_timer_add(&data->timer, (data->frame).header.duration);
data->bitRate = (data->frame).header.bitrate; data->bitRate = (data->frame).header.bitrate;
if (data->currentFrame >= data->maxFrames) { if (data->currentFrame >= data->maxFrames) {
/* stop decoding, since Xing maxFrames is accurate */
if (data->foundXing) return DECODE_BREAK;
data->currentFrame = data->maxFrames - 1; data->currentFrame = data->maxFrames - 1;
} else } else {
data->highestFrame++; data->highestFrame++;
}
data->frameOffset[data->currentFrame] = data->inStream->offset; data->frameOffset[data->currentFrame] = data->inStream->offset;
if (data->stream.this_frame != NULL) { if (data->stream.this_frame != NULL) {
data->frameOffset[data->currentFrame] -= data->frameOffset[data->currentFrame] -=
@ -749,8 +755,9 @@ static int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc,
data->stream.bufend - data->stream.buffer; data->stream.bufend - data->stream.buffer;
} }
data->times[data->currentFrame] = data->timer; data->times[data->currentFrame] = data->timer;
} else } else {
data->timer = data->times[data->currentFrame]; data->timer = data->times[data->currentFrame];
}
data->currentFrame++; data->currentFrame++;
data->elapsedTime = data->elapsedTime =
((float)mad_timer_count(data->timer, MAD_UNITS_MILLISECONDS)) / ((float)mad_timer_count(data->timer, MAD_UNITS_MILLISECONDS)) /