X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fes.c;h=0eb79902bd5d0861886af87d7cb97acbb6b72d0d;hb=78a42a038b945c0404ac4e7c3ccd58eb0105067a;hp=9002d3abede5040edfef0eea069a5831e6899830;hpb=f3dad63031402c5f6ac2de72145420b8042728fa;p=vlc diff --git a/modules/stream_out/es.c b/modules/stream_out/es.c index 9002d3abed..0eb79902bd 100644 --- a/modules/stream_out/es.c +++ b/modules/stream_out/es.c @@ -1,24 +1,24 @@ /***************************************************************************** * es.c: Elementary stream output module ***************************************************************************** - * Copyright (C) 2003-2004 the VideoLAN team + * Copyright (C) 2003-2004 VLC authors and VideoLAN * $Id$ * * Authors: Laurent Aimar * - * 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. *****************************************************************************/ /***************************************************************************** @@ -33,7 +33,7 @@ #include #include #include -#include +#include /***************************************************************************** * Module descriptor @@ -74,40 +74,40 @@ static void Close ( vlc_object_t * ); #define SOUT_CFG_PREFIX "sout-es-" -vlc_module_begin(); - set_shortname( "ES" ); - set_description( N_("Elementary stream output") ); - set_capability( "sout stream", 50 ); - add_shortcut( "es" ); - set_category( CAT_SOUT ); - set_subcategory( SUBCAT_SOUT_STREAM ); - - add_string( SOUT_CFG_PREFIX "access", "", NULL, ACCESS_TEXT, - ACCESS_LONGTEXT, true ); - add_string( SOUT_CFG_PREFIX "access-audio", "", NULL, ACCESSA_TEXT, - ACCESSA_LONGTEXT, true ); - add_string( SOUT_CFG_PREFIX "access-video", "", NULL, ACCESSV_TEXT, - ACCESSV_LONGTEXT, true ); - - add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT, - MUX_LONGTEXT, true ); - add_string( SOUT_CFG_PREFIX "mux-audio", "", NULL, MUXA_TEXT, - MUXA_LONGTEXT, true ); - add_string( SOUT_CFG_PREFIX "mux-video", "", NULL, MUXV_TEXT, - MUXV_LONGTEXT, true ); - - add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT, - DEST_LONGTEXT, true ); - change_unsafe(); - add_string( SOUT_CFG_PREFIX "dst-audio", "", NULL, DESTA_TEXT, - DESTA_LONGTEXT, true ); - change_unsafe(); - add_string( SOUT_CFG_PREFIX "dst-video", "", NULL, DESTV_TEXT, - DESTV_LONGTEXT, true ); - change_unsafe(); - - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "ES" ) + set_description( N_("Elementary stream output") ) + set_capability( "sout stream", 50 ) + add_shortcut( "es" ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_STREAM ) + + set_section( N_("Generic"), NULL ) + add_string( SOUT_CFG_PREFIX "access", "", ACCESS_TEXT, + ACCESS_LONGTEXT, true ) + add_string( SOUT_CFG_PREFIX "mux", "", MUX_TEXT, + MUX_LONGTEXT, true ) + add_string( SOUT_CFG_PREFIX "dst", "", DEST_TEXT, + DEST_LONGTEXT, true ) + + set_section( N_("Audio"), NULL ) + add_string( SOUT_CFG_PREFIX "access-audio", "", ACCESSA_TEXT, + ACCESSA_LONGTEXT, true ) + add_string( SOUT_CFG_PREFIX "mux-audio", "", MUXA_TEXT, + MUXA_LONGTEXT, true ) + add_string( SOUT_CFG_PREFIX "dst-audio", "", DESTA_TEXT, + DESTA_LONGTEXT, true ) + + set_section( N_("Video"), NULL ) + add_string( SOUT_CFG_PREFIX "access-video", "", ACCESSV_TEXT, + ACCESSV_LONGTEXT, true ) + add_string( SOUT_CFG_PREFIX "mux-video", "", MUXV_TEXT, + MUXV_LONGTEXT, true ) + add_string( SOUT_CFG_PREFIX "dst-video", "", DESTV_TEXT, + DESTV_LONGTEXT, true ) + + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Exported prototypes @@ -119,9 +119,9 @@ static const char *const ppsz_sout_options[] = { NULL }; -static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * ); -static int Del ( sout_stream_t *, sout_stream_id_t * ); -static int Send( sout_stream_t *, sout_stream_id_t *, block_t* ); +static sout_stream_id_sys_t *Add( sout_stream_t *, const es_format_t * ); +static void Del ( sout_stream_t *, sout_stream_id_sys_t * ); +static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* ); struct sout_stream_sys_t { @@ -149,7 +149,6 @@ static int Open( vlc_object_t *p_this ) { sout_stream_t *p_stream = (sout_stream_t*)p_this; sout_stream_sys_t *p_sys; - vlc_value_t val; config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, p_stream->p_cfg ); p_sys = malloc( sizeof( sout_stream_sys_t ) ); @@ -158,26 +157,17 @@ static int Open( vlc_object_t *p_this ) p_sys->i_count_audio = 0; p_sys->i_count_video = 0; - var_Get( p_stream, SOUT_CFG_PREFIX "access", &val ); - p_sys->psz_access = val.psz_string; - var_Get( p_stream, SOUT_CFG_PREFIX "access-audio", &val ); - p_sys->psz_access_audio = val.psz_string; - var_Get( p_stream, SOUT_CFG_PREFIX "access-video", &val ); - p_sys->psz_access_video = val.psz_string; - - var_Get( p_stream, SOUT_CFG_PREFIX "mux", &val ); - p_sys->psz_mux = val.psz_string; - var_Get( p_stream, SOUT_CFG_PREFIX "mux-audio", &val ); - p_sys->psz_mux_audio = val.psz_string; - var_Get( p_stream, SOUT_CFG_PREFIX "mux-video", &val ); - p_sys->psz_mux_video = val.psz_string; - - var_Get( p_stream, SOUT_CFG_PREFIX "dst", &val ); - p_sys->psz_dst = val.psz_string; - var_Get( p_stream, SOUT_CFG_PREFIX "dst-audio", &val ); - p_sys->psz_dst_audio = val.psz_string; - var_Get( p_stream, SOUT_CFG_PREFIX "dst-video", &val ); - p_sys->psz_dst_video = val.psz_string; + p_sys->psz_access = var_GetString( p_stream, SOUT_CFG_PREFIX "access" ); + p_sys->psz_access_audio = var_GetString( p_stream, SOUT_CFG_PREFIX "access-audio" ); + p_sys->psz_access_video = var_GetString( p_stream, SOUT_CFG_PREFIX "access-video" ); + + p_sys->psz_mux = var_GetString( p_stream, SOUT_CFG_PREFIX "mux" ); + p_sys->psz_mux_audio = var_GetString( p_stream, SOUT_CFG_PREFIX "mux-audio" ); + p_sys->psz_mux_video = var_GetString( p_stream, SOUT_CFG_PREFIX "mux-video" ); + + p_sys->psz_dst = var_GetString( p_stream, SOUT_CFG_PREFIX "dst" ); + p_sys->psz_dst_audio = var_GetString( p_stream, SOUT_CFG_PREFIX "dst-audio" ); + p_sys->psz_dst_video = var_GetString( p_stream, SOUT_CFG_PREFIX "dst-video" ); p_stream->pf_add = Add; p_stream->pf_del = Del; @@ -212,20 +202,20 @@ static void Close( vlc_object_t * p_this ) free( p_sys ); } -struct sout_stream_id_t +struct sout_stream_id_sys_t { sout_input_t *p_input; sout_mux_t *p_mux; }; -static char * es_print_url( char *psz_fmt, vlc_fourcc_t i_fourcc, int i_count, - char *psz_access, char *psz_mux ) +static char * es_print_url( const char *psz_fmt, vlc_fourcc_t i_fourcc, int i_count, + const char *psz_access, const char *psz_mux ) { char *psz_dst, *p; if( psz_fmt == NULL || !*psz_fmt ) { - psz_fmt = "stream-%n-%c.%m"; + psz_fmt = (char*)"stream-%n-%c.%m"; } p = psz_dst = malloc( 4096 ); @@ -279,14 +269,13 @@ static char * es_print_url( char *psz_fmt, vlc_fourcc_t i_fourcc, int i_count, return( psz_dst ); } -static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, const es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = p_stream->p_sys; - sout_instance_t *p_sout = p_stream->p_sout; - sout_stream_id_t *id; + sout_stream_id_sys_t *id; - char *psz_access; - char *psz_mux; + const char *psz_access; + const char *psz_mux; char *psz_dst; sout_access_out_t *p_access; @@ -364,35 +353,38 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) psz_access, psz_mux, psz_dst ); /* *** find and open appropriate access module *** */ - p_access = sout_AccessOutNew( p_sout, psz_access, psz_dst ); + p_access = sout_AccessOutNew( p_stream, psz_access, psz_dst ); if( p_access == NULL ) { msg_Err( p_stream, "no suitable sout access module for `%s/%s://%s'", psz_access, psz_mux, psz_dst ); - intf_UserFatal( p_stream, false, + dialog_Fatal( p_stream, _("Streaming / Transcoding failed"), _("There is no suitable stream-output access module for \"%s/%s://%s\"."), psz_access, psz_mux, psz_dst ); + free( psz_dst ); return( NULL ); } /* *** find and open appropriate mux module *** */ - p_mux = sout_MuxNew( p_sout, psz_mux, p_access ); + p_mux = sout_MuxNew( p_stream->p_sout, psz_mux, p_access ); if( p_mux == NULL ) { msg_Err( p_stream, "no suitable sout mux module for `%s/%s://%s'", psz_access, psz_mux, psz_dst ); - intf_UserFatal( p_stream, false, + dialog_Fatal( p_stream, _("Streaming / Transcoding failed"), _("There is no suitable stream-output access module "\ "for \"%s/%s://%s\"."), psz_access, psz_mux, psz_dst ); sout_AccessOutDelete( p_access ); + free( psz_dst ); return( NULL ); } + free( psz_dst ); - id = malloc( sizeof( sout_stream_id_t ) ); + id = malloc( sizeof( sout_stream_id_sys_t ) ); if( !id ) { sout_MuxDelete( p_mux ); @@ -410,27 +402,30 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) return NULL; } + if( !sout_AccessOutCanControlPace( p_access ) ) + p_stream->p_sout->i_out_pace_nocontrol++; + return id; } -static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) +static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id ) { VLC_UNUSED(p_stream); sout_access_out_t *p_access = id->p_mux->p_access; - sout_MuxDelete( id->p_mux ); + sout_MuxDeleteStream( id->p_mux, id->p_input ); + sout_MuxDelete( id->p_mux ); + if( !sout_AccessOutCanControlPace( p_access ) ) + p_stream->p_sout->i_out_pace_nocontrol--; sout_AccessOutDelete( p_access ); free( id ); - return VLC_SUCCESS; } -static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, +static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id, block_t *p_buffer ) { VLC_UNUSED(p_stream); - sout_MuxSendBuffer( id->p_mux, id->p_input, p_buffer ); - - return VLC_SUCCESS; + return sout_MuxSendBuffer( id->p_mux, id->p_input, p_buffer ); }