#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_sout.h>
-#include <vlc_vout.h>
+#include <vlc_avcodec.h>
+#include <vlc_filter.h>
+#include <vlc_cpu.h>
-#include <vlc_charset.h>
+#include <vlc_block.h>
+
+#include <vlc_fs.h>
#include <vlc_network.h>
#define HAVE_MMX
#define AUDIO_LONGTEXT N_( \
"Mute audio when command is not 0." )
-vlc_module_begin();
- set_description( N_("MPEG2 video switcher stream output") );
- set_capability( "sout stream", 50 );
- add_shortcut( "switcher" );
- set_callbacks( Open, Close );
+vlc_module_begin ()
+ set_description( N_("MPEG2 video switcher stream output") )
+ set_capability( "sout stream", 50 )
+ add_shortcut( "switcher" )
+ set_callbacks( Open, Close )
add_string( SOUT_CFG_PREFIX "files", "", NULL, FILES_TEXT,
- FILES_LONGTEXT, false );
+ FILES_LONGTEXT, false )
add_string( SOUT_CFG_PREFIX "sizes", "", NULL, SIZES_TEXT,
- SIZES_LONGTEXT, false );
+ SIZES_LONGTEXT, false )
add_string( SOUT_CFG_PREFIX "aspect-ratio", "4:3", NULL, RATIO_TEXT,
- RATIO_LONGTEXT, false );
+ RATIO_LONGTEXT, false )
add_integer( SOUT_CFG_PREFIX "port", 5001, NULL,
- PORT_TEXT, PORT_LONGTEXT, true );
+ PORT_TEXT, PORT_LONGTEXT, true )
add_integer( SOUT_CFG_PREFIX "command", 0, NULL,
- COMMAND_TEXT, COMMAND_LONGTEXT, true );
+ COMMAND_TEXT, COMMAND_LONGTEXT, true )
add_integer( SOUT_CFG_PREFIX "gop", 8, NULL,
- GOP_TEXT, GOP_LONGTEXT, true );
+ GOP_TEXT, GOP_LONGTEXT, true )
add_integer( SOUT_CFG_PREFIX "qscale", 5, NULL,
- QSCALE_TEXT, QSCALE_LONGTEXT, true );
- add_bool( SOUT_CFG_PREFIX "mute-audio", 1, NULL,
- AUDIO_TEXT, AUDIO_LONGTEXT, true );
-vlc_module_end();
+ QSCALE_TEXT, QSCALE_LONGTEXT, true )
+ add_bool( SOUT_CFG_PREFIX "mute-audio", true, NULL,
+ AUDIO_TEXT, AUDIO_LONGTEXT, true )
+vlc_module_end ()
static const char *const ppsz_sout_options[] = {
"files", "sizes", "aspect-ratio", "port", "command", "gop", "qscale",
struct sout_stream_sys_t
{
- sout_stream_t *p_out;
int i_gop;
int i_qscale;
int i_aspect;
char *psz_files, *psz_sizes;
int i_height = 0, i_width = 0;
- p_sys = malloc( sizeof(sout_stream_sys_t) );
- memset( p_sys, 0, sizeof(sout_stream_sys_t) );
+ p_sys = calloc( 1, sizeof(sout_stream_sys_t) );
+ if( !p_sys )
+ return VLC_ENOMEM;
- p_sys->p_out = sout_StreamNew( p_stream->p_sout, p_stream->psz_next );
- if( !p_sys->p_out )
+ if( !p_stream->p_next )
{
msg_Err( p_stream, "cannot create chain" );
free( p_sys );
}
var_Get( p_stream, SOUT_CFG_PREFIX "port", &val );
- p_sys->i_fd = net_ListenUDP1( p_stream, NULL, val.i_int );
+ p_sys->i_fd = net_ListenUDP1( VLC_OBJECT(p_stream), NULL, val.i_int );
if ( p_sys->i_fd < 0 )
{
free( p_sys );
sout_stream_t *p_stream = (sout_stream_t *)p_this;
sout_stream_sys_t *p_sys = p_stream->p_sys;
- sout_StreamDelete( p_sys->p_out );
-
free( p_sys );
}
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_stream_id_t *id;
- id = malloc( sizeof( sout_stream_id_t ) );
- memset( id, 0, sizeof( sout_stream_id_t ) );
- id->id = NULL;
+ id = calloc( 1, sizeof( sout_stream_id_t ) );
+ if( !id )
+ return NULL;
- if ( p_fmt->i_cat == VIDEO_ES
- && (p_fmt->i_codec == VLC_FOURCC('m', 'p', 'g', 'v')
- || p_fmt->i_codec == VLC_FOURCC('f', 'a', 'k', 'e')) )
+ if( p_fmt->i_cat == VIDEO_ES &&
+ ( p_fmt->i_codec == VLC_CODEC_MPGV ||
+ p_fmt->i_codec == VLC_FOURCC('f', 'a', 'k', 'e') ) )
{
id->b_switcher_video = true;
- p_fmt->i_codec = VLC_FOURCC('m', 'p', 'g', 'v');
- msg_Dbg( p_stream,
- "creating video switcher for fcc=`%4.4s' cmd:%d",
+ p_fmt->i_codec = VLC_CODEC_MPGV;
+ msg_Dbg( p_stream, "creating video switcher for fcc=`%4.4s' cmd:%d",
(char*)&p_fmt->i_codec, p_sys->i_cmd );
}
- else if ( p_fmt->i_cat == AUDIO_ES
- && p_fmt->i_codec == VLC_FOURCC('m', 'p', 'g', 'a')
- && p_sys->b_audio )
+ else if ( p_fmt->i_cat == AUDIO_ES &&
+ p_fmt->i_codec == VLC_CODEC_MPGA &&
+ p_sys->b_audio )
{
int i_ff_codec = CODEC_ID_MP2;
int i;
id->b_switcher_audio = true;
- msg_Dbg( p_stream,
- "creating audio switcher for fcc=`%4.4s' cmd:%d",
+ msg_Dbg( p_stream, "creating audio switcher for fcc=`%4.4s' cmd:%d",
(char*)&p_fmt->i_codec, p_sys->i_cmd );
/* Allocate the encoder right now. */
if( i_ff_codec == 0 )
{
msg_Err( p_stream, "cannot find encoder" );
+ free( id );
return NULL;
}
if( !id->ff_enc )
{
msg_Err( p_stream, "cannot find encoder (avcodec)" );
+ free( id );
return NULL;
}
id->ff_enc_c->channels = p_fmt->audio.i_channels;
id->ff_enc_c->bit_rate = p_fmt->i_bitrate;
+ vlc_avcodec_lock();
if( avcodec_open( id->ff_enc_c, id->ff_enc ) )
{
+ vlc_avcodec_unlock();
msg_Err( p_stream, "cannot open encoder" );
+ av_free( id->ff_enc_c );
+ free( id );
return NULL;
}
+ vlc_avcodec_unlock();
id->p_buffer_out = malloc( AVCODEC_MAX_AUDIO_FRAME_SIZE * 2 );
- id->p_samples = malloc( id->ff_enc_c->frame_size
- * p_fmt->audio.i_channels * sizeof(int16_t) );
- memset( id->p_samples, 0,
- id->ff_enc_c->frame_size * p_fmt->audio.i_channels
- * sizeof(int16_t) );
+ id->p_samples = calloc( id->ff_enc_c->frame_size * p_fmt->audio.i_channels,
+ sizeof(int16_t) );
+ if( !id->p_buffer_out || !id->p_samples )
+ goto error;
- for ( i = 0; i < MAX_AUDIO; i++ )
+ for( i = 0; i < MAX_AUDIO; i++ )
{
- if ( p_sys->pp_audio_ids[i] == NULL )
+ if( p_sys->pp_audio_ids[i] == NULL )
{
p_sys->pp_audio_ids[i] = id;
break;
}
}
- if ( i == MAX_AUDIO )
+ if( i == MAX_AUDIO )
{
msg_Err( p_stream, "too many audio streams!" );
- free( id );
- return NULL;
+ goto error;
}
}
else
memcpy( &id->f_src, p_fmt, sizeof( es_format_t ) );
/* open output stream */
- id->id = p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
-
- if ( id->id == NULL )
- {
- free( id );
- return NULL;
- }
-
- return id;
+ id->id = p_stream->p_next->pf_add( p_stream->p_next, p_fmt );
+
+ if( id->id != NULL )
+ return id;
+
+error:
+ vlc_avcodec_lock();
+ avcodec_close( id->ff_enc_c );
+ vlc_avcodec_unlock();
+ free( id->p_samples );
+ free( id->p_buffer_out );
+ av_free( id->ff_enc_c );
+ free( id );
+ return NULL;
}
/*****************************************************************************
if ( id->ff_enc )
{
+ vlc_avcodec_lock();
avcodec_close( id->ff_enc_c );
+ vlc_avcodec_unlock();
av_free( id->ff_enc_c );
av_free( id->p_frame );
free( id->p_buffer_out );
if ( id->id )
{
- p_sys->p_out->pf_del( p_sys->p_out, id->id );
+ p_stream->p_next->pf_del( p_stream->p_next, id->id );
}
free( id );
if ( !id->b_switcher_video && !id->b_switcher_audio )
{
- return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer );
+ return p_stream->p_next->pf_send( p_stream->p_next, id->id, p_buffer );
}
block_ChainAppend( &id->p_queued, p_buffer );
while ( id->p_queued != NULL )
{
- mtime_t i_dts = 0;
+ mtime_t i_dts;
int i;
if ( p_sys->i_old_cmd != p_sys->i_cmd )
{
/* Full forward */
if ( p_blocks != NULL )
- p_sys->p_out->pf_send( p_sys->p_out, id->id, p_blocks );
+ p_stream->p_next->pf_send( p_stream->p_next, id->id, p_blocks );
return i_dts;
}
}
if ( p_blocks_out != NULL )
- p_sys->p_out->pf_send( p_sys->p_out, id->id, p_blocks_out );
+ p_stream->p_next->pf_send( p_stream->p_next, id->id, p_blocks_out );
return i_dts;
}
picture_t *p_pic )
{
int i, j;
- FILE *p_file = utf8_fopen( psz_file, "r" );
+ FILE *p_file = vlc_fopen( psz_file, "r" );
if ( p_file == NULL )
{
return -1;
}
- vout_InitPicture( VLC_OBJECT(p_stream), p_pic, VLC_FOURCC('I','4','2','0'),
- i_width, i_height,
- i_width * VOUT_ASPECT_FACTOR / i_height );
+ if( picture_Setup( p_pic, VLC_CODEC_I420,
+ i_width, i_height, 1, 1 ) )
+ {
+ msg_Err( p_stream, "unknown chroma" );
+ return -1;
+ }
for ( i = 0; i < p_pic->i_planes; i++ )
{
p_pic->p[i].p_pixels = malloc( p_pic->p[i].i_lines *
if ( id->ff_enc )
{
+ vlc_avcodec_lock();
avcodec_close( id->ff_enc_c );
+ vlc_avcodec_unlock();
av_free( id->ff_enc_c );
av_free( id->p_frame );
free( id->p_buffer_out );
id->ff_enc_c->mb_decision = FF_MB_DECISION_SIMPLE;
id->ff_enc_c->pix_fmt = PIX_FMT_YUV420P;
+ vlc_avcodec_lock();
if( avcodec_open( id->ff_enc_c, id->ff_enc ) )
{
+ vlc_avcodec_unlock();
msg_Err( p_stream, "cannot open encoder" );
return 0;
}
+ vlc_avcodec_unlock();
id->p_buffer_out = malloc( id->ff_enc_c->width * id->ff_enc_c->height * 3 );
id->p_frame = avcodec_alloc_frame();
int i_out;
block_t *p_out;
+ (void)p_stream;
i_out = avcodec_encode_audio( id->ff_enc_c, id->p_buffer_out,
2 * AVCODEC_MAX_AUDIO_FRAME_SIZE,
id->p_samples );
projects / vlc / blobdiff