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

decoder/flac: remember audio_format, not stream_info

Browse Source
This commit is contained in:
Max Kellermann
2010-01-06 09:00:32 +01:00
parent 6f6d47dd20
commit ae9c02b3a8
4 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/decoder/flac_decoder_plugin.c
View File

@@ -251,12 +251,12 @@ flac_decoder_initialize(struct flac_data *data, FLAC__StreamDecoder *sd,
return false;
if (duration == 0)
duration = data->stream_info.total_samples;
duration = data->total_frames;
decoder_initialized(data->decoder, &audio_format,
seekable,
(float)duration /
(float)data->stream_info.sample_rate);
(float)data->audio_format.sample_rate);
return true;
}
@@ -281,7 +281,7 @@ flac_decoder_loop(struct flac_data *data, FLAC__StreamDecoder *flac_dec,
if (cmd == DECODE_COMMAND_SEEK) {
FLAC__uint64 seek_sample = t_start +
decoder_seek_where(decoder) *
data->stream_info.sample_rate;
data->audio_format.sample_rate;
if (seek_sample >= t_start &&
(t_end == 0 || seek_sample <= t_end) &&
FLAC__stream_decoder_seek_absolute(flac_dec, seek_sample)) {