mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/avi/gstavidemux.c: Try to fix a/v sync issues.

Browse source 
Original commit message from CVS:
* gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query),
(gst_avi_demux_stream_data):
Try to fix a/v sync issues.
This commit is contained in:
Ronald S. Bultje 2004-09-15 19:31:47 +00:00
parent 09bf152f96
commit 9e36d10e82
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-09-15 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query),
(gst_avi_demux_stream_data):
Try to fix a/v sync issues.
2004-09-15 David Schleef <ds@schleef.org> 2004-09-15 David Schleef <ds@schleef.org>
* configure.ac: remove NASM check, since we don't use it. Update * configure.ac: remove NASM check, since we don't use it. Update

27
gst/avi/gstavidemux.c
View file

@ -406,6 +406,7 @@ gst_avi_demux_handle_src_query (GstPad * pad,
GstQueryType type, GstFormat * format, gint64 * value) GstQueryType type, GstFormat * format, gint64 * value)
{ {
gboolean res = TRUE; gboolean res = TRUE;
GstAviDemux *demux = GST_AVI_DEMUX (gst_pad_get_parent (pad));
/*GstAviDemux *avi = GST_AVI_DEMUX (gst_pad_get_parent (pad)); */ /*GstAviDemux *avi = GST_AVI_DEMUX (gst_pad_get_parent (pad)); */
avi_stream_context *stream = gst_pad_get_element_private (pad); avi_stream_context *stream = gst_pad_get_element_private (pad);
@ -439,17 +440,29 @@ gst_avi_demux_handle_src_query (GstPad * pad,
case GST_QUERY_POSITION: case GST_QUERY_POSITION:
switch (*format) { switch (*format) {
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
if (stream->strh->rate && stream->strh->type == GST_RIFF_FCC_auds) { if (stream->strh->type == GST_RIFF_FCC_auds) {
if (stream->strh->rate != 0) { if (stream->strh->samplesize != 0 && stream->blockalign != 0) {
*value = stream->current_byte * GST_SECOND /
(stream->blockalign * stream->strh->rate);
} else if (stream->strh->rate != 0) {
*value = (gfloat) stream->current_frame * stream->strh->scale *
GST_SECOND / stream->strh->rate;
} else if (stream->bitrate != 0) {
*value = ((gfloat) stream->current_byte) * GST_SECOND / *value = ((gfloat) stream->current_byte) * GST_SECOND /
stream->bitrate; stream->bitrate;
} else { } else {
*value = (((gfloat) stream->current_frame) * stream->strh->scale / *value = 0;
(stream->strh->rate * stream->blockalign)) * GST_SECOND;
} }
//g_print ("Time: %" GST_TIME_FORMAT " (%d/%d/%d)\n", GST_TIME_ARGS (*value),
// stream->strh->rate, stream->bitrate, stream->strh->scale);
} else { } else {
*value = (((gfloat) stream->current_frame) * stream->strh->scale / if (stream->strh->rate != 0) {
stream->strh->rate) * GST_SECOND; *value = ((gfloat) stream->current_frame * stream->strh->scale *
GST_SECOND / stream->strh->rate);
} else {
*value = stream->current_frame * demux->us_per_frame *
GST_USECOND;
}
} }
break; break;
case GST_FORMAT_BYTES: case GST_FORMAT_BYTES:
@ -1489,6 +1502,8 @@ gst_avi_demux_stream_data (GstAviDemux * avi)
GST_BUFFER_TIMESTAMP (buf) = next_ts; GST_BUFFER_TIMESTAMP (buf) = next_ts;
gst_pad_query (stream->pad, GST_QUERY_POSITION, &format, &dur_ts); gst_pad_query (stream->pad, GST_QUERY_POSITION, &format, &dur_ts);
GST_BUFFER_DURATION (buf) = dur_ts - next_ts; GST_BUFFER_DURATION (buf) = dur_ts - next_ts;
//g_print ("TIME: %" GST_TIME_FORMAT " on pad %s\n",
// GST_TIME_ARGS (next_ts), gst_pad_get_name (stream->pad));
gst_pad_push (stream->pad, GST_DATA (buf)); gst_pad_push (stream->pad, GST_DATA (buf));
} }
} }