mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 07:28:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/avi/gstavimux.c: First calculate the rate, and only then use it. Hdr.rate is a multiple and not a derivative of h...

Browse source 
Original commit message from CVS:
* gst/avi/gstavimux.c: (gst_avimux_audsinkconnect),
(gst_avimux_stop_file):
First calculate the rate, and only then use it. Hdr.rate is a
multiple and not a derivative of hdr.scale. Scale is not the
same as blockalign but is solely related to rate.
This commit is contained in:
Ronald S. Bultje 2004-10-26 11:22:07 +00:00
parent 643c7ae9b1
commit 1672e83d26
2 changed files with 33 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2004-10-26 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/avi/gstavimux.c: (gst_avimux_audsinkconnect),
(gst_avimux_stop_file):
First calculate the rate, and only then use it. Hdr.rate is a
multiple and not a derivative of hdr.scale. Scale is not the
same as blockalign but is solely related to rate.
2004-10-26 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2004-10-26 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/gnomevfs/gstgnomevfssink.c: (gst_gnomevfssink_init), * ext/gnomevfs/gstgnomevfssink.c: (gst_gnomevfssink_init),

50
gst/avi/gstavimux.c
View file

@ -453,7 +453,7 @@ gst_avimux_audsinkconnect (GstPad * pad, const GstCaps * vscaps)
avimux->auds_hdr.rate = avimux->auds.blockalign * avimux->auds.rate; avimux->auds_hdr.rate = avimux->auds.blockalign * avimux->auds.rate;
avimux->auds_hdr.samplesize = avimux->auds.blockalign; avimux->auds_hdr.samplesize = avimux->auds.blockalign;
avimux->auds_hdr.scale = avimux->auds.blockalign; avimux->auds_hdr.scale = 1;
return GST_PAD_LINK_OK; return GST_PAD_LINK_OK;
} }
@ -1039,6 +1039,29 @@ gst_avimux_stop_file (GstAviMux * avimux)
} }
} }
/* set rate and everything having to do with that */
avimux->avi_hdr.max_bps = 0;
if (avimux->audio_pad_connected) {
/* calculate bps if needed */
if (!avimux->auds.av_bps) {
if (avimux->audio_time) {
avimux->auds.av_bps =
(GST_SECOND * avimux->audio_size) / avimux->audio_time;
} else {
GST_ELEMENT_ERROR (avimux, STREAM, MUX,
(_("No or invalid input audio, AVI stream will be corrupt.")),
(NULL));
avimux->auds.av_bps = 0;
}
avimux->auds_hdr.rate = avimux->auds.av_bps * avimux->auds_hdr.scale;
}
avimux->avi_hdr.max_bps += avimux->auds.av_bps;
}
if (avimux->video_pad_connected) {
avimux->avi_hdr.max_bps += ((avimux->vids.bit_cnt + 7) / 8) *
(1000000. / avimux->avi_hdr.us_frame) * avimux->vids.image_size;
}
/* statistics/total_frames/... */ /* statistics/total_frames/... */
avimux->avi_hdr.tot_frames = avimux->num_frames; avimux->avi_hdr.tot_frames = avimux->num_frames;
if (avimux->video_pad_connected) { if (avimux->video_pad_connected) {
@ -1046,30 +1069,7 @@ gst_avimux_stop_file (GstAviMux * avimux)
} }
if (avimux->audio_pad_connected) { if (avimux->audio_pad_connected) {
avimux->auds_hdr.length = avimux->auds_hdr.length =
(avimux->audio_time * avimux->auds.rate) / GST_SECOND; (avimux->audio_time * avimux->auds_hdr.rate) / GST_SECOND;
}
/* set rate and everything having to do with that */
avimux->avi_hdr.max_bps = 0;
if (avimux->audio_pad_connected) {
/* calculate bps if needed */
if (!avimux->auds.av_bps) {
if (avimux->audio_time) {
avimux->auds_hdr.rate =
(GST_SECOND * avimux->audio_size) / avimux->audio_time;
} else {
GST_ELEMENT_ERROR (avimux, STREAM, MUX,
(_("No or invalid input audio, AVI stream will be corrupt.")),
(NULL));
avimux->auds_hdr.rate = 0;
}
avimux->auds.av_bps = avimux->auds_hdr.rate * avimux->auds_hdr.scale;
}
avimux->avi_hdr.max_bps += avimux->auds.av_bps;
}
if (avimux->video_pad_connected) {
avimux->avi_hdr.max_bps += ((avimux->vids.bit_cnt + 7) / 8) *
(1000000. / avimux->avi_hdr.us_frame) * avimux->vids.image_size;
} }
/* seek and rewrite the header */ /* seek and rewrite the header */