Commit 06212a31 authored by zorglub's avatar zorglub
Browse files

Export URI from RTP module . Closes:#403

parent dab29012
......@@ -337,7 +337,7 @@ static inline char *sout_cfg_find_value( sout_cfg_t *p_cfg, char *psz_name )
/* Announce system */
VLC_EXPORT( int, sout_AnnounceRegister, (sout_instance_t *,session_descriptor_t*, announce_method_t* ) );
VLC_EXPORT(session_descriptor_t*,sout_AnnounceRegisterSDP, (sout_instance_t *,const char *, announce_method_t* ) );
VLC_EXPORT(session_descriptor_t*,sout_AnnounceRegisterSDP, (sout_instance_t *,const char *, const char *, announce_method_t* ) );
VLC_EXPORT( int, sout_AnnounceUnRegister, (sout_instance_t *,session_descriptor_t* ) );
VLC_EXPORT(session_descriptor_t*,sout_AnnounceSessionCreate, (void) );
......
......@@ -331,7 +331,7 @@ int intf_RunThread (intf_thread_t *);
xml_t * __xml_Create (vlc_object_t *);
msg_subscription_t* __msg_Subscribe (vlc_object_t *);
const char * VLC_Version (void);
session_descriptor_t* sout_AnnounceRegisterSDP (sout_instance_t *,const char *, announce_method_t*);
session_descriptor_t* sout_AnnounceRegisterSDP (sout_instance_t *,const char *, const char *, announce_method_t*);
char * stream_ReadLine (stream_t *);
int playlist_PreparseEnqueueItem (playlist_t *, playlist_item_t *);
void __osd_MenuPrev (vlc_object_t *);
......@@ -549,7 +549,7 @@ struct module_symbols_t
sout_stream_t * (*sout_StreamNew_inner) (sout_instance_t *, char *psz_chain);
void (*sout_StreamDelete_inner) (sout_stream_t *);
int (*sout_AnnounceRegister_inner) (sout_instance_t *,session_descriptor_t*, announce_method_t*);
session_descriptor_t* (*sout_AnnounceRegisterSDP_inner) (sout_instance_t *,const char *, announce_method_t*);
session_descriptor_t* (*sout_AnnounceRegisterSDP_inner) (sout_instance_t *,const char *, const char *, announce_method_t*);
int (*sout_AnnounceUnRegister_inner) (sout_instance_t *,session_descriptor_t*);
session_descriptor_t* (*sout_AnnounceSessionCreate_inner) (void);
void (*sout_AnnounceSessionDestroy_inner) (session_descriptor_t *);
......
......@@ -1314,6 +1314,7 @@ static int SapSetup( sout_stream_t *p_stream )
if( ( p_sys->i_es > 0 || p_sys->p_mux ) && p_sys->psz_sdp && *p_sys->psz_sdp )
{
p_sys->p_session = sout_AnnounceRegisterSDP( p_sout, p_sys->psz_sdp,
p_sys->psz_session_url,
p_method );
}
......
......@@ -83,11 +83,13 @@ int sout_AnnounceRegister( sout_instance_t *p_sout,
*
* \param p_sout a sout instance structure
* \param psz_sdp the SDP to register
* \param psz_uri session URI (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, announce_method_t *p_method )
const char *psz_sdp, const char *psz_uri,
announce_method_t *p_method )
{
session_descriptor_t *p_session;
announce_handler_t *p_announce = (announce_handler_t*)
......@@ -113,6 +115,7 @@ session_descriptor_t *sout_AnnounceRegisterSDP( sout_instance_t *p_sout,
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_object_release( p_announce );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment