From 7b13776f2dd2feeb4bd28e8cf023ec81474e4eaa Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 11 Nov 2009 19:25:15 +0100 Subject: decoder/flac: store the whole stream info object, not duration We don't want to work with floating point values if possible. Get the integer number of frames from the FLAC__StreamMetadata_StreamInfo object, and convert it into a float duration on demand. This patch adds a check if the STREAMINFO packet has been received yet. --- src/decoder/_flac_common.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/decoder/_flac_common.h') diff --git a/src/decoder/_flac_common.h b/src/decoder/_flac_common.h index e1e76932b..895cdf1b9 100644 --- a/src/decoder/_flac_common.h +++ b/src/decoder/_flac_common.h @@ -38,6 +38,19 @@ struct flac_data { struct pcm_buffer buffer; + /** + * Is the #stream_info member valid? + */ + bool have_stream_info; + + /** + * A copy of the stream info object passed to the metadata + * callback. Once we drop support for libFLAC 1.1.2, we can + * remove this attribute, and use + * FLAC__stream_decoder_get_total_samples() etc. + */ + FLAC__StreamMetadata_StreamInfo stream_info; + /** * The number of the next frame which is going to be decoded. */ @@ -46,7 +59,6 @@ struct flac_data { float time; unsigned int bit_rate; struct audio_format audio_format; - float total_time; FLAC__uint64 position; struct decoder *decoder; struct input_stream *input_stream; -- cgit v1.2.3