Factorize rtpmap formatting

[vlc] / include / vlc_sout.h

diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index 839861c9229665fbc12506425228deae873f4288..f268fd5effb2b8f1ceff2c1b5bf681891b67aa79 100644 (file)
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * stream_output.h : stream output module
  *****************************************************************************
- * Copyright (C) 2002-2005 the VideoLAN team
+ * Copyright (C) 2002-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -69,28 +69,29 @@ struct sout_access_out_t
     VLC_COMMON_MEMBERS
 
     module_t                *p_module;
-
-    sout_instance_t         *p_sout;
-
     char                    *psz_access;
-    config_chain_t              *p_cfg;
 
     int                      i_writes;
     /** Local counter reset each time it is transferred to stats */
     int64_t                  i_sent_bytes;
 
-    char                    *psz_name;
+    char                    *psz_path;
     sout_access_out_sys_t   *p_sys;
     int                     (*pf_seek)( sout_access_out_t *, off_t );
     int                     (*pf_read)( sout_access_out_t *, block_t * );
     int                     (*pf_write)( sout_access_out_t *, block_t * );
+    int                     (*pf_control)( sout_access_out_t *, int, va_list);
+
+    config_chain_t              *p_cfg;
+    sout_instance_t         *p_sout;
 };
 
-VLC_EXPORT( sout_access_out_t *,sout_AccessOutNew, ( sout_instance_t *, char *psz_access, char *psz_name ) );
+VLC_EXPORT( sout_access_out_t *,sout_AccessOutNew, ( sout_instance_t *, const char *psz_access, const char *psz_name ) );
 VLC_EXPORT( void,               sout_AccessOutDelete, ( sout_access_out_t * ) );
 VLC_EXPORT( int,                sout_AccessOutSeek,   ( sout_access_out_t *, off_t ) );
 VLC_EXPORT( int,                sout_AccessOutRead,   ( sout_access_out_t *, block_t * ) );
 VLC_EXPORT( int,                sout_AccessOutWrite,  ( sout_access_out_t *, block_t * ) );
+VLC_EXPORT( int,                sout_AccessOutControl,( sout_access_out_t *, int, va_list ) );
 
 /** Muxer structure */
 struct  sout_mux_t
@@ -207,38 +208,20 @@ static inline int sout_StreamIdSend( sout_stream_t *s, sout_stream_id_t *id, blo
 }
 
 /****************************************************************************
- * Announce handler mess
+ * Announce handler
  ****************************************************************************/
-struct sap_session_t;
-
-struct session_descriptor_t
-{
-    char *psz_name;
-    char *psz_uri;
-    int i_port;
-    int i_payload;   /* SAP Payload type */
-
-    char *psz_group;
-
-    sap_session_t *p_sap; /* If we have a sap session, remember it */
-    char *psz_sdp;
-    vlc_bool_t b_rtp;
-};
+VLC_EXPORT(session_descriptor_t*,sout_AnnounceRegisterSDP, (sout_instance_t *, const char *, const char *, const char *, announce_method_t* ) );
+VLC_EXPORT( int,                sout_AnnounceUnRegister, (sout_instance_t *,session_descriptor_t* ) );
 
-#define METHOD_TYPE_SAP 1
+VLC_EXPORT(announce_method_t*,   sout_SAPMethod, (void) );
+VLC_EXPORT(void,                 sout_MethodRelease, (announce_method_t *) );
 
-struct announce_method_t
-{
-    int i_type;
-};
+/** SDP */
 
-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 *, const char *, announce_method_t* ) );
-VLC_EXPORT( int,                sout_AnnounceUnRegister, (sout_instance_t *,session_descriptor_t* ) );
+VLC_EXPORT( char *, vlc_sdp_Start, ( vlc_object_t *obj, const char *cfgpref, const struct sockaddr *src, size_t srclen, const struct sockaddr *addr, size_t addrlen ) );
+VLC_EXPORT( char *, sdp_AddMedia, (char **sdp, const char *type, const char *protocol, int dport, unsigned pt, vlc_bool_t bw_indep, unsigned bw, const char *ptname, unsigned clockrate, unsigned channels, const char *fmtp) );
+VLC_EXPORT( char *, sdp_AddAttribute, (char **sdp, const char *name, const char *fmt, ...) ATTRIBUTE_FORMAT( 3, 4 ) );
 
-VLC_EXPORT(session_descriptor_t*,sout_AnnounceSessionCreate, (void) );
-VLC_EXPORT(void,                 sout_AnnounceSessionDestroy, (session_descriptor_t *) );
-VLC_EXPORT(announce_method_t*,   sout_AnnounceMethodCreate, (int) );
 
 #ifdef __cplusplus
 }