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

mp3, flac: check for seek command after decoder_read()

Browse Source 
When we introduced decoder_read(), we added code which aborts the read
operation when a decoder command arrives.  Several plugins however did
not expect that when they were converted to decoder_read().  Add
proper checks to the mp3 and flac decoder plugins.
This commit is contained in:
Max Kellermann 2008-08-26 08:27:15 +02:00
parent e530181e23
commit f46de2c32f
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/inputPlugins/flac_plugin.c
View File

@ -42,6 +42,10 @@ static flac_read_status flacRead(mpd_unused const flac_decoder * flacDec,
else
return flac_read_status_abort;
}
if (r == 0 && decoder_get_command(data->decoder) == DECODE_COMMAND_SEEK)
return flac_read_status_eof;
return flac_read_status_continue;
}
@ -413,8 +417,6 @@ static int flac_decode_internal(struct decoder * decoder,
while (1) {
if (!flac_process_single(flacDec))
break;
if (flac_get_state(flacDec) == flac_decoder_eof)
break;
if (decoder_get_command(decoder) == DECODE_COMMAND_SEEK) {
FLAC__uint64 sampleToSeek = decoder_seek_where(decoder) *
data.audio_format.sampleRate + 0.5;
@ -426,7 +428,8 @@ static int flac_decode_internal(struct decoder * decoder,
decoder_command_finished(decoder);
} else
decoder_seek_error(decoder);
}
} else if (flac_get_state(flacDec) == flac_decoder_eof)
break;
}
if (decoder_get_command(decoder) != DECODE_COMMAND_STOP) {
flacPrintErroredState(flac_get_state(flacDec));

11
src/inputPlugins/mp3_plugin.c
View File

@ -1006,9 +1006,18 @@ mp3Read(mp3DecodeData * data, ReplayGainInfo ** replayGainInfo)
break;
}
if (decoder_get_command(decoder) != DECODE_COMMAND_NONE)
switch (decoder_get_command(decoder)) {
case DECODE_COMMAND_NONE:
case DECODE_COMMAND_START:
break;
case DECODE_COMMAND_STOP:
return DECODE_BREAK;
case DECODE_COMMAND_SEEK:
return DECODE_CONT;
}
return ret;
}