From: <tp...@fr...> - 2006-01-18 19:10:25
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: tpm Date: Wed Jan 18 2006 11:08:20 PST Log message: * 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>) Modified files: . : ChangeLog gst/wavparse : gstwavparse.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.2090&r2=1.2091 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/wavparse/gstwavparse.c.diff?r1=1.99&r2=1.100 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.2090 retrieving revision 1.2091 diff -u -d -r1.2090 -r1.2091 --- ChangeLog 15 Jan 2006 20:21:47 -0000 1.2090 +++ ChangeLog 18 Jan 2006 19:08:08 -0000 1.2091 @@ -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 <th...@ma...> * gst/id3demux/id3v2frames.c: (id3demux_id3v2_parse_frame): Index: gstwavparse.c RCS file: /cvs/gstreamer/gst-plugins-good/gst/wavparse/gstwavparse.c,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- gstwavparse.c 19 Dec 2005 15:06:27 -0000 1.99 +++ gstwavparse.c 18 Jan 2006 19:08:08 -0000 1.100 @@ -1215,8 +1215,8 @@ 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: |