mnauw gst-plugins-good: gst-plugins-good/ gst-plugins-good/gst/avi/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-good
Changes by:     mnauw
Date:           Wed Jan 07 2009  09:43:27 UTC

Log message:
* gst/avi/gstavimux.c: (gst_avi_mux_audsink_set_caps):
Minor fix/cleanup in header field calculation.

Modified files:
    .               : ChangeLog
    gst/avi         : gstavimux.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.3885&r2=1.3886
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/avi/gstavimux.c.diff?r1=1.115&r2=1.116

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v
retrieving revision 1.3885
retrieving revision 1.3886
diff -u -d -r1.3885 -r1.3886
--- ChangeLog	6 Jan 2009 17:48:05 -0000	1.3885
+++ ChangeLog	7 Jan 2009 09:43:11 -0000	1.3886
@@ -1,3 +1,8 @@
+2009-01-07  Mark Nauwelaerts  <[email protected]>
+
+	* gst/avi/gstavimux.c: (gst_avi_mux_audsink_set_caps):
+	Minor fix/cleanup in header field calculation.
 2009-01-06  Mark Nauwelaerts  <[email protected]>
 
 	* gst/matroska/matroska-mux.c: (gst_matroska_mux_reset),
Index: gstavimux.c
RCS file: /cvs/gstreamer/gst-plugins-good/gst/avi/gstavimux.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- gstavimux.c	6 Jan 2009 14:50:28 -0000	1.115
+++ gstavimux.c	7 Jan 2009 09:43:13 -0000	1.116
@@ -738,7 +738,6 @@
       avipad->auds.av_bps = avipad->auds.blockalign * avipad->auds.rate;
     } else if (!strcmp (mimetype, "audio/x-mulaw")) {
       avipad->auds.format = GST_RIFF_WAVE_FORMAT_MULAW;
-      avipad->auds.av_bps = 8;
       avipad->auds.size = 8;
       avipad->auds.blockalign = avipad->auds.channels;
@@ -748,7 +747,9 @@
   if (!avipad->auds.format)
     goto refuse_caps;
-  avipad->parent.hdr.rate = avipad->auds.rate;
+  /* by spec, hdr.rate is av_bps related, is calculated that way in stop_file,
+   * and reduces to sample rate in PCM like cases */
+  avipad->parent.hdr.rate = avipad->auds.av_bps / avipad->auds.blockalign;
   avipad->parent.hdr.samplesize = avipad->auds.blockalign;
   avipad->parent.hdr.scale = 1;

------------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB