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

avidemux: proper position reporting and push mode timestamping

Browse source 
... and align current_total semantics in push and pull mode,
which tracks bytes for CBR and blocks for VBR.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=691481
This commit is contained in:
Mark Nauwelaerts 2013-02-08 21:28:02 +01:00
parent 2d5319c1fa
commit f0645b79c5
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst/avi/gstavidemux.c
View file

@ -456,14 +456,14 @@ gst_avi_demux_handle_src_query (GstPad * pad, GstObject * parent,
if (stream->strh->type == GST_RIFF_FCC_auds) {
if (stream->is_vbr) {
/* VBR */
pos = gst_util_uint64_scale ((gint64) stream->current_entry *
stream->strh->scale, GST_SECOND, (guint64) stream->strh->rate);
pos = avi_stream_convert_frames_to_time_unchecked (stream,
stream->current_total);
GST_DEBUG_OBJECT (avi, "VBR convert frame %u, time %"
GST_TIME_FORMAT, stream->current_entry, GST_TIME_ARGS (pos));
} else if (stream->strf.auds->av_bps != 0) {
/* CBR */
pos = gst_util_uint64_scale (stream->current_total, GST_SECOND,
(guint64) stream->strf.auds->av_bps);
pos = avi_stream_convert_bytes_to_time_unchecked (stream,
stream->current_total);
GST_DEBUG_OBJECT (avi,
"CBR convert bytes %u, time %" GST_TIME_FORMAT,
stream->current_total, GST_TIME_ARGS (pos));
@ -5098,7 +5098,18 @@ gst_avi_demux_stream_data (GstAviDemux * avi)
/* increment our positions */
stream->current_entry++;
stream->current_total += size;
/* as in pull mode, 'total' is either bytes (CBR) or frames (VBR) */
if (stream->strh->type == GST_RIFF_FCC_auds && stream->is_vbr) {
gint blockalign = stream->strf.auds->blockalign;
if (blockalign > 0)
stream->current_total += DIV_ROUND_UP (size, blockalign);
else
stream->current_total++;
} else {
stream->current_total += size;
}
GST_LOG_OBJECT (avi, "current entry %u, total %u",
stream->current_entry, stream->current_total);
/* update current position in the segment */
avi->segment.position = next_ts;