mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 10:10:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

Add query_position and query_stop vmethods to rtsp-media

Browse source
This commit is contained in:
Youness Alaoui 2013-06-10 17:32:40 -04:00 committed by Wim Taymans
parent 842f5ad9c4
commit 0b94f50eab
2 changed files with 46 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -126,6 +126,9 @@ static gboolean default_unprepare (GstRTSPMedia * media);
static gboolean static gboolean
default_convert_range (GstRTSPMedia * media, GstRTSPTimeRange * range, default_convert_range (GstRTSPMedia * media, GstRTSPTimeRange * range,
GstRTSPRangeUnit unit); GstRTSPRangeUnit unit);
static gboolean default_query_position (GstRTSPMedia * media,
gint64 * position);
static gboolean default_query_stop (GstRTSPMedia * media, gint64 * stop);
static guint gst_rtsp_media_signals[SIGNAL_LAST] = { 0 }; static guint gst_rtsp_media_signals[SIGNAL_LAST] = { 0 };
@ -215,6 +218,8 @@ gst_rtsp_media_class_init (GstRTSPMediaClass * klass)
klass->handle_message = default_handle_message; klass->handle_message = default_handle_message;
klass->unprepare = default_unprepare; klass->unprepare = default_unprepare;
klass->convert_range = default_convert_range; klass->convert_range = default_convert_range;
klass->query_position = default_query_position;
klass->query_stop = default_query_stop;
} }
static void static void
@ -350,7 +355,6 @@ static void
collect_media_stats (GstRTSPMedia * media) collect_media_stats (GstRTSPMedia * media)
{ {
GstRTSPMediaPrivate *priv = media->priv; GstRTSPMediaPrivate *priv = media->priv;
GstQuery *query;
gint64 position, stop; gint64 position, stop;
if (priv->status != GST_RTSP_MEDIA_STATUS_PREPARED && if (priv->status != GST_RTSP_MEDIA_STATUS_PREPARED &&
@ -369,25 +373,30 @@ collect_media_stats (GstRTSPMedia * media)
priv->range.max.seconds = -1; priv->range.max.seconds = -1;
priv->range_stop = -1; priv->range_stop = -1;
} else { } else {
GstRTSPMediaClass *klass;
gboolean ret;
klass = GST_RTSP_MEDIA_GET_CLASS (media);
/* get the position */ /* get the position */
if (!gst_element_query_position (priv->pipeline, GST_FORMAT_TIME, ret = FALSE;
&position)) { if (klass->query_position)
ret = klass->query_position (media, &position);
if (!ret) {
GST_INFO ("position query failed"); GST_INFO ("position query failed");
position = 0; position = 0;
} }
/* get the current segment stop */ /* get the current segment stop */
query = gst_query_new_segment (GST_FORMAT_TIME); ret = FALSE;
if (gst_element_query (priv->pipeline, query)) { if (klass->query_stop)
GstFormat format; ret = klass->query_stop (media, &stop);
gst_query_parse_segment (query, NULL, &format, NULL, &stop);
if (format != GST_FORMAT_TIME) if (!ret) {
stop = -1; GST_INFO ("stop query failed");
} else {
GST_INFO ("segment query failed");
stop = -1; stop = -1;
} }
gst_query_unref (query);
GST_INFO ("stats: position %" GST_TIME_FORMAT ", stop %" GST_INFO ("stats: position %" GST_TIME_FORMAT ", stop %"
GST_TIME_FORMAT, GST_TIME_ARGS (position), GST_TIME_ARGS (stop)); GST_TIME_FORMAT, GST_TIME_ARGS (position), GST_TIME_ARGS (stop));
@ -2094,3 +2103,26 @@ default_convert_range (GstRTSPMedia * media, GstRTSPTimeRange * range,
{ {
return gst_rtsp_range_convert_units (range, unit); return gst_rtsp_range_convert_units (range, unit);
} }
static gboolean
default_query_position (GstRTSPMedia * media, gint64 * position)
{
return gst_element_query_position (media->priv->pipeline, GST_FORMAT_TIME,
position);
}
static gboolean
default_query_stop (GstRTSPMedia * media, gint64 * stop)
{
GstQuery *query;
gboolean res;
query = gst_query_new_segment (GST_FORMAT_TIME);
if ((res = gst_element_query (media->priv->pipeline, query))) {
GstFormat format;
gst_query_parse_segment (query, NULL, &format, NULL, stop);
if (format != GST_FORMAT_TIME)
*stop = -1;
}
return res;
}

2
gst/rtsp-server/rtsp-media.h
View file

@ -102,6 +102,8 @@ struct _GstRTSPMediaClass {
gboolean (*unprepare) (GstRTSPMedia *media); gboolean (*unprepare) (GstRTSPMedia *media);
gboolean (*convert_range) (GstRTSPMedia *media, GstRTSPTimeRange *range, gboolean (*convert_range) (GstRTSPMedia *media, GstRTSPTimeRange *range,
GstRTSPRangeUnit unit); GstRTSPRangeUnit unit);
gboolean (*query_position) (GstRTSPMedia *media, gint64 *position);
gboolean (*query_stop) (GstRTSPMedia *media, gint64 *stop);
/* signals */ /* signals */
void (*new_stream) (GstRTSPMedia *media, GstRTSPStream * stream); void (*new_stream) (GstRTSPMedia *media, GstRTSPStream * stream);