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

dashdemux: Don't adjust for fragment duration twice when seeking ahead in KEYUNITS mode

Browse source
This commit is contained in:
Sebastian Dröge 2017-03-15 16:47:59 +02:00 committed by Edward Hervey
parent 5d09bc04a2
commit b7f87e2518
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ext/dash/gstdashdemux.c
View file

@ -1577,8 +1577,7 @@ gst_dash_demux_stream_advance_sync_sample (GstAdaptiveDemuxStream * stream,
idx = idx =
(target_time - (target_time -
dashstream->current_fragment_timestamp) / dashstream->current_fragment_timestamp) /
MIN (dashstream->keyframe_average_distance, MIN (dashstream->keyframe_average_distance, stream->fragment.duration);
stream->fragment.duration);
} }
GST_DEBUG_OBJECT (stream->pad, GST_DEBUG_OBJECT (stream->pad,
@ -1811,7 +1810,7 @@ gst_dash_demux_stream_advance_fragment (GstAdaptiveDemuxStream * stream)
} else if (gst_mpd_client_has_isoff_ondemand_profile (dashdemux->client) && } else if (gst_mpd_client_has_isoff_ondemand_profile (dashdemux->client) &&
dashstream->sidx_position != 0 dashstream->sidx_position != 0
&& dashstream->sidx_position != GST_CLOCK_TIME_NONE && dashstream->sidx_position != GST_CLOCK_TIME_NONE
&& dashstream->sidx_parser.sidx.entries) { && SIDX (dashstream)->entries) {
GstSidxBoxEntry *entry = SIDX_CURRENT_ENTRY (dashstream); GstSidxBoxEntry *entry = SIDX_CURRENT_ENTRY (dashstream);
dur = entry->duration; dur = entry->duration;
} else { } else {
@ -1876,16 +1875,16 @@ gst_dash_demux_stream_advance_fragment (GstAdaptiveDemuxStream * stream)
/* Key-unit trick mode, seek to fragment containing target time */ /* Key-unit trick mode, seek to fragment containing target time */
if (stream->segment.rate > 0) if (stream->segment.rate > 0)
ret = gst_dash_demux_stream_seek (stream, TRUE, 0, ret = gst_dash_demux_stream_seek (stream, TRUE, 0,
target_time + dashstream->keyframe_average_distance, &actual_ts); target_time, &actual_ts);
else else
ret = gst_dash_demux_stream_seek (stream, FALSE, 0, ret = gst_dash_demux_stream_seek (stream, FALSE, 0,
target_time - dashstream->keyframe_average_distance, &actual_ts); target_time, &actual_ts);
if (ret == GST_FLOW_OK) if (ret == GST_FLOW_OK)
GST_DEBUG_OBJECT (stream->pad, "Emergency seek to %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (stream->pad, "Emergency seek to %" GST_TIME_FORMAT,
GST_TIME_ARGS (actual_ts)); GST_TIME_ARGS (actual_ts));
else else
GST_WARNING_OBJECT (stream->pad, "Failed to seek to %" GST_TIME_FORMAT, GST_WARNING_OBJECT (stream->pad, "Failed to seek to %" GST_TIME_FORMAT,
GST_TIME_ARGS (target_time + dashstream->keyframe_average_distance)); GST_TIME_ARGS (target_time));
} else { } else {
/* Normal mode, advance to the next fragment */ /* Normal mode, advance to the next fragment */
ret = gst_mpd_client_advance_segment (dashdemux->client, ret = gst_mpd_client_advance_segment (dashdemux->client,