X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_sout.h;h=ba6d0a416eca8d32b16721617a9fe0501942ebb6;hb=156b305884ea57e5d5bc7f96ebe13466f845149a;hp=f268fd5effb2b8f1ceff2c1b5bf681891b67aa79;hpb=8da8aa9818c5f129db745331bf2b87f173eaf0c0;p=vlc diff --git a/include/vlc_sout.h b/include/vlc_sout.h index f268fd5eff..ba6d0a416e 100644 --- a/include/vlc_sout.h +++ b/include/vlc_sout.h @@ -1,67 +1,64 @@ /***************************************************************************** - * stream_output.h : stream output module + * vlc_sout.h : stream output module ***************************************************************************** - * Copyright (C) 2002-2007 the VideoLAN team + * Copyright (C) 2002-2008 VLC authors and VideoLAN * $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 - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#if !defined( __LIBVLC__ ) - #error You are not libvlc or one of its plugins. You cannot include this file -#endif +#ifndef VLC_SOUT_H_ +#define VLC_SOUT_H_ -#ifndef _VLC_SOUT_H_ -#define _VLC_SOUT_H_ +/** + * \file + * This file defines structures and functions for stream output in vlc + */ #ifdef __cplusplus extern "C" { #endif +#include #include -/** Stream output instance */ +/** Stream output instance (FIXME: should be private to src/ to avoid + * invalid unsynchronized access) */ 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; /** count of output that can't control the space */ int i_out_pace_nocontrol; vlc_mutex_t lock; sout_stream_t *p_stream; - - /** Private */ - sout_instance_sys_t *p_sys; }; /**************************************************************************** - * sout_stream_id_t: opaque (private for all sout_stream_t) + * sout_stream_id_sys_t: opaque (private for all sout_stream_t) ****************************************************************************/ -typedef struct sout_stream_id_t sout_stream_id_t; +typedef struct sout_stream_id_sys_t sout_stream_id_sys_t; /** Stream output access_output */ struct sout_access_out_t @@ -71,27 +68,38 @@ struct sout_access_out_t module_t *p_module; char *psz_access; - int i_writes; - /** Local counter reset each time it is transferred to stats */ - int64_t i_sent_bytes; - 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); + 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 ); + + config_chain_t *p_cfg; +}; - config_chain_t *p_cfg; - sout_instance_t *p_sout; +enum access_out_query_e +{ + ACCESS_OUT_CONTROLS_PACE, /* arg1=bool *, can fail (assume true) */ + ACCESS_OUT_CAN_SEEK, /* arg1=bool *, can fail (assume true) */ }; -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 ) ); +VLC_API sout_access_out_t * sout_AccessOutNew( vlc_object_t *, const char *psz_access, const char *psz_name ) VLC_USED; +#define sout_AccessOutNew( obj, access, name ) \ + sout_AccessOutNew( VLC_OBJECT(obj), access, name ) +VLC_API void sout_AccessOutDelete( sout_access_out_t * ); +VLC_API int sout_AccessOutSeek( sout_access_out_t *, off_t ); +VLC_API ssize_t sout_AccessOutRead( sout_access_out_t *, block_t * ); +VLC_API ssize_t sout_AccessOutWrite( sout_access_out_t *, block_t * ); +VLC_API 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 @@ -121,8 +129,8 @@ struct sout_mux_t /* XXX private to stream_output.c */ /* if muxer doesn't support adding stream at any time then we first wait * for stream then we refuse all stream and start muxing */ - vlc_bool_t b_add_stream_any_time; - vlc_bool_t b_waiting_stream; + bool b_add_stream_any_time; + bool b_waiting_stream; /* we wait one second after first stream added */ mtime_t i_add_stream_start; }; @@ -130,16 +138,14 @@ struct sout_mux_t enum sout_mux_query_e { /* capabilities */ - MUX_CAN_ADD_STREAM_WHILE_MUXING, /* arg1= vlc_bool_t *, res=cannot fail */ + MUX_CAN_ADD_STREAM_WHILE_MUXING, /* arg1= bool *, res=cannot fail */ /* properties */ - MUX_GET_ADD_STREAM_WAIT, /* arg1= vlc_bool_t *, res=cannot fail */ + MUX_GET_ADD_STREAM_WAIT, /* arg1= bool *, res=cannot fail */ MUX_GET_MIME, /* arg1= char ** res=can fail */ }; struct sout_input_t { - sout_instance_t *p_sout; - es_format_t *p_fmt; block_fifo_t *p_fifo; @@ -147,11 +153,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( 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_API sout_mux_t * sout_MuxNew( sout_instance_t*, const char *, sout_access_out_t * ) VLC_USED; +VLC_API sout_input_t * sout_MuxAddStream( sout_mux_t *, es_format_t * ) VLC_USED; +VLC_API void sout_MuxDeleteStream( sout_mux_t *, sout_input_t * ); +VLC_API void sout_MuxDelete( sout_mux_t * ); +VLC_API int sout_MuxSendBuffer( sout_mux_t *, sout_input_t *, block_t * ); +VLC_API int sout_MuxGetStream(sout_mux_t *, unsigned, mtime_t *); static inline int sout_MuxControl( sout_mux_t *p_mux, int i_query, ... ) { @@ -176,52 +183,67 @@ struct sout_stream_t char *psz_name; config_chain_t *p_cfg; - char *psz_next; - - /* Subpicture unit */ - spu_t *p_spu; + sout_stream_t *p_next; /* add, remove a stream */ - sout_stream_id_t *(*pf_add)( sout_stream_t *, es_format_t * ); - int (*pf_del)( sout_stream_t *, sout_stream_id_t * ); + sout_stream_id_sys_t *(*pf_add)( sout_stream_t *, es_format_t * ); + int (*pf_del)( sout_stream_t *, sout_stream_id_sys_t * ); /* manage a packet */ - int (*pf_send)( sout_stream_t *, sout_stream_id_t *, block_t* ); + int (*pf_send)( sout_stream_t *, sout_stream_id_sys_t *, block_t* ); - /* private */ sout_stream_sys_t *p_sys; + bool pace_nocontrol; }; -VLC_EXPORT( sout_stream_t *, sout_StreamNew, ( sout_instance_t *, char *psz_chain ) ); -VLC_EXPORT( void, sout_StreamDelete, ( sout_stream_t * ) ); +VLC_API void sout_StreamChainDelete(sout_stream_t *p_first, sout_stream_t *p_last ); +VLC_API sout_stream_t *sout_StreamChainNew(sout_instance_t *p_sout, + char *psz_chain, sout_stream_t *p_next, sout_stream_t **p_last) VLC_USED; -static inline sout_stream_id_t *sout_StreamIdAdd( sout_stream_t *s, es_format_t *fmt ) +static inline sout_stream_id_sys_t *sout_StreamIdAdd( sout_stream_t *s, es_format_t *fmt ) { return s->pf_add( s, fmt ); } -static inline int sout_StreamIdDel( sout_stream_t *s, sout_stream_id_t *id ) +static inline int sout_StreamIdDel( sout_stream_t *s, sout_stream_id_sys_t *id ) { return s->pf_del( s, id ); } -static inline int sout_StreamIdSend( sout_stream_t *s, sout_stream_id_t *id, block_t *b ) +static inline int sout_StreamIdSend( sout_stream_t *s, sout_stream_id_sys_t *id, block_t *b ) { return s->pf_send( s, id, b ); } /**************************************************************************** - * Announce handler + * Encoder ****************************************************************************/ -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* ) ); -VLC_EXPORT(announce_method_t*, sout_SAPMethod, (void) ); -VLC_EXPORT(void, sout_MethodRelease, (announce_method_t *) ); +VLC_API encoder_t * sout_EncoderCreate( vlc_object_t *obj ); +#define sout_EncoderCreate(o) sout_EncoderCreate(VLC_OBJECT(o)) + +/**************************************************************************** + * Announce handler + ****************************************************************************/ +VLC_API session_descriptor_t* sout_AnnounceRegisterSDP( vlc_object_t *, const char *, const char * ) VLC_USED; +VLC_API void sout_AnnounceUnRegister(vlc_object_t *,session_descriptor_t* ); +#define sout_AnnounceRegisterSDP(o, sdp, addr) \ + sout_AnnounceRegisterSDP(VLC_OBJECT (o), sdp, addr) +#define sout_AnnounceUnRegister(o, a) \ + sout_AnnounceUnRegister(VLC_OBJECT (o), a) /** 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 *, 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 ) ); +struct sockaddr; +VLC_API 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_USED; +VLC_API 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_API char * sdp_AddAttribute(char **sdp, const char *name, const char *fmt, ...) VLC_FORMAT( 3, 4 ); + +/** Description module */ +typedef struct sout_description_data_t +{ + int i_es; + es_format_t **es; + vlc_sem_t *sem; +} sout_description_data_t; #ifdef __cplusplus }