Skip to content

V
vlc-1.1
Commit eed2a24c authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* modules/stream_out/*: coding style changes + strings review.
parent d451cb0c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 121 deletions
modules/stream_out/display.c
View file @ eed2a24c
/*****************************************************************************
* display.c
* display.c: display stream output module
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: display.c,v 1.11 2003/12/10 23:51:05 gbazin Exp $
* $Id: display.c,v 1.12 2004/01/25 14:34:25 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -47,7 +47,7 @@ static int Send( sout_stream_t *, sout_stream_id_t *, sout_buffer_
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("Display stream") );
set_description( _("Display stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "display" );
set_callbacks( Open, Close );
......@@ -108,7 +108,6 @@ static int Open( vlc_object_t *p_this )
/*****************************************************************************
* Close:
*****************************************************************************/
static void Close( vlc_object_t * p_this )
{
sout_stream_t *p_stream = (sout_stream_t*)p_this;
......@@ -124,7 +123,6 @@ struct sout_stream_id_t
es_descriptor_t *p_es;
};
static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
......
modules/stream_out/dummy.c
View file @ eed2a24c
/*****************************************************************************
* dummy.c
* dummy.c: dummy stream output module
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: dummy.c,v 1.3 2003/12/07 19:06:21 jpsaman Exp $
* Copyright (C) 2003-2004 VideoLAN
* $Id: dummy.c,v 1.4 2004/01/25 14:34:25 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -44,7 +44,7 @@ static int Send( sout_stream_t *, sout_stream_id_t *, sout_buffer_
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("Dummy stream") );
set_description( _("Dummy stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "dummy" );
set_callbacks( Open, Close );
......@@ -55,7 +55,7 @@ vlc_module_end();
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_stream_t *p_stream = (sout_stream_t*)p_this;
p_stream->pf_add = Add;
p_stream->pf_del = Del;
......@@ -69,7 +69,6 @@ static int Open( vlc_object_t *p_this )
/*****************************************************************************
* Close:
*****************************************************************************/
static void Close( vlc_object_t * p_this )
{
#if 0
......@@ -82,8 +81,7 @@ struct sout_stream_id_t
int i_d_u_m_m_y;
};
static sout_stream_id_t * Add ( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_id_t *id;
......@@ -93,14 +91,15 @@ static sout_stream_id_t * Add ( sout_stream_t *p_stream, es_format_t *p_fmt
return id;
}
static int Del ( sout_stream_t *p_stream, sout_stream_id_t *id )
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
{
free( id );
return VLC_SUCCESS;
}
static int Send ( sout_stream_t *p_stream, sout_stream_id_t *id, sout_buffer_t *p_buffer )
static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
sout_buffer_t *p_buffer )
{
sout_buffer_t *p_next;
......
modules/stream_out/duplicate.c
View file @ eed2a24c
/*****************************************************************************
* duplicate.c
* duplicate.c: duplicate stream output module
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: duplicate.c,v 1.11 2004/01/19 18:15:55 fenrir Exp $
* Copyright (C) 2003-2004 VideoLAN
* $Id: duplicate.c,v 1.12 2004/01/25 14:34:25 gbazin Exp $
*
* Author: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -45,14 +45,13 @@ static int Send( sout_stream_t *, sout_stream_id_t *,
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("Duplicate stream") );
set_description( _("Duplicate stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "duplicate" );
add_shortcut( "dup" );
set_callbacks( Open, Close );
vlc_module_end();
struct sout_stream_sys_t
{
int i_nb_streams;
......@@ -134,7 +133,6 @@ static int Open( vlc_object_t *p_this )
/*****************************************************************************
* Close:
*****************************************************************************/
static void Close( vlc_object_t * p_this )
{
sout_stream_t *p_stream = (sout_stream_t*)p_this;
......@@ -456,5 +454,3 @@ static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select )
}
return VLC_TRUE;
}
modules/stream_out/es.c
View file @ eed2a24c
/*****************************************************************************
* es.c
* es.c: Elementary stream output module
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: es.c,v 1.4 2003/11/21 15:32:08 fenrir Exp $
* Copyright (C) 2003-2004 VideoLAN
* $Id: es.c,v 1.5 2004/01/25 14:34:25 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -46,10 +46,9 @@ static int Send( sout_stream_t *, sout_stream_id_t *, sout_buffer_
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("ES stream") );
set_description( _("Elementary stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "es" );
add_shortcut( "es" );
set_callbacks( Open, Close );
vlc_module_end();
......@@ -92,14 +91,13 @@ static int Open( vlc_object_t *p_this )
p_sys->psz_access_audio = sout_cfg_find_value( p_stream->p_cfg, "access_audio" );
p_sys->psz_access_video = sout_cfg_find_value( p_stream->p_cfg, "access_video" );
p_sys->psz_mux = sout_cfg_find_value( p_stream->p_cfg, "mux" );
p_sys->psz_mux_audio = sout_cfg_find_value( p_stream->p_cfg, "mux_audio" );
p_sys->psz_mux_video = sout_cfg_find_value( p_stream->p_cfg, "mux_video" );
p_sys->psz_mux = sout_cfg_find_value( p_stream->p_cfg, "mux" );
p_sys->psz_mux_audio = sout_cfg_find_value( p_stream->p_cfg, "mux_audio" );
p_sys->psz_mux_video = sout_cfg_find_value( p_stream->p_cfg, "mux_video" );
p_sys->psz_url = sout_cfg_find_value( p_stream->p_cfg, "url" );
p_sys->psz_url_audio = sout_cfg_find_value( p_stream->p_cfg, "url_audio" );
p_sys->psz_url_video = sout_cfg_find_value( p_stream->p_cfg, "url_video" );
p_sys->psz_url = sout_cfg_find_value( p_stream->p_cfg, "url" );
p_sys->psz_url_audio = sout_cfg_find_value( p_stream->p_cfg, "url_audio" );
p_sys->psz_url_video = sout_cfg_find_value( p_stream->p_cfg, "url_video" );
p_stream->pf_add = Add;
p_stream->pf_del = Del;
......@@ -128,7 +126,8 @@ struct sout_stream_id_t
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( char *psz_fmt, vlc_fourcc_t i_fourcc, int i_count,
char *psz_access, char *psz_mux )
{
char *psz_url, *p;
......@@ -186,7 +185,7 @@ static char * es_print_url( char *psz_fmt, vlc_fourcc_t i_fourcc, int i_count, c
return( psz_url );
}
static sout_stream_id_t * Add ( sout_stream_t *p_stream, es_format_t *p_fmt )
static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_instance_t *p_sout = p_stream->p_sout;
......@@ -227,14 +226,16 @@ static sout_stream_id_t * Add ( sout_stream_t *p_stream, es_format_t *p_fmt
psz_mux = p_sys->psz_mux;
}
/* *** get url (%d expanded as a codec count, %c expanded as codec fcc ) *** */
/* Get url (%d expanded as a codec count, %c expanded as codec fcc ) */
if( p_fmt->i_cat == AUDIO_ES && p_sys->psz_url_audio )
{
psz_url = es_print_url( p_sys->psz_url_audio, p_fmt->i_codec, p_sys->i_count_audio, psz_access, psz_mux );
psz_url = es_print_url( p_sys->psz_url_audio, p_fmt->i_codec,
p_sys->i_count_audio, psz_access, psz_mux );
}
else if( p_fmt->i_cat == VIDEO_ES && p_sys->psz_url_video )
{
psz_url = es_print_url( p_sys->psz_url_video, p_fmt->i_codec, p_sys->i_count_video, psz_access, psz_mux );
psz_url = es_print_url( p_sys->psz_url_video, p_fmt->i_codec,
p_sys->i_count_video, psz_access, psz_mux );
}
else
{
......@@ -252,7 +253,8 @@ static sout_stream_id_t * Add ( sout_stream_t *p_stream, es_format_t *p_fmt
i_count = p_sys->i_count;
}
psz_url = es_print_url( p_sys->psz_url, p_fmt->i_codec, i_count, psz_access, psz_mux );
psz_url = es_print_url( p_sys->psz_url, p_fmt->i_codec,
i_count, psz_access, psz_mux );
}
p_sys->i_count++;
......@@ -306,7 +308,7 @@ static sout_stream_id_t * Add ( sout_stream_t *p_stream, es_format_t *p_fmt
return id;
}
static int Del ( sout_stream_t *p_stream, sout_stream_id_t *id )
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
{
sout_access_out_t *p_access = id->p_mux->p_access;
......@@ -317,7 +319,8 @@ static int Del ( sout_stream_t *p_stream, sout_stream_id_t *id )
return VLC_SUCCESS;
}
static int Send ( sout_stream_t *p_stream, sout_stream_id_t *id, sout_buffer_t *p_buffer )
static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
sout_buffer_t *p_buffer )
{
sout_MuxSendBuffer( id->p_mux, id->p_input, p_buffer );
......
modules/stream_out/gather.c
View file @ eed2a24c
/*****************************************************************************
* gather.c
* gather.c: gathering stream output module
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: gather.c,v 1.2 2003/11/21 15:32:08 fenrir Exp $
* Copyright (C) 2003-2004 VideoLAN
* $Id: gather.c,v 1.3 2004/01/25 14:34:25 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -37,7 +37,7 @@ static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
vlc_module_begin();
set_description( _("Gather stream") );
set_description( _("Gathering stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "gather" );
set_callbacks( Open, Close );
......@@ -48,7 +48,8 @@ vlc_module_end();
*****************************************************************************/
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 *, sout_buffer_t* );
static int Send( sout_stream_t *, sout_stream_id_t *,
sout_buffer_t* );
struct sout_stream_id_t
{
......@@ -74,8 +75,8 @@ static int Open( vlc_object_t *p_this )
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_stream_sys_t *p_sys;
p_stream->p_sys = p_sys = malloc( sizeof( sout_stream_sys_t ) );
p_sys->p_out = sout_stream_new( p_stream->p_sout, p_stream->psz_next );
p_stream->p_sys = p_sys = malloc( sizeof( sout_stream_sys_t ) );
p_sys->p_out = sout_stream_new( p_stream->p_sout, p_stream->psz_next );
if( p_sys->p_out == NULL )
{
free( p_sys );
......@@ -192,4 +193,3 @@ static int Send( sout_stream_t *p_stream,
return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer );
}
modules/stream_out/rtp.c
View file @ eed2a24c
This diff is collapsed.
modules/stream_out/standard.c
View file @ eed2a24c
/*****************************************************************************
* standard.c
* standard.c: standard stream output module
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: standard.c,v 1.17 2004/01/15 23:40:44 gbazin Exp $
* Copyright (C) 2003-2004 VideoLAN
* $Id: standard.c,v 1.18 2004/01/25 14:34:25 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -48,7 +48,7 @@ static int Send( sout_stream_t *, sout_stream_id_t *, sout_buffer_
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("Standard stream") );
set_description( _("Standard stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "standard" );
add_shortcut( "std" );
......@@ -308,7 +308,6 @@ static int Open( vlc_object_t *p_this )
/*****************************************************************************
* Close:
*****************************************************************************/
static void Close( vlc_object_t * p_this )
{
sout_stream_t *p_stream = (sout_stream_t*)p_this;
......
modules/stream_out/transcode.c
View file @ eed2a24c
/*****************************************************************************
* transcode.c
* transcode.c: transcoding stream output module
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: transcode.c,v 1.71 2004/01/19 18:24:11 fenrir Exp $
* Copyright (C) 2003-2004 VideoLAN
* $Id: transcode.c,v 1.72 2004/01/25 14:34:25 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
......@@ -76,7 +76,7 @@ static int pi_channels_maps[6] =
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("Transcode stream") );
set_description( _("Transcode stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "transcode" );
set_callbacks( Open, Close );
......
modules/stream_out/transrate/transrate.c
View file @ eed2a24c
/*****************************************************************************
* transrate.c
* transrate.c: MPEG2 video transrating module
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* Copyright (C) 2003 Freebox S.A.
* Copyright (C) 2003 Antoine Missout
* Copyright (C) 2000-2003 Michel Lespinasse <walken@zoy.org>
* Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
* $Id: transrate.c,v 1.5 2003/11/29 18:36:13 massiot Exp $
* $Id: transrate.c,v 1.6 2004/01/25 14:34:25 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Laurent Aimar <fenrir@via.ecp.fr>
......@@ -58,7 +58,7 @@ static int transrate_video_process( sout_stream_t *, sout_stream_id_t *, sout_b
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("Transrate stream") );
set_description( _("MPEG2 video transrating stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "transrate" );
set_callbacks( Open, Close );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment