/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* free() */
-#include <stdio.h> /* sprintf() */
-#include <string.h> /* strerror() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_sout.h>
#include "stream_output.h"
+#include "libvlc.h"
+
+#include <assert.h>
struct announce_method_t
{
* Sout-side functions
****************************************************************************/
-/**
- * Register a new session with the announce handler
- *
- * \param p_sout a sout instance structure
- * \param p_session a session descriptor
- * \param p_method an announce method descriptor
- * \return VLC_SUCCESS or an error
- */
-int sout_AnnounceRegister( sout_instance_t *p_sout,
- session_descriptor_t *p_session,
- announce_method_t *p_method )
+static void sap_destroy (vlc_object_t *p_this)
{
- int i_ret;
- announce_handler_t *p_announce = (announce_handler_t*)
- vlc_object_find( p_sout,
- VLC_OBJECT_ANNOUNCE,
- FIND_ANYWHERE );
+ libvlc_priv (p_this->p_libvlc)->p_sap = NULL;
+}
- if( !p_announce )
- {
- msg_Dbg( p_sout, "No announce handler found, creating one" );
- p_announce = announce_HandlerCreate( p_sout );
- if( !p_announce )
- {
- msg_Err( p_sout, "Creation failed" );
- return VLC_ENOMEM;
- }
- vlc_object_yield( p_announce );
- msg_Dbg( p_sout, "creation done" );
- }
+#undef sout_AnnounceRegisterSDP
- i_ret = announce_Register( p_announce, p_session, p_method );
- vlc_object_release( p_announce );
-
- return i_ret;
-}
+static vlc_mutex_t sap_mutex = VLC_STATIC_MUTEX;
/**
- * Register a new session with the announce handler, using a pregenerated SDP
+ * Registers a new session with the announce handler, using a pregenerated SDP
*
- * \param p_sout a sout instance structure
+ * \param obj a VLC object
* \param psz_sdp the SDP to register
- * \param psz_uri session URI (needed for SAP address auto detection
+ * \param psz_dst session address (needed for SAP address auto detection)
* \param p_method an announce method descriptor
* \return the new session descriptor structure
*/
-session_descriptor_t *sout_AnnounceRegisterSDP( sout_instance_t *p_sout,
- const char *psz_sdp, const char *psz_uri,
- announce_method_t *p_method )
+session_descriptor_t *
+sout_AnnounceRegisterSDP( vlc_object_t *obj, const char *psz_sdp,
+ const char *psz_dst, announce_method_t *p_method )
{
- session_descriptor_t *p_session;
- announce_handler_t *p_announce = (announce_handler_t*)
- vlc_object_find( p_sout,
- VLC_OBJECT_ANNOUNCE,
- FIND_ANYWHERE );
- if( !p_announce )
+ assert (p_method == &sap_method);
+ (void) p_method;
+
+ session_descriptor_t *p_session = calloc( 1, sizeof (*p_session) );
+ if( !p_session )
+ return NULL;
+
+ p_session->psz_sdp = strdup( psz_sdp );
+
+ /* GRUIK. We should not convert back-and-forth from string to numbers */
+ struct addrinfo *res;
+ if (vlc_getaddrinfo (obj, psz_dst, 0, NULL, &res) == 0)
{
- msg_Dbg( p_sout, "no announce handler found, creating one" );
- p_announce = announce_HandlerCreate( p_sout );
- if( !p_announce )
- {
- msg_Err( p_sout, "Creation failed" );
- return NULL;
- }
- vlc_object_yield( p_announce );
+ if (res->ai_addrlen <= sizeof (p_session->addr))
+ memcpy (&p_session->addr, res->ai_addr,
+ p_session->addrlen = res->ai_addrlen);
+ freeaddrinfo (res);
}
- p_session = sout_AnnounceSessionCreate();
- p_session->psz_sdp = strdup( psz_sdp );
- p_session->psz_uri = strdup( psz_uri );
- announce_Register( p_announce, p_session, p_method );
+ vlc_mutex_lock (&sap_mutex);
+ sap_handler_t *p_sap = libvlc_priv (obj->p_libvlc)->p_sap;
+ if (p_sap == NULL)
+ {
+ p_sap = SAP_Create (VLC_OBJECT (obj->p_libvlc));
+ libvlc_priv (obj->p_libvlc)->p_sap = p_sap;
+ vlc_object_set_destructor ((vlc_object_t *)p_sap, sap_destroy);
+ }
+ else
+ vlc_object_hold ((vlc_object_t *)p_sap);
+ vlc_mutex_unlock (&sap_mutex);
+
+ if (p_sap == NULL)
+ goto error;
- vlc_object_release( p_announce );
+ msg_Dbg (obj, "adding SAP session");
+ SAP_Add (p_sap, p_session );
return p_session;
+
+error:
+ free (p_session->psz_sdp);
+ free (p_session);
+ return NULL;
}
+#undef sout_AnnounceUnRegister
/**
- * UnRegister an existing session
+ * Unregisters an existing session
*
- * \param p_sout a sout instance structure
+ * \param obj a VLC object
* \param p_session the session descriptor
* \return VLC_SUCCESS or an error
*/
-int sout_AnnounceUnRegister( sout_instance_t *p_sout,
+int sout_AnnounceUnRegister( vlc_object_t *obj,
session_descriptor_t *p_session )
{
- int i_ret;
- announce_handler_t *p_announce = (announce_handler_t*)
- vlc_object_find( p_sout,
- VLC_OBJECT_ANNOUNCE,
- FIND_ANYWHERE );
- if( !p_announce )
- {
- msg_Dbg( p_sout, "unable to remove announce: no announce handler" );
- return VLC_ENOOBJ;
- }
- i_ret = announce_UnRegister( p_announce, p_session );
+ sap_handler_t *p_sap = libvlc_priv (obj->p_libvlc)->p_sap;
- vlc_object_release( p_announce );
+ msg_Dbg (obj, "removing SAP session");
+ SAP_Del (p_sap, p_session);
- return i_ret;
-}
+ vlc_mutex_lock (&sap_mutex);
+ vlc_object_release ((vlc_object_t *)p_sap);
+ vlc_mutex_unlock (&sap_mutex);
-/**
- * Create and initialize a session descriptor
- *
- * \return a new session descriptor
- */
-session_descriptor_t * sout_AnnounceSessionCreate(void)
-{
- session_descriptor_t *p_session;
+ free (p_session->psz_sdp);
+ free (p_session);
- p_session = (session_descriptor_t *)malloc( sizeof(session_descriptor_t));
- if (p_session == NULL)
- return NULL;
-
- memset (p_session, 0, sizeof (*p_session));
- return p_session;
-}
-
-/**
- * Destroy a session descriptor and free all
- *
- * \param p_session the session to destroy
- * \return Nothing
- */
-void sout_AnnounceSessionDestroy( session_descriptor_t *p_session )
-{
- if( p_session )
- {
- FREENULL( p_session->psz_name );
- FREENULL( p_session->psz_group );
- FREENULL( p_session->psz_uri );
- FREENULL( p_session->psz_sdp );
- free( p_session );
- }
+ return 0;
}
/**
return &sap_method;
}
-/************************************************************************
- * Announce handler functions (private)
- ************************************************************************/
-
-/**
- * Create the announce handler object
- *
- * \param p_this a vlc_object structure
- * \return the new announce handler or NULL on error
- */
-announce_handler_t *__announce_HandlerCreate( vlc_object_t *p_this )
-{
- announce_handler_t *p_announce;
-
- p_announce = vlc_object_create( p_this, VLC_OBJECT_ANNOUNCE );
-
- if( !p_announce )
- {
- msg_Err( p_this, "out of memory" );
- return NULL;
- }
-
- p_announce->p_sap = NULL;
- vlc_object_attach( p_announce, p_this->p_libvlc);
-
- return p_announce;
-}
-
-/**
- * Destroy a announce handler object
- *
- * \param p_announce the announce handler to destroy
- * \return VLC_SUCCESS or an error
- */
-int announce_HandlerDestroy( announce_handler_t *p_announce )
-{
- if( p_announce->p_sap )
- {
- ((vlc_object_t *)p_announce->p_sap)->b_die = VLC_TRUE;
- /* Wait for the SAP thread to exit */
- vlc_thread_join( (vlc_object_t *)p_announce->p_sap );
- announce_SAPHandlerDestroy( p_announce->p_sap );
- }
-
- /* Free the structure */
- vlc_object_destroy( p_announce );
-
- return VLC_SUCCESS;
-}
-
-/* Register an announce */
-int announce_Register( announce_handler_t *p_announce,
- session_descriptor_t *p_session,
- announce_method_t *p_method )
-{
-
- msg_Dbg( p_announce, "registering announce");
- if( p_method == &sap_method )
- {
- /* Do we already have a SAP announce handler ? */
- if( !p_announce->p_sap )
- {
- sap_handler_t *p_sap = announce_SAPHandlerCreate( p_announce );
- msg_Dbg( p_announce, "creating SAP announce handler");
- if( !p_sap )
- {
- msg_Err( p_announce, "SAP handler creation failed" );
- return VLC_ENOOBJ;
- }
- p_announce->p_sap = p_sap;
- }
- /* this will set p_session->p_sap for later deletion */
- msg_Dbg( p_announce, "adding SAP session");
- p_announce->p_sap->pf_add( p_announce->p_sap, p_session );
- }
- else
- {
- msg_Err( p_announce, "announce type unsupported" );
- return VLC_EGENERIC;
- }
- return VLC_SUCCESS;;
-}
-
-
-/* Unregister an announce */
-int announce_UnRegister( announce_handler_t *p_announce,
- session_descriptor_t *p_session )
+void sout_MethodRelease (announce_method_t *m)
{
- msg_Dbg( p_announce, "unregistering announce" );
- if( p_announce->p_sap )
- p_announce->p_sap->pf_del( p_announce->p_sap, p_session );
- return VLC_SUCCESS;
+ assert (m == &sap_method);
}
projects / vlc / blobdiff