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

decoder/flac: merge code into flac_decoder_initialize()

Browse Source 
Wrapper for FLAC__stream_decoder_process_until_end_of_metadata(),
decoder_initialized().
This commit is contained in:
Max Kellermann
2009-11-11 19:01:31 +01:00
parent a3f5284dc6
commit f937ec9a7c
1 changed files with 39 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/decoder/flac_plugin.c
View File

@@ -391,6 +391,32 @@ flac_decoder_new(void)
return sd; return sd;
} }
static bool
flac_decoder_initialize(struct flac_data *data, FLAC__StreamDecoder *sd,
bool seekable, FLAC__uint64 duration)
{
if (!FLAC__stream_decoder_process_until_end_of_metadata(sd)) {
g_warning("problem reading metadata");
return false;
}
if (!audio_format_valid(&data->audio_format)) {
g_warning("Invalid audio format: %u:%u:%u\n",
data->audio_format.sample_rate,
data->audio_format.bits,
data->audio_format.channels);
return false;
}
if (duration != 0)
data->total_time = (float)duration /
(float)data->audio_format.sample_rate;
decoder_initialized(data->decoder, &data->audio_format,
seekable, data->total_time);
return true;
}
static void static void
flac_decoder_loop(struct flac_data *data, FLAC__StreamDecoder *flac_dec, flac_decoder_loop(struct flac_data *data, FLAC__StreamDecoder *flac_dec,
FLAC__uint64 t_start, FLAC__uint64 t_end) FLAC__uint64 t_start, FLAC__uint64 t_end)
@@ -496,22 +522,13 @@ flac_decode_internal(struct decoder * decoder,
} }
} }
if (!FLAC__stream_decoder_process_until_end_of_metadata(flac_dec)) { if (!flac_decoder_initialize(&data, flac_dec,
err = "problem reading metadata"; input_stream->seekable, 0)) {
goto fail; flac_data_deinit(&data);
FLAC__stream_decoder_delete(flac_dec);
return;
} }
if (!audio_format_valid(&data.audio_format)) {
g_warning("Invalid audio format: %u:%u:%u\n",
data.audio_format.sample_rate,
data.audio_format.bits,
data.audio_format.channels);
goto fail;
}
decoder_initialized(decoder, &data.audio_format,
input_stream->seekable, data.total_time);
flac_decoder_loop(&data, flac_dec, 0, 0); flac_decoder_loop(&data, flac_dec, 0, 0);
fail: fail:
@@ -601,28 +618,12 @@ flac_container_decode(struct decoder* decoder,
goto fail; goto fail;
} }
if (!FLAC__stream_decoder_process_until_end_of_metadata(flac_dec)) if (!flac_decoder_initialize(&data, flac_dec, true, track_time)) {
{ flac_data_deinit(&data);
err = "problem reading metadata"; FLAC__stream_decoder_delete(flac_dec);
goto fail; return;
} }
if (!audio_format_valid(&data.audio_format))
{
g_warning("Invalid audio format: %u:%u:%u\n",
data.audio_format.sample_rate,
data.audio_format.bits,
data.audio_format.channels);
goto fail;
}
// set track time (order is important: after stream init)
data.total_time = ((float)track_time / (float)data.audio_format.sample_rate);
data.position = 0;
decoder_initialized(decoder, &data.audio_format,
true, data.total_time);
// seek to song start (order is important: after decoder init) // seek to song start (order is important: after decoder init)
FLAC__stream_decoder_seek_absolute(flac_dec, (FLAC__uint64)t_start); FLAC__stream_decoder_seek_absolute(flac_dec, (FLAC__uint64)t_start);
data.next_frame = t_start; data.next_frame = t_start;
@@ -694,24 +695,12 @@ flac_filedecode_internal(struct decoder* decoder,
} }
} }
if (!FLAC__stream_decoder_process_until_end_of_metadata(flac_dec)) if (!flac_decoder_initialize(&data, flac_dec, true, 0)) {
{ flac_data_deinit(&data);
err = "problem reading metadata"; FLAC__stream_decoder_delete(flac_dec);
goto fail; return;
} }
if (!audio_format_valid(&data.audio_format))
{
g_warning("Invalid audio format: %u:%u:%u\n",
data.audio_format.sample_rate,
data.audio_format.bits,
data.audio_format.channels);
goto fail;
}
decoder_initialized(decoder, &data.audio_format,
true, data.total_time);
flac_decoder_loop(&data, flac_dec, 0, 0); flac_decoder_loop(&data, flac_dec, 0, 0);
fail: fail: