From c0b3a18684f5f5e0fe14944fe951f04ea2cec616 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Fri, 2 Mar 2007 21:01:19 +0000 Subject: [PATCH] gst/wavparse/gstwavparse.c: Unbreak my previous commit (swapped nominator & denominator). Tim, thanks for spotting. Original commit message from CVS: * gst/wavparse/gstwavparse.c: (gst_wavparse_stream_headers), (gst_wavparse_stream_data): Unbreak my previous commit (swapped nominator & denominator). Tim, thanks for spotting. --- ChangeLog | 7 +++++++ gst/wavparse/gstwavparse.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21f709a507..7724c34275 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-03-02 Stefan Kost + + * gst/wavparse/gstwavparse.c: (gst_wavparse_stream_headers), + (gst_wavparse_stream_data): + Unbreak my previous commit (swapped nominator & denominator). Tim, + thanks for spotting. + 2007-03-02 Wim Taymans * ext/cdio/gstcdiocddasrc.c: (gst_cdio_cdda_src_probe_devices), diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c index cea8a66d66..ade334a88b 100644 --- a/gst/wavparse/gstwavparse.c +++ b/gst/wavparse/gstwavparse.c @@ -1280,7 +1280,7 @@ gst_wavparse_stream_headers (GstWavParse * wav) } if (wav->bps > 0) { - duration = uint64_ceiling_scale_int (wav->datasize, wav->bps, GST_SECOND); + duration = uint64_ceiling_scale_int (wav->datasize, GST_SECOND, wav->bps); GST_DEBUG_OBJECT (wav, "Got duration %" GST_TIME_FORMAT, GST_TIME_ARGS (duration)); gst_segment_init (&wav->segment, GST_FORMAT_TIME); @@ -1531,8 +1531,8 @@ iterate_adapter: if (wav->bps > 0) { /* and timestamps if we have a bitrate, be carefull for overflows */ - timestamp = uint64_ceiling_scale_int (pos, wav->bps, GST_SECOND); - next_timestamp = uint64_ceiling_scale_int (nextpos, wav->bps, GST_SECOND); + timestamp = uint64_ceiling_scale_int (pos, GST_SECOND, wav->bps); + next_timestamp = uint64_ceiling_scale_int (nextpos, GST_SECOND, wav->bps); duration = next_timestamp - timestamp; /* update current running segment position */