X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fstream_output%2Fannounce.c;h=261b69dd31f929f6dfd7d24b68a6802b7a1089a6;hb=2ae89ba1c748a12dcdcfef87dbc885d942596ffd;hp=e7950f94d3b0303962e1f0ed3fa3d44683e8d024;hpb=7681a9b5d1df0cbcaa5914cc33bb40fee8276a36;p=vlc diff --git a/src/stream_output/announce.c b/src/stream_output/announce.c index e7950f94d3..261b69dd31 100644 --- a/src/stream_output/announce.c +++ b/src/stream_output/announce.c @@ -24,15 +24,16 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* free() */ -#include /* sprintf() */ -#include /* strerror() */ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include +#include #include -#include /* FIXME: fix RegisterSDP() and remove this */ #include "stream_output.h" +#include "libvlc.h" + +#include struct announce_method_t { @@ -42,80 +43,37 @@ 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 ); - - 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" ); - } - - i_ret = announce_Register( p_announce, p_session, p_method ); - vlc_object_release( p_announce ); - - return i_ret; + libvlc_priv (p_this->p_libvlc)->p_sap = NULL; } +#undef sout_AnnounceRegisterSDP /** - * 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 address (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 *cfgpref, - const char *psz_sdp, const char *psz_uri, - announce_method_t *p_method ) +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 ) - { - 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 ); - } + 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 = sout_AnnounceSessionCreate(VLC_OBJECT (p_sout), cfgpref); 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 (VLC_OBJECT (p_sout), psz_uri, 0, NULL, &res) == 0) + if (vlc_getaddrinfo (obj, psz_dst, 0, NULL, &res) == 0) { if (res->ai_addrlen <= sizeof (p_session->addr)) memcpy (&p_session->addr, res->ai_addr, @@ -123,128 +81,63 @@ sout_AnnounceRegisterSDP( sout_instance_t *p_sout, const char *cfgpref, vlc_freeaddrinfo (res); } - announce_Register( p_announce, p_session, p_method ); - - vlc_object_release( p_announce ); - return p_session; -} + vlc_value_t lockval; + if (var_Create (obj->p_libvlc, "sap_mutex", VLC_VAR_MUTEX) + || var_Get (obj->p_libvlc, "sap_mutex", &lockval)) + goto error; -/** - * UnRegister an existing session - * - * \param p_sout a sout instance structure - * \param p_session the session descriptor - * \return VLC_SUCCESS or an error - */ -int sout_AnnounceUnRegister( sout_instance_t *p_sout, - 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 ) + vlc_mutex_lock (lockval.p_address); + sap_handler_t *p_sap = libvlc_priv (obj->p_libvlc)->p_sap; + if (p_sap == NULL) { - msg_Dbg( p_sout, "unable to remove announce: no announce handler" ); - return VLC_ENOOBJ; + 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); } - i_ret = announce_UnRegister( p_announce, p_session ); + else + vlc_object_hold ((vlc_object_t *)p_sap); + vlc_mutex_unlock (lockval.p_address); - vlc_object_release( p_announce ); + if (p_sap == NULL) + goto error; - return i_ret; + 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 /** - * Create and initialize a session descriptor + * Unregisters an existing session * - * \return a new session descriptor + * \param obj a VLC object + * \param p_session the session descriptor + * \return VLC_SUCCESS or an error */ -session_descriptor_t * sout_AnnounceSessionCreate (vlc_object_t *obj, - const char *cfgpref) +int sout_AnnounceUnRegister( vlc_object_t *obj, + session_descriptor_t *p_session ) { - size_t cfglen = strlen (cfgpref); - if (cfglen > 100) - return NULL; - - char varname[cfglen + sizeof ("description")], *subvar = varname + cfglen; - strcpy (varname, cfgpref); - - session_descriptor_t *p_session = calloc (1, sizeof (*p_session)); - if (p_session == NULL) - return NULL; + sap_handler_t *p_sap = libvlc_priv (obj->p_libvlc)->p_sap; - strcpy (subvar, "name"); - p_session->psz_name = var_GetNonEmptyString (obj, varname); - strcpy (subvar, "group"); - p_session->psz_group = var_GetNonEmptyString (obj, varname); + msg_Dbg (obj, "removing SAP session"); + SAP_Del (p_sap, p_session); - strcpy (subvar, "description"); - p_session->description = var_GetNonEmptyString (obj, varname); - strcpy (subvar, "url"); - p_session->url = var_GetNonEmptyString (obj, varname); - strcpy (subvar, "email"); - p_session->email = var_GetNonEmptyString (obj, varname); - strcpy (subvar, "phone"); - p_session->phone = var_GetNonEmptyString (obj, varname); + vlc_value_t lockval; + var_Create (obj->p_libvlc, "sap_mutex", VLC_VAR_MUTEX); + var_Get (obj->p_libvlc, "sap_mutex", &lockval); + vlc_mutex_lock (lockval.p_address); + vlc_object_release ((vlc_object_t *)p_sap); + vlc_mutex_unlock (lockval.p_address); - return p_session; -} - -int sout_SessionSetMedia (vlc_object_t *obj, session_descriptor_t *p_session, - const char *fmt, const char *src, int sport, - const char *dst, int dport) -{ - if ((p_session->sdpformat = strdup (fmt)) == NULL) - return VLC_ENOMEM; - - /* GRUIK. We should not convert back-and-forth from string to numbers */ - struct addrinfo *res; - if (vlc_getaddrinfo (obj, dst, dport, NULL, &res) == 0) - { - if (res->ai_addrlen > sizeof (p_session->addr)) - goto oflow; + free (p_session->psz_sdp); + free (p_session); - memcpy (&p_session->addr, res->ai_addr, - p_session->addrlen = res->ai_addrlen); - vlc_freeaddrinfo (res); - } - if (vlc_getaddrinfo (obj, src, sport, NULL, &res) == 0) - { - if (res->ai_addrlen > sizeof (p_session->orig)) - goto oflow; - memcpy (&p_session->orig, res->ai_addr, - p_session->origlen = res->ai_addrlen); - vlc_freeaddrinfo (res); - } return 0; - -oflow: - vlc_freeaddrinfo (res); - return VLC_ENOMEM; -} - -/** - * 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 ) - { - free (p_session->psz_name); - free (p_session->psz_group); - free (p_session->psz_sdp); - free (p_session->description); - free (p_session->sdpformat); - free (p_session->url); - free (p_session->email); - free (p_session->phone); - free( p_session ); - } } /** @@ -259,99 +152,3 @@ void sout_MethodRelease (announce_method_t *m) { assert (m == &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 ) -{ - if (p_method == NULL) - return VLC_EGENERIC; - - 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 ) -{ - 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; -}