From 894bd068a433c10957a8c1b6b5042eba5851666c Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Wed, 28 Sep 2005 18:59:19 +0000 Subject: [PATCH] gst/adder/gstadder.c: fix adder for float elements Original commit message from CVS: * gst/adder/gstadder.c: (gst_adder_collected): fix adder for float elements --- ChangeLog | 5 +++++ gst/adder/gstadder.c | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92c54faf29..0a397b040a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-09-28 Stefan Kost + + * gst/adder/gstadder.c: (gst_adder_collected): + fix adder for float elements + 2005-09-28 Wim Taymans * gst-libs/gst/audio/gstbaseaudiosink.c: diff --git a/gst/adder/gstadder.c b/gst/adder/gstadder.c index 8d44864cf7..33e2e18924 100644 --- a/gst/adder/gstadder.c +++ b/gst/adder/gstadder.c @@ -375,10 +375,8 @@ gst_adder_collected (GstCollectPads * pads, gpointer user_data) { guint64 duration; - if (adder->format == GST_ADDER_FORMAT_FLOAT) - duration = size / adder->width / adder->channels; - else - duration = size * 8 / adder->width / adder->channels; + /* width is in bits and we need bytes */ + duration = size * (adder->width / 8) / adder->channels; GST_BUFFER_TIMESTAMP (outbuf) = adder->timestamp; GST_BUFFER_OFFSET (outbuf) = adder->offset;