summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleix Conchillo FlaquƩ <aleix@oblong.com>2014-10-20 15:40:59 -0700
committerWim Taymans <wtaymans@redhat.com>2014-10-21 11:44:40 +0200
commit0aad92531d3970aa3d7d901ab885717e4e6ac485 (patch)
tree6b89e13f72ebf74923f5750989a458d5a37d0ed1
parent966065a018ee7abd3bbab6172d3a3e94abc027b0 (diff)
rtsp-client: add stream transport to context
We add the stream transport to the context so we can get the configured client stream transport in the setup request signal. Fixes https://bugzilla.gnome.org/show_bug.cgi?id=738905
-rw-r--r--gst/rtsp-server/rtsp-client.c2
-rw-r--r--gst/rtsp-server/rtsp-context.h32
2 files changed, 19 insertions, 15 deletions
diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c
index b00993a..2b5895b 100644
--- a/gst/rtsp-server/rtsp-client.c
+++ b/gst/rtsp-server/rtsp-client.c
@@ -1833,6 +1833,8 @@ handle_setup_request (GstRTSPClient * client, GstRTSPContext * ctx)
/* set in the session media transport */
trans = gst_rtsp_session_media_set_transport (sessmedia, stream, ct);
+ ctx->trans = trans;
+
/* configure the url used to set this transport, this we will use when
* generating the response for the PLAY request */
gst_rtsp_stream_transport_set_url (trans, uri);
diff --git a/gst/rtsp-server/rtsp-context.h b/gst/rtsp-server/rtsp-context.h
index c2be87e..d21c31a 100644
--- a/gst/rtsp-server/rtsp-context.h
+++ b/gst/rtsp-server/rtsp-context.h
@@ -53,27 +53,29 @@ typedef struct _GstRTSPContext GstRTSPContext;
* @media: the media for the url can be %NULL
* @stream: the stream for the url can be %NULL
* @response: the response
+ * @trans: the stream transport, can be %NULL
*
* Information passed around containing the context of a request.
*/
struct _GstRTSPContext {
- GstRTSPServer *server;
- GstRTSPConnection *conn;
- GstRTSPClient *client;
- GstRTSPMessage *request;
- GstRTSPUrl *uri;
- GstRTSPMethod method;
- GstRTSPAuth *auth;
- GstRTSPToken *token;
- GstRTSPSession *session;
- GstRTSPSessionMedia *sessmedia;
- GstRTSPMediaFactory *factory;
- GstRTSPMedia *media;
- GstRTSPStream *stream;
- GstRTSPMessage *response;
+ GstRTSPServer *server;
+ GstRTSPConnection *conn;
+ GstRTSPClient *client;
+ GstRTSPMessage *request;
+ GstRTSPUrl *uri;
+ GstRTSPMethod method;
+ GstRTSPAuth *auth;
+ GstRTSPToken *token;
+ GstRTSPSession *session;
+ GstRTSPSessionMedia *sessmedia;
+ GstRTSPMediaFactory *factory;
+ GstRTSPMedia *media;
+ GstRTSPStream *stream;
+ GstRTSPMessage *response;
+ GstRTSPStreamTransport *trans;
/*< private >*/
- gpointer _gst_reserved[GST_PADDING];
+ gpointer _gst_reserved[GST_PADDING - 1];
};
GType gst_rtsp_context_get_type (void);