X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_sout.h;h=3a336bb1a4af70105d67112ca381c84882dd0be5;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=576e8305eb8e07e115c6ad95d36c22ba7af2750a;hpb=c0f4bfc5d85c96cf29f4bd05fa5fa42eb344d1dc;p=vlc diff --git a/include/vlc_sout.h b/include/vlc_sout.h index 576e8305eb..3a336bb1a4 100644 --- a/include/vlc_sout.h +++ b/include/vlc_sout.h @@ -1,13 +1,14 @@ /***************************************************************************** * stream_output.h : stream output module ***************************************************************************** - * Copyright (C) 2002-2007 the VideoLAN team + * Copyright (C) 2002-2008 the VideoLAN team * $Id$ * * Authors: Christophe Massiot * Laurent Aimar * Eric Petit * Jean-Paul Saman + * Rémi Denis-Courmont * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,6 +28,11 @@ #ifndef VLC_SOUT_H_ #define VLC_SOUT_H_ +/** + * \file + * This file defines structures and functions for stream ouput in vlc + */ + #ifdef __cplusplus extern "C" { #endif @@ -39,7 +45,6 @@ struct sout_instance_t VLC_COMMON_MEMBERS char *psz_sout; - char *psz_chain; /* meta data (Read only) XXX it won't be set before the first packet received */ vlc_meta_t *p_meta; @@ -91,18 +96,32 @@ struct sout_access_out_t int (*pf_seek)( sout_access_out_t *, off_t ); ssize_t (*pf_read)( sout_access_out_t *, block_t * ); ssize_t (*pf_write)( sout_access_out_t *, block_t * ); - int (*pf_control)( sout_access_out_t *, int, va_list); + int (*pf_control)( sout_access_out_t *, int, va_list ); - config_chain_t *p_cfg; - sout_instance_t *p_sout; + config_chain_t *p_cfg; }; -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( ssize_t, sout_AccessOutRead, ( sout_access_out_t *, block_t * ) ); -VLC_EXPORT( ssize_t, sout_AccessOutWrite, ( sout_access_out_t *, block_t * ) ); -VLC_EXPORT( int, sout_AccessOutControl,( sout_access_out_t *, int, va_list ) ); +enum access_out_query_e +{ + ACCESS_OUT_CONTROLS_PACE, /* arg1=bool *, can fail (assume true) */ +}; + +VLC_EXPORT( sout_access_out_t *,sout_AccessOutNew, ( vlc_object_t *, const char *psz_access, const char *psz_name ) LIBVLC_USED ); +#define sout_AccessOutNew( obj, access, name ) \ + sout_AccessOutNew( VLC_OBJECT(obj), access, name ) +VLC_EXPORT( void, sout_AccessOutDelete, ( sout_access_out_t * ) ); +VLC_EXPORT( int, sout_AccessOutSeek, ( sout_access_out_t *, off_t ) ); +VLC_EXPORT( ssize_t, sout_AccessOutRead, ( sout_access_out_t *, block_t * ) ); +VLC_EXPORT( ssize_t, sout_AccessOutWrite, ( sout_access_out_t *, block_t * ) ); +VLC_EXPORT( int, sout_AccessOutControl, ( sout_access_out_t *, int, ... ) ); + +static inline bool sout_AccessOutCanControlPace( sout_access_out_t *p_ao ) +{ + bool b; + if( sout_AccessOutControl( p_ao, ACCESS_OUT_CONTROLS_PACE, &b ) ) + return true; + return b; +} /** Muxer structure */ struct sout_mux_t @@ -158,11 +177,12 @@ struct sout_input_t }; -VLC_EXPORT( sout_mux_t *, sout_MuxNew, ( sout_instance_t*, char *, sout_access_out_t * ) ); -VLC_EXPORT( sout_input_t *, sout_MuxAddStream, ( sout_mux_t *, es_format_t * ) ); +VLC_EXPORT( sout_mux_t *, sout_MuxNew, ( sout_instance_t*, const char *, sout_access_out_t * ) LIBVLC_USED ); +VLC_EXPORT( sout_input_t *, sout_MuxAddStream, ( sout_mux_t *, es_format_t * ) LIBVLC_USED ); VLC_EXPORT( void, sout_MuxDeleteStream, ( sout_mux_t *, sout_input_t * ) ); VLC_EXPORT( void, sout_MuxDelete, ( sout_mux_t * ) ); VLC_EXPORT( void, sout_MuxSendBuffer, ( sout_mux_t *, sout_input_t *, block_t * ) ); +VLC_EXPORT( int, sout_MuxGetStream, (sout_mux_t *, int , mtime_t *)); static inline int sout_MuxControl( sout_mux_t *p_mux, int i_query, ... ) { @@ -187,7 +207,7 @@ struct sout_stream_t char *psz_name; config_chain_t *p_cfg; - char *psz_next; + sout_stream_t *p_next; /* Subpicture unit */ spu_t *p_spu; @@ -202,8 +222,9 @@ struct sout_stream_t sout_stream_sys_t *p_sys; }; -VLC_EXPORT( sout_stream_t *, sout_StreamNew, ( sout_instance_t *, char *psz_chain ) ); -VLC_EXPORT( void, sout_StreamDelete, ( sout_stream_t * ) ); +VLC_EXPORT( void, sout_StreamChainDelete, (sout_stream_t *p_first, sout_stream_t *p_last ) ); +VLC_EXPORT( sout_stream_t *, sout_StreamChainNew, (sout_instance_t *p_sout, + char *psz_chain, sout_stream_t *p_next, sout_stream_t **p_last) LIBVLC_USED ); static inline sout_stream_id_t *sout_StreamIdAdd( sout_stream_t *s, es_format_t *fmt ) { @@ -219,17 +240,28 @@ static inline int sout_StreamIdSend( sout_stream_t *s, sout_stream_id_t *id, blo } /**************************************************************************** - * Announce handler + * Encoder ****************************************************************************/ -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(announce_method_t*, sout_SAPMethod, (void) ); +VLC_EXPORT( encoder_t *, sout_EncoderCreate, ( vlc_object_t *obj ) ); +#define sout_EncoderCreate(o) sout_EncoderCreate(VLC_OBJECT(o)) + +/**************************************************************************** + * Announce handler + ****************************************************************************/ +VLC_EXPORT(session_descriptor_t*,sout_AnnounceRegisterSDP, ( vlc_object_t *, const char *, const char *, announce_method_t* ) LIBVLC_USED ); +VLC_EXPORT( int, sout_AnnounceUnRegister, (vlc_object_t *,session_descriptor_t* ) ); +#define sout_AnnounceRegisterSDP(o, sdp, addr, m) \ + sout_AnnounceRegisterSDP(VLC_OBJECT (o), sdp, addr, m) +#define sout_AnnounceUnRegister(o, a) \ + sout_AnnounceUnRegister(VLC_OBJECT (o), a) + +VLC_EXPORT(announce_method_t*, sout_SAPMethod, (void) LIBVLC_USED ); VLC_EXPORT(void, sout_MethodRelease, (announce_method_t *) ); /** SDP */ -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 *, vlc_sdp_Start, ( vlc_object_t *obj, const char *cfgpref, const struct sockaddr *src, size_t srclen, const struct sockaddr *addr, size_t addrlen ) LIBVLC_USED ); VLC_EXPORT( char *, sdp_AddMedia, (char **sdp, const char *type, const char *protocol, int dport, unsigned pt, bool 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, ...) LIBVLC_FORMAT( 3, 4 ) );