summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTommi Myöhänen <ext-tommi.myohanen@nokia.com>2006-01-18 19:08:08 +0000
committerTim-Philipp Müller <tim@centricular.net>2006-01-18 19:08:08 +0000
commitc275b14170368760fa501da3f0159bf877806baf (patch)
tree75d7a356cf3d19e6c747775029764861c7ed662f
parent83b6cbc438c69e047e7501252d84363af5845299 (diff)
gst/wavparse/gstwavparse.c: Fix conversion from TIME to BYTES format (fixes #326864;
Original commit message from CVS: * gst/wavparse/gstwavparse.c: (gst_wavparse_pad_convert): Fix conversion from TIME to BYTES format (fixes #326864; patch by: Tommi Myöhänen <ext-tommi dot myohanen at nokia dot com>)
-rw-r--r--ChangeLog6
-rw-r--r--gst/wavparse/gstwavparse.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 95ec36be..24bb9e31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-18 Tim-Philipp Müller <tim at centricular dot net>
+
+ * gst/wavparse/gstwavparse.c: (gst_wavparse_pad_convert):
+ Fix conversion from TIME to BYTES format (fixes #326864;
+ patch by: Tommi Myöhänen <ext-tommi dot myohanen at nokia dot com>)
+
2006-01-15 Jan Schmidt <thaytan@mad.scientist.com>
* gst/id3demux/id3v2frames.c: (id3demux_id3v2_parse_frame):
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index 39e193e3..81324ae7 100644
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -1215,8 +1215,8 @@ gst_wavparse_pad_convert (GstPad * pad,
case GST_FORMAT_BYTES:
/* make sure we end up on a sample boundary */
*dest_value =
- gst_util_uint64_scale_int (src_value, wavparse->rate,
- GST_SECOND) * wavparse->blockalign;
+ gst_util_uint64_scale_int (src_value, wavparse->bps, GST_SECOND);
+ *dest_value -= *dest_value % wavparse->blockalign;
break;
case GST_FORMAT_DEFAULT:
*dest_value =