From 0de1f5357d2522323071d698ff7c588d16ced601 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 1 Jun 2009 22:33:02 +0200 Subject: [PATCH] Address bad FLAC sample length encoding of #5844455 Commit df707c666433a78d3878af6f055698d5756226c4 introduced an obvious bug in the sample length calculation, using the wrong macro for conversion. --- ext/flac/gstflacenc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c index 97b9f3db19..cf5afcd32e 100644 --- a/ext/flac/gstflacenc.c +++ b/ext/flac/gstflacenc.c @@ -559,15 +559,19 @@ gst_flac_enc_query_peer_total_samples (GstFlacEnc * flacenc, GstPad * pad) GstFormat fmt = GST_FORMAT_DEFAULT; gint64 duration; + GST_DEBUG_OBJECT (flacenc, "querying peer for DEFAULT format duration"); if (gst_pad_query_peer_duration (pad, &fmt, &duration) && fmt == GST_FORMAT_DEFAULT && duration != GST_CLOCK_TIME_NONE) goto done; fmt = GST_FORMAT_TIME; + GST_DEBUG_OBJECT (flacenc, "querying peer for TIME format duration"); if (gst_pad_query_peer_duration (pad, &fmt, &duration) && fmt == GST_FORMAT_TIME && duration != GST_CLOCK_TIME_NONE) { - duration = GST_FRAMES_TO_CLOCK_TIME (duration, flacenc->sample_rate); + GST_DEBUG_OBJECT (flacenc, "peer reported duration %" GST_TIME_FORMAT, + GST_TIME_ARGS (duration)); + duration = GST_CLOCK_TIME_TO_FRAMES (duration, flacenc->sample_rate); goto done; }