X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst%2Frtsp-server%2Frtsp-server-wfd.c;h=0fa2cd57d34572b1a8e57eeab59adbb2e31d800b;hb=348befdfd2e731a38c8638dc8ab96a7734c5692d;hp=4e72093fc06ad6d24b4a3b0a01c285dc04a98d39;hpb=4aad84e8446f34dec2dd206ce9586acb7d031874;p=platform%2Fupstream%2Fgst-rtsp-server.git diff --git a/gst/rtsp-server/rtsp-server-wfd.c b/gst/rtsp-server/rtsp-server-wfd.c index 4e72093..0fa2cd5 100644 --- a/gst/rtsp-server/rtsp-server-wfd.c +++ b/gst/rtsp-server/rtsp-server-wfd.c @@ -57,6 +57,7 @@ #include "rtsp-server-wfd.h" #include "rtsp-client-wfd.h" +#include "rtsp-client-ext.h" #define GST_RTSP_WFD_SERVER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_RTSP_WFD_SERVER, GstRTSPWFDServerPrivate)) @@ -208,14 +209,15 @@ create_client_wfd (GstRTSPServer * server) GstRTSPSessionPool *session_pool = NULL; GstRTSPMountPoints *mount_points = NULL; GstRTSPAuth *auth = NULL; - GstRTSPWFDServerPrivate *priv = GST_RTSP_WFD_SERVER_GET_PRIVATE(server); + GstRTSPWFDServerPrivate *priv = GST_RTSP_WFD_SERVER_GET_PRIVATE (server); g_return_val_if_fail (priv != NULL, NULL); GST_INFO_OBJECT (server, "New Client is being created"); /* a new client connected, create a session to handle the client. */ - client = gst_rtsp_wfd_client_new (); + //client = gst_rtsp_wfd_client_new(); + client = (GstRTSPWFDClient *) gst_rtsp_ext_client_new (); thread_pool = gst_rtsp_server_get_thread_pool (server); session_pool = gst_rtsp_server_get_session_pool (server); @@ -235,13 +237,12 @@ create_client_wfd (GstRTSPServer * server) gst_rtsp_client_set_thread_pool (GST_RTSP_CLIENT_CAST (client), thread_pool); gst_rtsp_wfd_client_set_video_supported_resolution (client, - priv->supported_resolution); + priv->supported_resolution); gst_rtsp_wfd_client_set_video_native_resolution (client, - priv->native_resolution); + priv->native_resolution); - gst_rtsp_wfd_client_set_audio_codec (client, - priv->audio_codec); + gst_rtsp_wfd_client_set_audio_codec (client, priv->audio_codec); GST_RTSP_WFD_SERVER_UNLOCK (server); @@ -281,10 +282,11 @@ gst_rtsp_wfd_server_trigger_request (GstRTSPServer * server, } GstRTSPResult -gst_rtsp_wfd_server_set_supported_reso(GstRTSPWFDServer *server, guint64 supported_reso) +gst_rtsp_wfd_server_set_supported_reso (GstRTSPWFDServer * server, + guint64 supported_reso) { GstRTSPResult res = GST_RTSP_OK; - GstRTSPWFDServerPrivate *priv = GST_RTSP_WFD_SERVER_GET_PRIVATE(server); + GstRTSPWFDServerPrivate *priv = GST_RTSP_WFD_SERVER_GET_PRIVATE (server); g_return_val_if_fail (GST_IS_RTSP_WFD_SERVER (server), GST_RTSP_ERROR); g_return_val_if_fail (priv != NULL, GST_RTSP_ERROR); @@ -298,10 +300,11 @@ gst_rtsp_wfd_server_set_supported_reso(GstRTSPWFDServer *server, guint64 support } GstRTSPResult -gst_rtsp_wfd_server_set_video_native_reso (GstRTSPWFDServer *server, guint64 native_reso) +gst_rtsp_wfd_server_set_video_native_reso (GstRTSPWFDServer * server, + guint64 native_reso) { GstRTSPResult res = GST_RTSP_OK; - GstRTSPWFDServerPrivate *priv = GST_RTSP_WFD_SERVER_GET_PRIVATE(server); + GstRTSPWFDServerPrivate *priv = GST_RTSP_WFD_SERVER_GET_PRIVATE (server); g_return_val_if_fail (GST_IS_RTSP_WFD_SERVER (server), GST_RTSP_ERROR); g_return_val_if_fail (priv != NULL, GST_RTSP_ERROR); @@ -315,10 +318,11 @@ gst_rtsp_wfd_server_set_video_native_reso (GstRTSPWFDServer *server, guint64 nat } GstRTSPResult -gst_rtsp_wfd_server_set_audio_codec (GstRTSPWFDServer *server, guint8 audio_codec) +gst_rtsp_wfd_server_set_audio_codec (GstRTSPWFDServer * server, + guint8 audio_codec) { GstRTSPResult res = GST_RTSP_OK; - GstRTSPWFDServerPrivate *priv = GST_RTSP_WFD_SERVER_GET_PRIVATE(server); + GstRTSPWFDServerPrivate *priv = GST_RTSP_WFD_SERVER_GET_PRIVATE (server); g_return_val_if_fail (GST_IS_RTSP_WFD_SERVER (server), GST_RTSP_ERROR); g_return_val_if_fail (priv != NULL, GST_RTSP_ERROR);