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

dashdemux: Take SIDX entry timestamp/duration into account for keyunit-only mode

Browse source 
And not the whole segment's timestamp/duration
This commit is contained in:
Sebastian Dröge 2017-04-13 22:49:29 +03:00 committed by Edward Hervey
parent c3fd905f11
commit 71259d9ad4
1 changed files with 48 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
ext/dash/gstdashdemux.c
View file

@ -1289,8 +1289,17 @@ gst_dash_demux_stream_update_fragment_info (GstAdaptiveDemuxStream * stream)
gst_mpd_client_get_next_fragment (dashdemux->client, dashstream->index, gst_mpd_client_get_next_fragment (dashdemux->client, dashstream->index,
&fragment); &fragment);
dashstream->current_fragment_timestamp = fragment.timestamp; if (isombff && dashstream->sidx_position != GST_CLOCK_TIME_NONE
dashstream->current_fragment_duration = fragment.duration; && SIDX (dashstream)->entries) {
GstSidxBoxEntry *entry = SIDX_CURRENT_ENTRY (dashstream);
dashstream->current_fragment_timestamp = fragment.timestamp = entry->pts;
dashstream->current_fragment_duration = fragment.duration =
entry->duration;
} else {
dashstream->current_fragment_timestamp = fragment.timestamp;
dashstream->current_fragment_duration = fragment.duration;
}
dashstream->current_fragment_keyframe_distance = dashstream->current_fragment_keyframe_distance =
fragment.duration / dashstream->moof_sync_samples->len; fragment.duration / dashstream->moof_sync_samples->len;
dashstream->actual_position = dashstream->actual_position =
@ -1326,8 +1335,6 @@ gst_dash_demux_stream_update_fragment_info (GstAdaptiveDemuxStream * stream)
gst_mpd_client_get_next_fragment (dashdemux->client, dashstream->index, gst_mpd_client_get_next_fragment (dashdemux->client, dashstream->index,
&fragment); &fragment);
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 */
@ -1337,7 +1344,10 @@ gst_dash_demux_stream_update_fragment_info (GstAdaptiveDemuxStream * stream)
stream->fragment.range_start = stream->fragment.range_start =
dashstream->sidx_base_offset + entry->offset; dashstream->sidx_base_offset + entry->offset;
dashstream->actual_position = stream->fragment.timestamp = entry->pts; dashstream->actual_position = stream->fragment.timestamp = entry->pts;
stream->fragment.duration = entry->duration; dashstream->current_fragment_timestamp = stream->fragment.timestamp =
entry->pts;
dashstream->current_fragment_duration = stream->fragment.duration =
entry->duration;
if (stream->demux->segment.rate < 0.0) { if (stream->demux->segment.rate < 0.0) {
stream->fragment.range_end = stream->fragment.range_end =
stream->fragment.range_start + entry->size - 1; stream->fragment.range_start + entry->size - 1;
@ -1348,7 +1358,9 @@ gst_dash_demux_stream_update_fragment_info (GstAdaptiveDemuxStream * stream)
} else { } else {
dashstream->actual_position = stream->fragment.timestamp = dashstream->actual_position = stream->fragment.timestamp =
fragment.timestamp; fragment.timestamp;
stream->fragment.duration = fragment.duration; dashstream->current_fragment_timestamp = fragment.timestamp;
dashstream->current_fragment_duration = stream->fragment.duration =
fragment.duration;
if (stream->demux->segment.rate < 0.0) if (stream->demux->segment.rate < 0.0)
dashstream->actual_position += fragment.duration; dashstream->actual_position += fragment.duration;
stream->fragment.range_start = stream->fragment.range_start =
@ -1993,18 +2005,26 @@ gst_dash_demux_stream_advance_fragment (GstAdaptiveDemuxStream * stream)
&& GST_ADAPTIVE_DEMUX_IN_TRICKMODE_KEY_UNITS (dashdemux)) { && GST_ADAPTIVE_DEMUX_IN_TRICKMODE_KEY_UNITS (dashdemux)) {
GST_LOG_OBJECT (stream->pad, "current sync sample #%d", GST_LOG_OBJECT (stream->pad, "current sync sample #%d",
dashstream->current_sync_sample); dashstream->current_sync_sample);
if (dashstream->current_sync_sample == -1) if (dashstream->current_sync_sample == -1) {
dur = 0; dur = 0;
else if (dashstream->current_sync_sample < } else if (dashstream->current_sync_sample <
dashstream->moof_sync_samples->len) dashstream->moof_sync_samples->len) {
dur = dashstream->current_fragment_keyframe_distance; dur = dashstream->current_fragment_keyframe_distance;
else } else {
dur = if (gst_mpd_client_has_isoff_ondemand_profile (dashdemux->client) &&
dashstream->current_fragment_timestamp + dashstream->sidx_position != GST_CLOCK_TIME_NONE
dashstream->current_fragment_duration - dashstream->actual_position; && SIDX (dashstream)->entries) {
GstSidxBoxEntry *entry = SIDX_CURRENT_ENTRY (dashstream);
dur = entry->duration;
} else {
dur =
dashstream->current_fragment_timestamp +
dashstream->current_fragment_duration -
dashstream->actual_position;
}
}
} 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 != GST_CLOCK_TIME_NONE
&& dashstream->sidx_position != GST_CLOCK_TIME_NONE
&& SIDX (dashstream)->entries) { && SIDX (dashstream)->entries) {
GstSidxBoxEntry *entry = SIDX_CURRENT_ENTRY (dashstream); GstSidxBoxEntry *entry = SIDX_CURRENT_ENTRY (dashstream);
dur = entry->duration; dur = entry->duration;
@ -2101,8 +2121,8 @@ gst_dash_demux_stream_advance_fragment (GstAdaptiveDemuxStream * stream)
GST_TIME_FORMAT ")", GST_TIME_ARGS (actual_ts), GST_TIME_FORMAT ")", GST_TIME_ARGS (actual_ts),
GST_TIME_ARGS (target_time), GST_TIME_ARGS (previous_position)); GST_TIME_ARGS (target_time), GST_TIME_ARGS (previous_position));
if ((stream->segment.rate > 0 && actual_ts < previous_position) || if ((stream->segment.rate > 0 && actual_ts <= previous_position) ||
(stream->segment.rate < 0 && actual_ts > previous_position)) { (stream->segment.rate < 0 && actual_ts >= previous_position)) {
/* Give up */ /* Give up */
if (flags != 0) if (flags != 0)
break; break;
@ -3172,9 +3192,17 @@ 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 = if (gst_mpd_client_has_isoff_ondemand_profile (dashdemux->client)
current_keyframe_distance = && dash_stream->sidx_position != GST_CLOCK_TIME_NONE
stream->fragment.duration / dash_stream->moof_sync_samples->len; && SIDX (dash_stream)->entries) {
GstSidxBoxEntry *entry = SIDX_CURRENT_ENTRY (dash_stream);
current_keyframe_distance =
entry->duration / dash_stream->moof_sync_samples->len;
} else {
current_keyframe_distance =
stream->fragment.duration / dash_stream->moof_sync_samples->len;
}
dash_stream->current_fragment_keyframe_distance = current_keyframe_distance;
if (dash_stream->keyframe_average_distance) { if (dash_stream->keyframe_average_distance) {
/* Under-estimate the keyframe distance */ /* Under-estimate the keyframe distance */