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

dashdemux: Snap-seek for skipping ahead and use actual keyframe distance in the current fragment if applicable

Browse source
This commit is contained in:
Sebastian Dröge 2017-03-22 11:21:47 +02:00 committed by Edward Hervey
parent b7f87e2518
commit b3e2657ac1
2 changed files with 38 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
ext/dash/gstdashdemux.c
View file

@ -1267,6 +1267,7 @@ gst_dash_demux_stream_update_fragment_info (GstAdaptiveDemuxStream * stream)
/* Reset chunk size if any */ /* Reset chunk size if any */
stream->fragment.chunk_size = 0; stream->fragment.chunk_size = 0;
dashstream->current_fragment_keyframe_distance = GST_CLOCK_TIME_NONE;
if (GST_ADAPTIVE_DEMUX_STREAM_NEED_HEADER (stream) && isombff) { if (GST_ADAPTIVE_DEMUX_STREAM_NEED_HEADER (stream) && isombff) {
gst_dash_demux_stream_update_headers_info (stream); gst_dash_demux_stream_update_headers_info (stream);
@ -1289,14 +1290,19 @@ gst_dash_demux_stream_update_fragment_info (GstAdaptiveDemuxStream * stream)
&fragment); &fragment);
dashstream->current_fragment_timestamp = fragment.timestamp; dashstream->current_fragment_timestamp = fragment.timestamp;
dashstream->current_fragment_duration = fragment.duration;
dashstream->current_fragment_keyframe_distance =
fragment.duration / dashstream->moof_sync_samples->len;
dashstream->actual_position = dashstream->actual_position =
fragment.timestamp + fragment.timestamp +
dashstream->current_sync_sample * dashstream->keyframe_average_distance; dashstream->current_sync_sample *
dashstream->current_fragment_keyframe_distance;
if (stream->segment.rate < 0.0) if (stream->segment.rate < 0.0)
dashstream->actual_position += dashstream->keyframe_average_distance; dashstream->actual_position +=
dashstream->current_fragment_keyframe_distance;
dashstream->actual_position = dashstream->actual_position =
MIN (dashstream->actual_position, MIN (dashstream->actual_position,
fragment.timestamp + stream->fragment.duration); fragment.timestamp + fragment.duration);
stream->fragment.uri = fragment.uri; stream->fragment.uri = fragment.uri;
stream->fragment.timestamp = GST_CLOCK_TIME_NONE; stream->fragment.timestamp = GST_CLOCK_TIME_NONE;
@ -1321,6 +1327,7 @@ gst_dash_demux_stream_update_fragment_info (GstAdaptiveDemuxStream * stream)
&fragment); &fragment);
dashstream->current_fragment_timestamp = fragment.timestamp; dashstream->current_fragment_timestamp = fragment.timestamp;
dashstream->current_fragment_duration = fragment.duration;
stream->fragment.uri = fragment.uri; stream->fragment.uri = fragment.uri;
/* If mpd does not specify indexRange (i.e., null index_uri), /* If mpd does not specify indexRange (i.e., null index_uri),
* sidx entries may not be available until download it */ * sidx entries may not be available until download it */
@ -1568,16 +1575,19 @@ gst_dash_demux_stream_advance_sync_sample (GstAdaptiveDemuxStream * stream,
if (GST_CLOCK_TIME_IS_VALID (target_time)) { if (GST_CLOCK_TIME_IS_VALID (target_time)) {
GST_LOG_OBJECT (stream->pad, GST_LOG_OBJECT (stream->pad,
"target_time:%" GST_TIME_FORMAT " fragment ts %" GST_TIME_FORMAT "target_time:%" GST_TIME_FORMAT " fragment ts %" GST_TIME_FORMAT
" average:%" GST_TIME_FORMAT " fragment duration:%" GST_TIME_FORMAT, " average keyframe dist: %" GST_TIME_FORMAT
" current keyframe dist: %" GST_TIME_FORMAT
" fragment duration:%" GST_TIME_FORMAT,
GST_TIME_ARGS (target_time), GST_TIME_ARGS (target_time),
GST_TIME_ARGS (dashstream->current_fragment_timestamp), GST_TIME_ARGS (dashstream->current_fragment_timestamp),
GST_TIME_ARGS (dashstream->keyframe_average_distance), GST_TIME_ARGS (dashstream->keyframe_average_distance),
GST_TIME_ARGS (dashstream->current_fragment_keyframe_distance),
GST_TIME_ARGS (stream->fragment.duration)); GST_TIME_ARGS (stream->fragment.duration));
idx = idx =
(target_time - (target_time -
dashstream->current_fragment_timestamp) / dashstream->current_fragment_timestamp) /
MIN (dashstream->keyframe_average_distance, stream->fragment.duration); dashstream->current_fragment_keyframe_distance;
} }
GST_DEBUG_OBJECT (stream->pad, GST_DEBUG_OBJECT (stream->pad,
@ -1708,8 +1718,16 @@ gst_dash_demux_stream_get_target_time (GstDashDemux * dashdemux,
dashstream->actual_position); dashstream->actual_position);
if (stream->qos_earliest_time == GST_CLOCK_TIME_NONE) { if (stream->qos_earliest_time == GST_CLOCK_TIME_NONE) {
GstClockTime run_key_dist = MIN (dashstream->keyframe_average_distance, GstClockTime run_key_dist;
stream->fragment.duration) / ABS (stream->segment.rate);
if (dashstream->current_fragment_keyframe_distance != GST_CLOCK_TIME_NONE)
run_key_dist =
dashstream->current_fragment_keyframe_distance /
ABS (stream->segment.rate);
else
run_key_dist =
dashstream->keyframe_average_distance / ABS (stream->segment.rate);
/* If we don't have downstream information (such as at startup or /* If we don't have downstream information (such as at startup or
* without live sinks), just get the next time (already updated * without live sinks), just get the next time (already updated
* in actual_position) */ * in actual_position) */
@ -1804,9 +1822,7 @@ gst_dash_demux_stream_advance_fragment (GstAdaptiveDemuxStream * stream)
if (dashstream->current_sync_sample == -1) if (dashstream->current_sync_sample == -1)
dur = 0; dur = 0;
else else
dur = dur = dashstream->current_fragment_keyframe_distance;
MIN (dashstream->keyframe_average_distance,
stream->fragment.duration);
} 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
@ -1874,10 +1890,10 @@ gst_dash_demux_stream_advance_fragment (GstAdaptiveDemuxStream * stream)
dashstream->active_stream->mimeType == GST_STREAM_VIDEO) { dashstream->active_stream->mimeType == GST_STREAM_VIDEO) {
/* 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, GST_SEEK_FLAG_SNAP_AFTER,
target_time, &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, GST_SEEK_FLAG_SNAP_AFTER,
target_time, &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,
@ -2415,17 +2431,16 @@ gst_dash_demux_need_another_chunk (GstAdaptiveDemuxStream * stream)
if (dashstream->isobmff_parser.current_fourcc == 0) { if (dashstream->isobmff_parser.current_fourcc == 0) {
stream->fragment.chunk_size += dashstream->moof_average_size; stream->fragment.chunk_size += dashstream->moof_average_size;
if (dashstream->first_sync_sample_always_after_moof) { if (dashstream->first_sync_sample_always_after_moof) {
guint idx = -1; gboolean first = FALSE;
/* Check if we'll really need that first sample */ /* Check if we'll really need that first sample */
if (GST_CLOCK_TIME_IS_VALID (dashstream->target_time)) if (GST_CLOCK_TIME_IS_VALID (dashstream->target_time))
idx = first =
(dashstream->target_time - (dashstream->target_time -
dashstream->current_fragment_timestamp) / dashstream->current_fragment_timestamp) /
MIN (dashstream->keyframe_average_distance, dashstream->keyframe_average_distance == 0 ? TRUE : FALSE;
stream->fragment.duration);
else if (stream->demux->segment.rate > 0.0) else if (stream->demux->segment.rate > 0.0)
idx = 0; first = TRUE;
if (idx == 0) if (first)
stream->fragment.chunk_size += dashstream->keyframe_average_size; stream->fragment.chunk_size += dashstream->keyframe_average_size;
} }
} }
@ -2923,6 +2938,7 @@ gst_dash_demux_find_sync_samples (GstAdaptiveDemux * demux,
g_assert (stream->fragment.duration != 0); g_assert (stream->fragment.duration != 0);
g_assert (stream->fragment.duration != GST_CLOCK_TIME_NONE); g_assert (stream->fragment.duration != GST_CLOCK_TIME_NONE);
dash_stream->current_fragment_keyframe_distance =
current_keyframe_distance = current_keyframe_distance =
stream->fragment.duration / dash_stream->moof_sync_samples->len; stream->fragment.duration / dash_stream->moof_sync_samples->len;
@ -2997,8 +3013,7 @@ gst_dash_demux_handle_isobmff (GstAdaptiveDemux * demux,
idx = idx =
(dash_stream->target_time - (dash_stream->target_time -
dash_stream->current_fragment_timestamp) / dash_stream->current_fragment_timestamp) /
MIN (dash_stream->keyframe_average_distance, dash_stream->current_fragment_keyframe_distance;
stream->fragment.duration);
GST_DEBUG_OBJECT (stream->pad, "target %" GST_TIME_FORMAT " idx %d", GST_DEBUG_OBJECT (stream->pad, "target %" GST_TIME_FORMAT " idx %d",
GST_TIME_ARGS (dash_stream->target_time), idx); GST_TIME_ARGS (dash_stream->target_time), idx);

2
ext/dash/gstdashdemux.h
View file

@ -103,6 +103,8 @@ struct _GstDashDemuxStream
GstClockTime actual_position; GstClockTime actual_position;
/* Timestamp of the beginning of the current fragment */ /* Timestamp of the beginning of the current fragment */
GstClockTime current_fragment_timestamp; GstClockTime current_fragment_timestamp;
GstClockTime current_fragment_duration;
GstClockTime current_fragment_keyframe_distance;
/* Average keyframe download time (only in trickmode-key-units) */ /* Average keyframe download time (only in trickmode-key-units) */
GstClockTime average_download_time; GstClockTime average_download_time;