/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
#include <math.h>
-#include <vlc/vlc.h>
-#include <vlc/sout.h>
-#include <vlc/vout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_sout.h>
+#include <vlc_vout.h>
+
+#include <vlc_block.h>
-#include <charset.h>
-#include <network.h>
+#include <vlc_charset.h>
+#include <vlc_network.h>
#define HAVE_MMX
-#ifdef HAVE_FFMPEG_AVCODEC_H
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+# include <libavcodec/avcodec.h>
+#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
#define SOUT_CFG_PREFIX "sout-switcher-"
#define MAX_PICTURES 10
#define MAX_AUDIO 30
-#define AVCODEC_MAX_VIDEO_FRAME_SIZE (3*1024*1024)
#define MAX_THRESHOLD 99999999
/*****************************************************************************
#define AUDIO_LONGTEXT N_( \
"Mute audio when command is not 0." )
-vlc_module_begin();
- set_description( _("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, VLC_FALSE );
+ FILES_LONGTEXT, false )
add_string( SOUT_CFG_PREFIX "sizes", "", NULL, SIZES_TEXT,
- SIZES_LONGTEXT, VLC_FALSE );
+ SIZES_LONGTEXT, false )
add_string( SOUT_CFG_PREFIX "aspect-ratio", "4:3", NULL, RATIO_TEXT,
- RATIO_LONGTEXT, VLC_FALSE );
+ RATIO_LONGTEXT, false )
add_integer( SOUT_CFG_PREFIX "port", 5001, NULL,
- PORT_TEXT, PORT_LONGTEXT, VLC_TRUE );
+ PORT_TEXT, PORT_LONGTEXT, true )
add_integer( SOUT_CFG_PREFIX "command", 0, NULL,
- COMMAND_TEXT, COMMAND_LONGTEXT, VLC_TRUE );
+ COMMAND_TEXT, COMMAND_LONGTEXT, true )
add_integer( SOUT_CFG_PREFIX "gop", 8, NULL,
- GOP_TEXT, GOP_LONGTEXT, VLC_TRUE );
+ GOP_TEXT, GOP_LONGTEXT, true )
add_integer( SOUT_CFG_PREFIX "qscale", 5, NULL,
- QSCALE_TEXT, QSCALE_LONGTEXT, VLC_TRUE );
+ QSCALE_TEXT, QSCALE_LONGTEXT, true )
add_bool( SOUT_CFG_PREFIX "mute-audio", 1, NULL,
- AUDIO_TEXT, AUDIO_LONGTEXT, VLC_TRUE );
-vlc_module_end();
+ AUDIO_TEXT, AUDIO_LONGTEXT, true )
+vlc_module_end ()
-static const char *ppsz_sout_options[] = {
+static const char *const ppsz_sout_options[] = {
"files", "sizes", "aspect-ratio", "port", "command", "gop", "qscale",
"mute-audio", NULL
};
int i_qscale;
int i_aspect;
sout_stream_id_t *pp_audio_ids[MAX_AUDIO];
- vlc_bool_t b_audio;
+ bool b_audio;
/* Pictures */
picture_t p_pictures[MAX_PICTURES];
struct sout_stream_id_t
{
void *id;
- vlc_bool_t b_switcher_video;
- vlc_bool_t b_switcher_audio;
+ bool b_switcher_video;
+ bool b_switcher_audio;
es_format_t f_src;
block_t *p_queued;
AVCodec *ff_enc;
AVCodecContext *ff_enc_c;
AVFrame *p_frame;
- char *p_buffer_out;
+ uint8_t *p_buffer_out;
int i_nb_pred;
int16_t *p_samples;
};
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 )
return VLC_EGENERIC;
}
- sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
+ config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
p_stream->p_cfg );
var_Get( p_stream, SOUT_CFG_PREFIX "files", &val );
}
var_Get( p_stream, SOUT_CFG_PREFIX "port", &val );
- p_sys->i_fd = net_OpenUDP( p_stream, NULL, val.i_int, NULL, 0 );
+ p_sys->i_fd = net_ListenUDP1( p_stream, NULL, val.i_int );
if ( p_sys->i_fd < 0 )
{
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_FOURCC('m', 'p', 'g', 'v') ||
+ p_fmt->i_codec == VLC_FOURCC('f', 'a', 'k', 'e') ) )
{
- id->b_switcher_video = VLC_TRUE;
+ 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",
+ 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_FOURCC('m', 'p', 'g', 'a') &&
+ p_sys->b_audio )
{
int i_ff_codec = CODEC_ID_MP2;
int i;
- id->b_switcher_audio = VLC_TRUE;
- msg_Dbg( p_stream,
- "creating audio switcher for fcc=`%4.4s' cmd:%d",
+ id->b_switcher_audio = true;
+ 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 = avcodec_alloc_context();
/* Set CPU capabilities */
+ unsigned i_cpu = vlc_CPU();
id->ff_enc_c->dsp_mask = 0;
- if( !(p_stream->p_libvlc->i_cpu & CPU_CAPABILITY_MMX) )
+ if( !(i_cpu & CPU_CAPABILITY_MMX) )
{
id->ff_enc_c->dsp_mask |= FF_MM_MMX;
}
- if( !(p_stream->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) )
+ if( !(i_cpu & CPU_CAPABILITY_MMXEXT) )
{
id->ff_enc_c->dsp_mask |= FF_MM_MMXEXT;
}
- if( !(p_stream->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW) )
+ if( !(i_cpu & CPU_CAPABILITY_3DNOW) )
{
id->ff_enc_c->dsp_mask |= FF_MM_3DNOW;
}
- if( !(p_stream->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) )
+ if( !(i_cpu & CPU_CAPABILITY_SSE) )
{
id->ff_enc_c->dsp_mask |= FF_MM_SSE;
id->ff_enc_c->dsp_mask |= FF_MM_SSE2;
if( avcodec_open( id->ff_enc_c, id->ff_enc ) )
{
msg_Err( p_stream, "cannot open encoder" );
+ av_free( id->ff_enc_c );
+ free( id );
return NULL;
}
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;
+ msg_Err( p_stream, "too many audio streams!" );
+ goto error;
}
}
else
/* 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;
- }
+ if( id->id != NULL )
+ return id;
- return id;
+error:
+ avcodec_close( id->ff_enc_c );
+ free( id->p_samples );
+ free( id->p_buffer_out );
+ av_free( id->ff_enc_c );
+ free( id );
+ return NULL;
}
/*****************************************************************************
static void NetCommand( sout_stream_t *p_stream )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- char psz_buffer[10];
- int i_len = net_ReadNonBlock( p_stream, p_sys->i_fd, NULL, psz_buffer,
- sizeof( psz_buffer ), 0 );
+ char psz_buffer[11];
+ int i_len = recv( p_sys->i_fd, psz_buffer, sizeof( psz_buffer ) - 1, 0 );
if ( i_len > 0 )
{
+ psz_buffer[i_len] = '\0';
int i_cmd = strtol( psz_buffer, NULL, 0 );
if ( i_cmd < -1 || i_cmd > p_sys->i_nb_pictures )
{
id->ff_enc_c = avcodec_alloc_context();
/* Set CPU capabilities */
+ unsigned i_cpu = vlc_CPU();
id->ff_enc_c->dsp_mask = 0;
- if( !(p_stream->p_libvlc->i_cpu & CPU_CAPABILITY_MMX) )
+ if( !(i_cpu & CPU_CAPABILITY_MMX) )
{
id->ff_enc_c->dsp_mask |= FF_MM_MMX;
}
- if( !(p_stream->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) )
+ if( !(i_cpu & CPU_CAPABILITY_MMXEXT) )
{
id->ff_enc_c->dsp_mask |= FF_MM_MMXEXT;
}
- if( !(p_stream->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW) )
+ if( !(i_cpu & CPU_CAPABILITY_3DNOW) )
{
id->ff_enc_c->dsp_mask |= FF_MM_3DNOW;
}
- if( !(p_stream->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) )
+ if( !(i_cpu & CPU_CAPABILITY_SSE) )
{
id->ff_enc_c->dsp_mask |= FF_MM_SSE;
id->ff_enc_c->dsp_mask |= FF_MM_SSE2;
return 0;
}
- id->p_buffer_out = malloc( AVCODEC_MAX_VIDEO_FRAME_SIZE );
+ id->p_buffer_out = malloc( id->ff_enc_c->width * id->ff_enc_c->height * 3 );
id->p_frame = avcodec_alloc_frame();
id->p_frame->linesize[0] = p_sys->p_pictures[p_sys->i_cmd-1].p[0].i_pitch;
id->p_frame->linesize[1] = p_sys->p_pictures[p_sys->i_cmd-1].p[1].i_pitch;
}
i_out = avcodec_encode_video( id->ff_enc_c, id->p_buffer_out,
- AVCODEC_MAX_VIDEO_FRAME_SIZE,
+ id->ff_enc_c->width * id->ff_enc_c->height * 3,
id->p_frame );
if ( i_out <= 0 )
int mb_height = (id->ff_enc_c->height + 15) / 16;
int h_chroma_shift, v_chroma_shift;
int i;
-
+
avcodec_get_chroma_sub_sample( id->ff_enc_c->pix_fmt, &h_chroma_shift,
&v_chroma_shift );
= id->ff_enc_c->coded_frame->motion_subsample_log2;
id->p_frame->mb_type = malloc( ((mb_width + 1) * (mb_height + 1) + 1)
* sizeof(uint32_t) );
- p_stream->p_vlc->pf_memcpy( id->p_frame->mb_type,
- id->ff_enc_c->coded_frame->mb_type,
- (mb_width + 1) * mb_height
- * sizeof(id->p_frame->mb_type[0]));
-
+ vlc_memcpy( id->p_frame->mb_type, id->ff_enc_c->coded_frame->mb_type,
+ (mb_width + 1) * mb_height * sizeof(id->p_frame->mb_type[0]));
+
for ( i = 0; i < 2; i++ )
{
int stride = ((16 * mb_width )
{
id->p_frame->motion_val[i] = malloc( 2 * stride * height
* sizeof(int16_t) );
- p_stream->p_vlc->pf_memcpy( id->p_frame->motion_val[i],
- id->ff_enc_c->coded_frame->motion_val[i],
- 2 * stride * height * sizeof(int16_t) );
+ vlc_memcpy( id->p_frame->motion_val[i],
+ id->ff_enc_c->coded_frame->motion_val[i],
+ 2 * stride * height * sizeof(int16_t) );
}
if ( id->ff_enc_c->coded_frame->ref_index[i] )
{
id->p_frame->ref_index[i] = malloc( b8_stride * 2 * mb_height
* sizeof(int8_t) );
- p_stream->p_vlc->pf_memcpy( id->p_frame->ref_index[i],
- id->ff_enc_c->coded_frame->ref_index[i],
- b8_stride * 2 * mb_height * sizeof(int8_t));
+ vlc_memcpy( id->p_frame->ref_index[i],
+ id->ff_enc_c->coded_frame->ref_index[i],
+ b8_stride * 2 * mb_height * sizeof(int8_t));
}
}
}
#endif
p_out = block_New( p_stream, i_out );
- p_stream->p_vlc->pf_memcpy( p_out->p_buffer, id->p_buffer_out, i_out );
+ vlc_memcpy( p_out->p_buffer, id->p_buffer_out, i_out );
p_out->i_length = p_buffer->i_length;
p_out->i_pts = p_buffer->i_dts;
p_out->i_dts = p_buffer->i_dts;
return NULL;
p_out = block_New( p_stream, i_out );
- p_stream->p_vlc->pf_memcpy( p_out->p_buffer, id->p_buffer_out, i_out );
+ vlc_memcpy( p_out->p_buffer, id->p_buffer_out, i_out );
p_out->i_length = p_buffer->i_length;
p_out->i_pts = p_buffer->i_dts;
p_out->i_dts = p_buffer->i_dts;
return p_out;
}
-
projects / vlc / blobdiff