diff options
author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2009-01-07 09:43:13 +0000 |
---|---|---|
committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2009-01-07 09:43:13 +0000 |
commit | 24eed322dcedfd40dedd1fdf6578c667ed6e1808 (patch) | |
tree | 4a0646b8e889c4844149111e613015ee4534a3ee /gst/avi/gstavimux.c | |
parent | 85c6c25264b54c3a04675183e5281bbd23120a72 (diff) |
gst/avi/gstavimux.c: Minor fix/cleanup in header field calculation.
Original commit message from CVS:
* gst/avi/gstavimux.c: (gst_avi_mux_audsink_set_caps):
Minor fix/cleanup in header field calculation.
Diffstat (limited to 'gst/avi/gstavimux.c')
-rw-r--r-- | gst/avi/gstavimux.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index e93c8b18..b432c6aa 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -738,7 +738,6 @@ gst_avi_mux_audsink_set_caps (GstPad * pad, GstCaps * vscaps) 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; avipad->auds.av_bps = avipad->auds.blockalign * avipad->auds.rate; @@ -748,7 +747,9 @@ gst_avi_mux_audsink_set_caps (GstPad * pad, GstCaps * vscaps) 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; |