FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

mpegpsdemux: several fixes on the seeking function in pul mode.

Browse Source 
Removed a line wrongly copy pasted in my previous commit.
Avoid an unsigned integer overflow.
Seek last_stop in stream time.
Clamp last_stop in stream time between first and last SCR.
Fixed a typo in the GST_DEBUG line and added some more info.
This commit is contained in:
Josep Torra 2009-02-04 22:17:36 +01:00
parent 77bc3a162c
commit f44b64ce92
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gst/mpegdemux/gstmpegdemux.c
View File

@ -941,21 +941,22 @@ gst_flups_demux_do_seek (GstFluPSDemux * demux, GstSegment * seeksegment)
{ {
gboolean found; gboolean found;
guint64 fscr, offset; guint64 fscr, offset;
guint64 scr = guint64 scr = GSTTIME_TO_MPEGTIME (seeksegment->last_stop + demux->base_time);
MIN (demux->last_scr, GSTTIME_TO_MPEGTIME (seeksegment->last_stop));
guint64 scr_rate_n = demux->last_scr_offset - demux->first_scr_offset; guint64 scr_rate_n = demux->last_scr_offset - demux->first_scr_offset;
guint64 scr_rate_d = demux->last_scr - demux->first_scr; guint64 scr_rate_d = demux->last_scr - demux->first_scr;
scr = MIN (demux->last_scr, scr);
scr = MAX (demux->first_scr, scr);
fscr = scr;
#if POST_10_10 #if POST_10_10
GST_INFO_OBJECT (demux, "sink segment configured %" GST_SEGMENT_FORMAT, GST_INFO_OBJECT (demux, "sink segment configured %" GST_SEGMENT_FORMAT
&demux->sink_segment); ", trying to go at SCR: %" G_GUINT64_FORMAT, &demux->sink_segment, scr);
#endif #endif
offset = MIN (gst_util_uint64_scale (scr, scr_rate_n, scr_rate_d), offset = MIN (gst_util_uint64_scale (scr, scr_rate_n, scr_rate_d),
demux->sink_segment.stop); demux->sink_segment.stop);
gst_flups_demux_scan_forward_ts (demux, &offset, SCAN_SCR, &demux->first_scr);
found = gst_flups_demux_scan_forward_ts (demux, &offset, SCAN_SCR, &fscr); found = gst_flups_demux_scan_forward_ts (demux, &offset, SCAN_SCR, &fscr);
if (!found) { if (!found) {
found = gst_flups_demux_scan_backward_ts (demux, &offset, SCAN_SCR, &fscr); found = gst_flups_demux_scan_backward_ts (demux, &offset, SCAN_SCR, &fscr);
@ -966,13 +967,13 @@ gst_flups_demux_do_seek (GstFluPSDemux * demux, GstSegment * seeksegment)
found = gst_flups_demux_scan_forward_ts (demux, &offset, SCAN_SCR, &fscr); found = gst_flups_demux_scan_forward_ts (demux, &offset, SCAN_SCR, &fscr);
} }
while (found && fscr > scr) { while (found && fscr > scr && offset > 0) {
offset--; offset--;
found = gst_flups_demux_scan_backward_ts (demux, &offset, SCAN_SCR, &fscr); found = gst_flups_demux_scan_backward_ts (demux, &offset, SCAN_SCR, &fscr);
} }
GST_INFO_OBJECT (demux, "doing seek at offset %" G_GUINT64_FORMAT GST_INFO_OBJECT (demux, "doing seek at offset %" G_GUINT64_FORMAT
" SRC: %" G_GUINT64_FORMAT " %" GST_TIME_FORMAT, " SCR: %" G_GUINT64_FORMAT " %" GST_TIME_FORMAT,
offset, fscr, GST_TIME_ARGS (MPEGTIME_TO_GSTTIME (fscr))); offset, fscr, GST_TIME_ARGS (MPEGTIME_TO_GSTTIME (fscr)));
gst_segment_set_last_stop (&demux->sink_segment, GST_FORMAT_BYTES, offset); gst_segment_set_last_stop (&demux->sink_segment, GST_FORMAT_BYTES, offset);
} }