mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 04:22:27 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-client: define all seek accuracy flags from setup_play_mode

Browse source 
We then pass those to adjust_play_mode, which needs to operate
on the "final" seek flags, as previously the code in rtsp-media
was assuming that accuracy seek flags (accurate / key_unit) should
not be set if the flags passed to the seek method were already set.
This commit is contained in:
Mathieu Duponchelle 2019-07-27 05:14:28 +02:00
parent 446315b36c
commit 72504eee99
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/rtsp-server/rtsp-client.c
View file

@ -1862,7 +1862,13 @@ setup_play_mode (GstRTSPClient * client, GstRTSPContext * ctx,
flags = GST_SEEK_FLAG_KEY_UNIT & GST_SEEK_FLAG_SNAP_AFTER;
else
GST_FIXME_OBJECT (client, "Add support for seek style %s", seek_style);
} else if (range->min.type == GST_RTSP_TIME_END) {
flags = GST_SEEK_FLAG_ACCURATE;
} else {
flags = GST_SEEK_FLAG_KEY_UNIT;
}
} else {
flags = GST_SEEK_FLAG_ACCURATE;
}
/* check for scale and/or speed headers

15
gst/rtsp-server/rtsp-media.c
View file

@ -243,6 +243,8 @@ static gboolean check_complete (GstRTSPMedia * media);
#define C_ENUM(v) ((gint) v)
#define TRICKMODE_FLAGS (GST_SEEK_FLAG_TRICKMODE | GST_SEEK_FLAG_TRICKMODE_KEY_UNITS | GST_SEEK_FLAG_TRICKMODE_FORWARD_PREDICTED)
GType
gst_rtsp_suspend_mode_get_type (void)
{
@ -2757,13 +2759,11 @@ gst_rtsp_media_seek_trickmode (GstRTSPMedia * media,
if (stop != GST_CLOCK_TIME_NONE)
stop_type = GST_SEEK_TYPE_SET;
/* we force a seek if any seek flag is set, or if the the rate
/* we force a seek if any trickmode flag is set, or if the rate
* is non-standard, i.e. not 1.0 */
force_seek = flags != GST_SEEK_FLAG_NONE || rate != 1.0;
force_seek = (flags & TRICKMODE_FLAGS) || rate != 1.0;
if (start != GST_CLOCK_TIME_NONE || stop != GST_CLOCK_TIME_NONE || force_seek) {
gboolean had_flags = flags != GST_SEEK_FLAG_NONE;
GST_INFO ("seeking to %" GST_TIME_FORMAT " - %" GST_TIME_FORMAT,
GST_TIME_ARGS (start), GST_TIME_ARGS (stop));
@ -2782,14 +2782,7 @@ gst_rtsp_media_seek_trickmode (GstRTSPMedia * media,
GST_TIME_ARGS (current_position));
start = current_position;
start_type = GST_SEEK_TYPE_SET;
if (!had_flags)
flags |= GST_SEEK_FLAG_ACCURATE;
}
} else {
/* only set keyframe flag when modifying start */
if (start_type != GST_SEEK_TYPE_NONE)
if (!had_flags)
flags |= GST_SEEK_FLAG_KEY_UNIT;
}
if (start == current_position && stop_type == GST_SEEK_TYPE_NONE &&