decoder/flac: use frame header instead of audio_format

When calculating the properties of the frame, use sample_rate and other information from the frame header instead of the stored audio_format object.

decoder/flac: use frame header instead of audio_format
3973aeec · Max Kellermann · 5b2d32b4 · 3973aeec
Commit 3973aeec authored Nov 11, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

_flac_common.c src/decoder/_flac_common.c +3 -3

No files found.
--- a/src/decoder/_flac_common.c
+++ b/src/decoder/_flac_common.c
@@ -121,13 +121,13 @@ flac_common_write(struct flac_data *data, const FLAC__Frame * frame,

 	buffer = pcm_buffer_get(&data->buffer, buffer_size);

-	flac_convert(buffer, data->audio_format.channels,
-		     data->audio_format.bits, buf,
+	flac_convert(buffer, frame->header.channels,
+		     frame->header.bits_per_sample, buf,
 		     0, frame->header.blocksize);

 	if (data->next_frame >= data->first_frame)
 		position = (float)(data->next_frame - data->first_frame) /
-			data->audio_format.sample_rate;
+			frame->header.sample_rate;
 	else
 		position = 0;