gst/wavparse/gstwavparse.c: Fix block alignment calculation. Alignment should be...

Original commit message from CVS:
Patch by: Tommi Myöhänen  <ext-tommi dot myohanen at nokia dot com>
* gst/wavparse/gstwavparse.c: (gst_wavparse_perform_seek):
Fix block alignment calculation. Alignment should be done before
adding the byte offset where the data starts (#335231).

diff --git a/ChangeLog b/ChangeLog
index d0294cdd1e8c128542e20646e7e45735cc0198c0..43d2b7eda110a2589ce942420b726f765f5ec7c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-21  Tim-Philipp Müller  <tim at centricular dot net>
+
+       Patch by: Tommi Myöhänen  <ext-tommi dot myohanen at nokia dot com>
+
+       * gst/wavparse/gstwavparse.c: (gst_wavparse_perform_seek):
+         Fix block alignment calculation. Alignment should be done before
+         adding the byte offset where the data starts (#335231).
+
 2006-03-20  Jan Schmidt  <thaytan@mad.scientist.com>
 
        * gst/matroska/ebml-write.c: (gst_ebml_write_element_push):

diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index 6ad82ae232b796199a1f161bfb59a72eb1d80499..71a0756e67ab2dd64237e0b3a0ed8a537b3eca68 100644 (file)
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -792,15 +792,15 @@ gst_wavparse_perform_seek (GstWavParse * wav, GstEvent * event)
   if (cur_type != GST_SEEK_TYPE_NONE) {
     wav->offset =
         gst_util_uint64_scale_int (seeksegment.last_stop, wav->bps, GST_SECOND);
-    wav->offset += wav->datastart;
     wav->offset -= wav->offset % wav->bytes_per_sample;
+    wav->offset += wav->datastart;
   }
 
   if (stop != -1) {
     wav->end_offset = gst_util_uint64_scale_int (stop, wav->bps, GST_SECOND);
-    wav->end_offset += wav->datastart;
     wav->end_offset +=
         wav->bytes_per_sample - (wav->end_offset % wav->bytes_per_sample);
+    wav->end_offset += wav->datastart;
   } else {
     wav->end_offset = wav->datasize + wav->datastart;
   }