X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_sout.h;h=3a336bb1a4af70105d67112ca381c84882dd0be5;hb=502a2fa8050ae47d34c5635dd0f6ee6fd4ce8242;hp=0decbe7581015cd0054936f13c298a840e913860;hpb=974be97baa8cabe04c64f9fb0f363ec5e95573d3;p=vlc diff --git a/include/vlc_sout.h b/include/vlc_sout.h index 0decbe7581..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 @@ -24,12 +25,13 @@ * 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 ouput in vlc + */ #ifdef __cplusplus extern "C" { @@ -43,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; @@ -58,6 +59,21 @@ struct sout_instance_t sout_instance_sys_t *p_sys; }; +/** Stream output statistics */ +typedef enum +{ + SOUT_STATISTIC_DECODED_VIDEO, + SOUT_STATISTIC_DECODED_AUDIO, + SOUT_STATISTIC_DECODED_SUBTITLE, + + /* Use them only if you do not goes through a access_out module */ + SOUT_STATISTIC_SENT_PACKET, + SOUT_STATISTIC_SENT_BYTE, + +} sout_statistic_t; + +VLC_EXPORT( void, sout_UpdateStatistic, ( sout_instance_t *p_sout, sout_statistic_t, int ) ); + /**************************************************************************** * sout_stream_id_t: opaque (private for all sout_stream_t) ****************************************************************************/ @@ -78,20 +94,34 @@ struct sout_access_out_t 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) */ }; -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_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 @@ -121,8 +151,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,9 +160,9 @@ 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 */ }; @@ -147,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, ... ) { @@ -176,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; @@ -191,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 ) { @@ -208,21 +240,30 @@ static inline int sout_StreamIdSend( sout_stream_t *s, sout_stream_id_t *id, blo } /**************************************************************************** - * Announce handler mess + * 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(void, sout_AnnounceSessionDestroy, (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 *, sdp_Start, (const char *name, const char *description, const char *url, const char *email, const char *phone, const struct sockaddr *orig, size_t origlen, 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 *rtpmap, const char *fmtp) ); -VLC_EXPORT( char *, sdp_AddAttribute, (char **sdp, const char *name, const char *fmt, ...) ATTRIBUTE_FORMAT( 3, 4 ) ); +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 ) ); #ifdef __cplusplus