/*****************************************************************************
* transcode.c: transcoding stream output module
*****************************************************************************
- * Copyright (C) 2003-2004 the VideoLAN team
+ * Copyright (C) 2003-2008 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
+#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_sout.h>
#include <vlc_aout.h>
#define MASTER_SYNC_MAX_DRIFT 100000
-/* FIXME Ugly */
-#include "../../src/input/input_internal.h"
-
/*****************************************************************************
* Module descriptor
*****************************************************************************/
set_subcategory( SUBCAT_SOUT_STREAM );
set_section( N_("Video"), NULL );
add_string( SOUT_CFG_PREFIX "venc", NULL, NULL, VENC_TEXT,
- VENC_LONGTEXT, VLC_FALSE );
+ VENC_LONGTEXT, false );
add_string( SOUT_CFG_PREFIX "vcodec", NULL, NULL, VCODEC_TEXT,
- VCODEC_LONGTEXT, VLC_FALSE );
+ VCODEC_LONGTEXT, false );
add_integer( SOUT_CFG_PREFIX "vb", 800 * 1000, NULL, VB_TEXT,
- VB_LONGTEXT, VLC_FALSE );
+ VB_LONGTEXT, false );
add_float( SOUT_CFG_PREFIX "scale", 1, NULL, SCALE_TEXT,
- SCALE_LONGTEXT, VLC_FALSE );
+ SCALE_LONGTEXT, false );
add_float( SOUT_CFG_PREFIX "fps", 0, NULL, FPS_TEXT,
- FPS_LONGTEXT, VLC_FALSE );
- add_bool( SOUT_CFG_PREFIX "hurry-up", VLC_TRUE, NULL, HURRYUP_TEXT,
- HURRYUP_LONGTEXT, VLC_FALSE );
+ FPS_LONGTEXT, false );
+ add_bool( SOUT_CFG_PREFIX "hurry-up", true, NULL, HURRYUP_TEXT,
+ HURRYUP_LONGTEXT, false );
add_bool( SOUT_CFG_PREFIX "deinterlace", 0, NULL, DEINTERLACE_TEXT,
- DEINTERLACE_LONGTEXT, VLC_FALSE );
+ DEINTERLACE_LONGTEXT, false );
add_string( SOUT_CFG_PREFIX "deinterlace-module", "deinterlace", NULL,
DEINTERLACE_MODULE_TEXT, DEINTERLACE_MODULE_LONGTEXT,
- VLC_FALSE );
+ false );
change_string_list( ppsz_deinterlace_type, 0, 0 );
add_integer( SOUT_CFG_PREFIX "width", 0, NULL, WIDTH_TEXT,
- WIDTH_LONGTEXT, VLC_TRUE );
+ WIDTH_LONGTEXT, true );
add_integer( SOUT_CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT,
- HEIGHT_LONGTEXT, VLC_TRUE );
+ HEIGHT_LONGTEXT, true );
add_integer( SOUT_CFG_PREFIX "maxwidth", 0, NULL, MAXWIDTH_TEXT,
- MAXWIDTH_LONGTEXT, VLC_TRUE );
+ MAXWIDTH_LONGTEXT, true );
add_integer( SOUT_CFG_PREFIX "maxheight", 0, NULL, MAXHEIGHT_TEXT,
- MAXHEIGHT_LONGTEXT, VLC_TRUE );
+ MAXHEIGHT_LONGTEXT, true );
add_module_list( SOUT_CFG_PREFIX "vfilter", "video filter2",
NULL, NULL,
- VFILTER_TEXT, VFILTER_LONGTEXT, VLC_FALSE );
+ VFILTER_TEXT, VFILTER_LONGTEXT, false );
add_integer( SOUT_CFG_PREFIX "croptop", 0, NULL, CROPTOP_TEXT,
- CROPTOP_LONGTEXT, VLC_TRUE );
+ CROPTOP_LONGTEXT, true );
add_integer( SOUT_CFG_PREFIX "cropleft", 0, NULL, CROPLEFT_TEXT,
- CROPLEFT_LONGTEXT, VLC_TRUE );
+ CROPLEFT_LONGTEXT, true );
add_integer( SOUT_CFG_PREFIX "cropbottom", 0, NULL, CROPBOTTOM_TEXT,
- CROPBOTTOM_LONGTEXT, VLC_TRUE );
+ CROPBOTTOM_LONGTEXT, true );
add_integer( SOUT_CFG_PREFIX "cropright", 0, NULL, CROPRIGHT_TEXT,
- CROPRIGHT_LONGTEXT, VLC_TRUE );
+ CROPRIGHT_LONGTEXT, true );
add_integer( SOUT_CFG_PREFIX "paddtop", 0, NULL, PADDTOP_TEXT,
- PADDTOP_LONGTEXT, VLC_TRUE );
+ PADDTOP_LONGTEXT, true );
add_integer( SOUT_CFG_PREFIX "paddleft", 0, NULL, PADDLEFT_TEXT,
- PADDLEFT_LONGTEXT, VLC_TRUE );
+ PADDLEFT_LONGTEXT, true );
add_integer( SOUT_CFG_PREFIX "paddbottom", 0, NULL, PADDBOTTOM_TEXT,
- PADDBOTTOM_LONGTEXT, VLC_TRUE );
+ PADDBOTTOM_LONGTEXT, true );
add_integer( SOUT_CFG_PREFIX "paddright", 0, NULL, PADDRIGHT_TEXT,
- PADDRIGHT_LONGTEXT, VLC_TRUE );
+ PADDRIGHT_LONGTEXT, true );
add_integer( SOUT_CFG_PREFIX "canvas-width", 0, NULL, CANVAS_WIDTH_TEXT,
- CANVAS_WIDTH_LONGTEXT, VLC_TRUE );
+ CANVAS_WIDTH_LONGTEXT, true );
add_integer( SOUT_CFG_PREFIX "canvas-height", 0, NULL, CANVAS_HEIGHT_TEXT,
- CANVAS_HEIGHT_LONGTEXT, VLC_TRUE );
+ CANVAS_HEIGHT_LONGTEXT, true );
add_string( SOUT_CFG_PREFIX "canvas-aspect", NULL, NULL, CANVAS_ASPECT_TEXT,
- CANVAS_ASPECT_LONGTEXT, VLC_FALSE );
+ CANVAS_ASPECT_LONGTEXT, false );
set_section( N_("Audio"), NULL );
add_string( SOUT_CFG_PREFIX "aenc", NULL, NULL, AENC_TEXT,
- AENC_LONGTEXT, VLC_FALSE );
+ AENC_LONGTEXT, false );
add_string( SOUT_CFG_PREFIX "acodec", NULL, NULL, ACODEC_TEXT,
- ACODEC_LONGTEXT, VLC_FALSE );
- add_integer( SOUT_CFG_PREFIX "ab", 64000, NULL, AB_TEXT,
- AB_LONGTEXT, VLC_FALSE );
+ ACODEC_LONGTEXT, false );
+ add_integer( SOUT_CFG_PREFIX "ab", 0, NULL, AB_TEXT,
+ AB_LONGTEXT, false );
add_integer( SOUT_CFG_PREFIX "channels", 0, NULL, ACHANS_TEXT,
- ACHANS_LONGTEXT, VLC_FALSE );
+ ACHANS_LONGTEXT, false );
add_integer( SOUT_CFG_PREFIX "samplerate", 0, NULL, ARATE_TEXT,
- ARATE_LONGTEXT, VLC_TRUE );
+ ARATE_LONGTEXT, true );
add_bool( SOUT_CFG_PREFIX "audio-sync", 0, NULL, ASYNC_TEXT,
- ASYNC_LONGTEXT, VLC_FALSE );
- add_module_list_cat( SOUT_CFG_PREFIX "afilter", SUBCAT_AUDIO_MISC,
+ ASYNC_LONGTEXT, false );
+ add_module_list( SOUT_CFG_PREFIX "afilter", "audio filter2",
NULL, NULL,
- AFILTER_TEXT, AFILTER_LONGTEXT, VLC_FALSE );
+ AFILTER_TEXT, AFILTER_LONGTEXT, false );
set_section( N_("Overlays/Subtitles"), NULL );
add_string( SOUT_CFG_PREFIX "senc", NULL, NULL, SENC_TEXT,
- SENC_LONGTEXT, VLC_FALSE );
+ SENC_LONGTEXT, false );
add_string( SOUT_CFG_PREFIX "scodec", NULL, NULL, SCODEC_TEXT,
- SCODEC_LONGTEXT, VLC_FALSE );
+ SCODEC_LONGTEXT, false );
add_bool( SOUT_CFG_PREFIX "soverlay", 0, NULL, SCODEC_TEXT,
- SCODEC_LONGTEXT, VLC_FALSE );
- add_module_list_cat( SOUT_CFG_PREFIX "sfilter", SUBCAT_VIDEO_SUBPIC,
+ SCODEC_LONGTEXT, false );
+ add_module_list( SOUT_CFG_PREFIX "sfilter", "video filter",
NULL, NULL,
- SFILTER_TEXT, SFILTER_LONGTEXT, VLC_FALSE );
+ SFILTER_TEXT, SFILTER_LONGTEXT, false );
set_section( N_("On Screen Display"), NULL );
add_bool( SOUT_CFG_PREFIX "osd", 0, NULL, OSD_TEXT,
- OSD_LONGTEXT, VLC_FALSE );
+ OSD_LONGTEXT, false );
set_section( N_("Miscellaneous"), NULL );
add_integer( SOUT_CFG_PREFIX "threads", 0, NULL, THREADS_TEXT,
- THREADS_LONGTEXT, VLC_TRUE );
+ THREADS_LONGTEXT, true );
add_bool( SOUT_CFG_PREFIX "high-priority", 0, NULL, HP_TEXT, HP_LONGTEXT,
- VLC_TRUE );
+ true );
vlc_module_end();
static int Send( sout_stream_t *, sout_stream_id_t *, block_t* );
static int transcode_audio_new ( sout_stream_t *, sout_stream_id_t * );
-static void transcode_audio_close ( sout_stream_t *, sout_stream_id_t * );
+static void transcode_audio_close ( sout_stream_id_t * );
static int transcode_audio_process( sout_stream_t *, sout_stream_id_t *,
block_t *, block_t ** );
static void video_del_buffer_filter( filter_t *, picture_t * );
static int transcode_spu_new ( sout_stream_t *, sout_stream_id_t * );
-static void transcode_spu_close ( sout_stream_t *, sout_stream_id_t * );
+static void transcode_spu_close ( sout_stream_id_t * );
static int transcode_spu_process( sout_stream_t *, sout_stream_id_t *,
block_t *, block_t ** );
vlc_fourcc_t i_acodec; /* codec audio (0 if not transcode) */
char *psz_aenc;
config_chain_t *p_audio_cfg;
- int i_sample_rate;
- int i_channels;
+ uint32_t i_sample_rate;
+ uint32_t i_channels;
int i_abitrate;
char *psz_afilters[TRANSCODE_FILTERS];
config_chain_t *p_afilters_cfg[TRANSCODE_FILTERS];
double f_fps;
unsigned int i_width, i_maxwidth;
unsigned int i_height, i_maxheight;
- vlc_bool_t b_deinterlace;
+ bool b_deinterlace;
char *psz_deinterlace;
config_chain_t *p_deinterlace_cfg;
int i_threads;
- vlc_bool_t b_high_priority;
- vlc_bool_t b_hurry_up;
+ bool b_high_priority;
+ bool b_hurry_up;
char *psz_vfilters[TRANSCODE_FILTERS];
config_chain_t *p_vfilters_cfg[TRANSCODE_FILTERS];
int i_vfilters;
/* SPU */
vlc_fourcc_t i_scodec; /* codec spu (0 if not transcode) */
char *psz_senc;
- vlc_bool_t b_soverlay;
+ bool b_soverlay;
config_chain_t *p_spu_cfg;
spu_t *p_spu;
/* OSD Menu */
- sout_stream_id_t *id_osd; /* extension for streaming OSD menus */
vlc_fourcc_t i_osdcodec; /* codec osd menu (0 if not transcode) */
char *psz_osdenc;
config_chain_t *p_osd_cfg;
- vlc_bool_t b_es_osd; /* VLC_TRUE when osd es is registered */
- vlc_bool_t b_sout_osd;
+ bool b_osd; /* true when osd es is registered */
/* Sync */
- vlc_bool_t b_master_sync;
+ bool b_master_sync;
mtime_t i_master_drift;
};
if( !p_sys->p_out )
{
msg_Err( p_stream, "cannot create chain" );
- vlc_object_destroy( p_sys );
+ vlc_object_release( p_sys );
return VLC_EGENERIC;
}
char *psz_next;
psz_next = config_ChainCreate( &p_sys->psz_aenc, &p_sys->p_audio_cfg,
val.psz_string );
- if( psz_next ) free( psz_next );
+ free( psz_next );
}
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
var_Get( p_stream, SOUT_CFG_PREFIX "acodec", &val );
p_sys->i_acodec = 0;
memcpy( fcc, val.psz_string, __MIN( strlen( val.psz_string ), 4 ) );
p_sys->i_acodec = VLC_FOURCC( fcc[0], fcc[1], fcc[2], fcc[3] );
}
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
var_Get( p_stream, SOUT_CFG_PREFIX "ab", &val );
p_sys->i_abitrate = val.i_int;
if( (psz_parser != NULL) && (*psz_parser != '\0') ) psz_parser++;
}
}
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
if( p_sys->i_afilters < TRANSCODE_FILTERS-1 )
{
p_sys->psz_afilters[p_sys->i_afilters] = NULL;
char *psz_next;
psz_next = config_ChainCreate( &p_sys->psz_venc, &p_sys->p_video_cfg,
val.psz_string );
- if( psz_next ) free( psz_next );
+ free( psz_next );
}
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
var_Get( p_stream, SOUT_CFG_PREFIX "vcodec", &val );
p_sys->i_vcodec = 0;
memcpy( fcc, val.psz_string, __MIN( strlen( val.psz_string ), 4 ) );
p_sys->i_vcodec = VLC_FOURCC( fcc[0], fcc[1], fcc[2], fcc[3] );
}
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
var_Get( p_stream, SOUT_CFG_PREFIX "vb", &val );
p_sys->i_vbitrate = val.i_int;
if( psz_parser != NULL && *psz_parser != '\0' ) psz_parser++;
}
}
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
if( p_sys->i_vfilters < TRANSCODE_FILTERS-1 )
{
p_sys->psz_vfilters[p_sys->i_vfilters] = NULL;
psz_next = config_ChainCreate( &p_sys->psz_deinterlace,
&p_sys->p_deinterlace_cfg,
val.psz_string );
- if( psz_next ) free( psz_next );
+ free( psz_next );
}
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
var_Get( p_stream, SOUT_CFG_PREFIX "croptop", &val );
p_sys->i_crop_top = val.i_int;
else msg_Warn( p_stream, "bad aspect ratio %s", val.psz_string );
}
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
var_Get( p_stream, SOUT_CFG_PREFIX "threads", &val );
p_sys->i_threads = val.i_int;
char *psz_next;
psz_next = config_ChainCreate( &p_sys->psz_senc, &p_sys->p_spu_cfg,
val.psz_string );
- if( psz_next ) free( psz_next );
+ free( psz_next );
}
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
var_Get( p_stream, SOUT_CFG_PREFIX "scodec", &val );
if( val.psz_string && *val.psz_string )
memcpy( fcc, val.psz_string, __MIN( strlen( val.psz_string ), 4 ) );
p_sys->i_scodec = VLC_FOURCC( fcc[0], fcc[1], fcc[2], fcc[3] );
}
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
if( p_sys->i_scodec )
{
var_Set( p_sys->p_spu, "sub-filter", val );
spu_Init( p_sys->p_spu );
}
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
/* OSD menu transcoding parameters */
p_sys->psz_osdenc = NULL;
p_sys->p_osd_cfg = NULL;
p_sys->i_osdcodec = 0;
- p_sys->b_es_osd = VLC_FALSE;
+ p_sys->b_osd = false;
var_Get( p_stream, SOUT_CFG_PREFIX "osd", &val );
- p_sys->b_sout_osd = val.b_bool;
- if( p_sys->b_sout_osd )
+ if( val.b_bool )
{
vlc_value_t osd_val;
char *psz_next;
psz_next = config_ChainCreate( &p_sys->psz_osdenc,
&p_sys->p_osd_cfg, strdup( "dvbsub") );
- if( psz_next ) free( psz_next );
+ free( psz_next );
p_sys->i_osdcodec = VLC_FOURCC('Y','U','V','P' );
var_Create( p_sys->p_spu, "sub-filter", VLC_VAR_STRING );
var_Set( p_sys->p_spu, "sub-filter", osd_val );
spu_Init( p_sys->p_spu );
- if( osd_val.psz_string ) free( osd_val.psz_string );
+ free( osd_val.psz_string );
}
else
{
osd_val.psz_string = strdup("osdmenu");
var_Set( p_sys->p_spu, "sub-filter", osd_val );
- if( osd_val.psz_string ) free( osd_val.psz_string );
+ free( osd_val.psz_string );
}
}
/* Audio settings */
var_Get( p_stream, SOUT_CFG_PREFIX "audio-sync", &val );
p_sys->b_master_sync = val.b_bool;
- if( p_sys->f_fps > 0 ) p_sys->b_master_sync = VLC_TRUE;
+ if( p_sys->f_fps > 0 ) p_sys->b_master_sync = true;
p_stream->pf_add = Add;
p_stream->pf_del = Del;
while( p_sys->i_afilters )
{
p_sys->i_afilters--;
- if( p_sys->psz_afilters[p_sys->i_afilters] )
- free( p_sys->psz_afilters[p_sys->i_afilters] );
- if( p_sys->p_afilters_cfg[p_sys->i_afilters] )
- free( p_sys->p_afilters_cfg[p_sys->i_afilters] );
+ free( p_sys->psz_afilters[p_sys->i_afilters] );
+ free( p_sys->p_afilters_cfg[p_sys->i_afilters] );
}
while( p_sys->p_audio_cfg != NULL )
{
config_chain_t *p_next = p_sys->p_audio_cfg->p_next;
- if( p_sys->p_audio_cfg->psz_name )
- free( p_sys->p_audio_cfg->psz_name );
- if( p_sys->p_audio_cfg->psz_value )
- free( p_sys->p_audio_cfg->psz_value );
+ free( p_sys->p_audio_cfg->psz_name );
+ free( p_sys->p_audio_cfg->psz_value );
free( p_sys->p_audio_cfg );
p_sys->p_audio_cfg = p_next;
}
- if( p_sys->psz_aenc ) free( p_sys->psz_aenc );
+ free( p_sys->psz_aenc );
while( p_sys->i_vfilters )
{
p_sys->i_vfilters--;
- if( p_sys->psz_vfilters[p_sys->i_vfilters] )
- free( p_sys->psz_vfilters[p_sys->i_vfilters] );
- if( p_sys->p_vfilters_cfg[p_sys->i_vfilters] )
- free( p_sys->p_vfilters_cfg[p_sys->i_vfilters] );
+ free( p_sys->psz_vfilters[p_sys->i_vfilters] );
+ free( p_sys->p_vfilters_cfg[p_sys->i_vfilters] );
}
while( p_sys->p_video_cfg != NULL )
{
config_chain_t *p_next = p_sys->p_video_cfg->p_next;
- if( p_sys->p_video_cfg->psz_name )
- free( p_sys->p_video_cfg->psz_name );
- if( p_sys->p_video_cfg->psz_value )
- free( p_sys->p_video_cfg->psz_value );
+ free( p_sys->p_video_cfg->psz_name );
+ free( p_sys->p_video_cfg->psz_value );
free( p_sys->p_video_cfg );
p_sys->p_video_cfg = p_next;
}
- if( p_sys->psz_venc ) free( p_sys->psz_venc );
+ free( p_sys->psz_venc );
while( p_sys->p_deinterlace_cfg != NULL )
{
config_chain_t *p_next = p_sys->p_deinterlace_cfg->p_next;
- if( p_sys->p_deinterlace_cfg->psz_name )
- free( p_sys->p_deinterlace_cfg->psz_name );
- if( p_sys->p_deinterlace_cfg->psz_value )
- free( p_sys->p_deinterlace_cfg->psz_value );
+ free( p_sys->p_deinterlace_cfg->psz_name );
+ free( p_sys->p_deinterlace_cfg->psz_value );
free( p_sys->p_deinterlace_cfg );
p_sys->p_deinterlace_cfg = p_next;
}
- if( p_sys->psz_deinterlace ) free( p_sys->psz_deinterlace );
+ free( p_sys->psz_deinterlace );
while( p_sys->p_spu_cfg != NULL )
{
config_chain_t *p_next = p_sys->p_spu_cfg->p_next;
- if( p_sys->p_spu_cfg->psz_name )
- free( p_sys->p_spu_cfg->psz_name );
- if( p_sys->p_spu_cfg->psz_value )
- free( p_sys->p_spu_cfg->psz_value );
+ free( p_sys->p_spu_cfg->psz_name );
+ free( p_sys->p_spu_cfg->psz_value );
free( p_sys->p_spu_cfg );
p_sys->p_spu_cfg = p_next;
}
- if( p_sys->psz_senc ) free( p_sys->psz_senc );
+ free( p_sys->psz_senc );
if( p_sys->p_spu ) spu_Destroy( p_sys->p_spu );
{
config_chain_t *p_next = p_sys->p_osd_cfg->p_next;
- if( p_sys->p_osd_cfg->psz_name )
- free( p_sys->p_osd_cfg->psz_name );
- if( p_sys->p_osd_cfg->psz_value )
- free( p_sys->p_osd_cfg->psz_value );
+ free( p_sys->p_osd_cfg->psz_name );
+ free( p_sys->p_osd_cfg->psz_value );
free( p_sys->p_osd_cfg );
p_sys->p_osd_cfg = p_next;
}
- if( p_sys->psz_osdenc ) free( p_sys->psz_osdenc );
+ free( p_sys->psz_osdenc );
- vlc_object_destroy( p_sys );
+ vlc_object_release( p_sys );
}
struct sout_stream_id_t
sout_stream_id_t *id;
id = malloc( sizeof( sout_stream_id_t ) );
+ if( !id )
+ {
+ msg_Err( p_stream, "out of memory" );
+ goto error;
+ }
memset( id, 0, sizeof(sout_stream_id_t) );
id->id = NULL;
vlc_object_attach( id->p_decoder, p_stream );
id->p_decoder->p_module = NULL;
id->p_decoder->fmt_in = *p_fmt;
- id->p_decoder->b_pace_control = VLC_TRUE;
+ id->p_decoder->b_pace_control = true;
/* Create encoder object */
id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
/* Complete destination format */
id->p_encoder->fmt_out.i_codec = p_sys->i_acodec;
id->p_encoder->fmt_out.audio.i_rate = p_sys->i_sample_rate > 0 ?
- p_sys->i_sample_rate : (int)p_fmt->audio.i_rate;
+ p_sys->i_sample_rate : p_fmt->audio.i_rate;
id->p_encoder->fmt_out.i_bitrate = p_sys->i_abitrate;
id->p_encoder->fmt_out.audio.i_bitspersample =
p_fmt->audio.i_bitspersample;
/* Open output stream */
id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_encoder->fmt_out );
- id->b_transcode = VLC_TRUE;
+ id->b_transcode = true;
if( !id->id )
{
- transcode_audio_close( p_stream, id );
+ transcode_audio_close( id );
goto error;
}
/* Stream will be added later on because we don't know
* all the characteristics of the decoded stream yet */
- id->b_transcode = VLC_TRUE;
+ id->b_transcode = true;
if( p_sys->f_fps > 0 )
{
id->p_encoder->fmt_out.video.i_frame_rate_base = 1001;
}
}
- else if( p_fmt->i_cat == SPU_ES && (p_sys->i_scodec || p_sys->psz_senc) )
+ else if( ( p_fmt->i_cat == SPU_ES ) &&
+ ( p_sys->i_scodec || p_sys->psz_senc ) )
{
msg_Dbg( p_stream, "creating subtitles transcoding from fcc=`%4.4s' "
"to fcc=`%4.4s'", (char*)&p_fmt->i_codec,
/* open output stream */
id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_encoder->fmt_out );
- id->b_transcode = VLC_TRUE;
+ id->b_transcode = true;
if( !id->id )
{
- transcode_spu_close( p_stream, id );
+ transcode_spu_close( id );
goto error;
}
}
msg_Dbg( p_stream, "subtitles (fcc=`%4.4s') overlaying",
(char*)&p_fmt->i_codec );
- id->b_transcode = VLC_TRUE;
+ id->b_transcode = true;
/* Build decoder -> filter -> overlaying chain */
if( transcode_spu_new( p_stream, id ) )
goto error;
}
}
+ else if( !p_sys->b_osd && (p_sys->i_osdcodec != 0 || p_sys->psz_osdenc) )
+ {
+ msg_Dbg( p_stream, "creating osd transcoding from fcc=`%4.4s' "
+ "to fcc=`%4.4s'", (char*)&p_fmt->i_codec,
+ (char*)&p_sys->i_scodec );
+
+ id->b_transcode = true;
+
+ /* Create a fake OSD menu elementary stream */
+ if( transcode_osd_new( p_stream, id ) )
+ {
+ msg_Err( p_stream, "cannot create osd chain" );
+ goto error;
+ }
+ p_sys->b_osd = true;
+ }
else
{
msg_Dbg( p_stream, "not transcoding a stream (fcc=`%4.4s')",
(char*)&p_fmt->i_codec );
id->id = p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
- id->b_transcode = VLC_FALSE;
+ id->b_transcode = false;
if( !id->id ) goto error;
}
- if( p_sys->b_sout_osd )
- {
- /* Create a fake OSD menu elementary stream */
- if( !p_sys->b_es_osd && (p_sys->i_osdcodec != 0 || p_sys->psz_osdenc) )
- {
- if( transcode_osd_new( p_stream, p_sys->id_osd ) )
- {
- msg_Err( p_stream, "cannot create osd chain" );
- goto error;
- }
- p_sys->b_es_osd = VLC_TRUE;
- }
- }
return id;
error:
if( id->p_decoder )
{
vlc_object_detach( id->p_decoder );
- vlc_object_destroy( id->p_decoder );
+ vlc_object_release( id->p_decoder );
id->p_decoder = NULL;
}
{
vlc_object_detach( id->p_encoder );
es_format_Clean( &id->p_encoder->fmt_out );
- vlc_object_destroy( id->p_encoder );
+ vlc_object_release( id->p_encoder );
id->p_encoder = NULL;
}
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- if( p_sys->b_es_osd )
- transcode_osd_close( p_stream, p_sys->id_osd );
-
if( id->b_transcode )
{
switch( id->p_decoder->fmt_in.i_cat )
{
case AUDIO_ES:
- transcode_audio_close( p_stream, id );
+ transcode_audio_close( id );
break;
case VIDEO_ES:
transcode_video_close( p_stream, id );
break;
case SPU_ES:
- transcode_spu_close( p_stream, id );
+ if( p_sys->b_osd )
+ transcode_osd_close( p_stream, id );
+ else
+ transcode_spu_close( id );
break;
}
}
if( id->p_decoder )
{
vlc_object_detach( id->p_decoder );
- vlc_object_destroy( id->p_decoder );
+ vlc_object_release( id->p_decoder );
id->p_decoder = NULL;
}
{
vlc_object_detach( id->p_encoder );
es_format_Clean( &id->p_encoder->fmt_out );
- vlc_object_destroy( id->p_encoder );
+ vlc_object_release( id->p_encoder );
id->p_encoder = NULL;
}
free( id );
if( !id->b_transcode && id->id )
{
- /* Transcode OSD menu pictures. */
- if( p_sys->b_es_osd )
- {
- transcode_osd_process( p_stream, id, p_buffer, &p_out );
- }
return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer );
}
else if( !id->b_transcode )
break;
case SPU_ES:
- if( transcode_spu_process( p_stream, id, p_buffer, &p_out ) !=
+ /* Transcode OSD menu pictures. */
+ if( p_sys->b_osd )
+ {
+ if( transcode_osd_process( p_stream, id, p_buffer, &p_out ) !=
+ VLC_SUCCESS )
+ {
+ return VLC_EGENERIC;
+ }
+ }
+ else if ( transcode_spu_process( p_stream, id, p_buffer, &p_out ) !=
VLC_SUCCESS )
{
return VLC_EGENERIC;
/****************************************************************************
* decoder reencoder part
****************************************************************************/
-int audio_BitsPerSample( vlc_fourcc_t i_format )
+static int audio_BitsPerSample( vlc_fourcc_t i_format )
{
switch( i_format )
{
return 0;
}
+static block_t *transcode_audio_alloc (filter_t *filter, int size)
+{
+ return block_New (filter, size);
+}
+
static filter_t *transcode_audio_filter_new( sout_stream_t *p_stream,
sout_stream_id_t *id,
es_format_t *p_fmt_in,
filter_t *p_filter = vlc_object_create( p_stream, VLC_OBJECT_FILTER );
vlc_object_attach( p_filter, p_stream );
- p_filter->pf_audio_buffer_new = (block_t* (*) (filter_t*, int))__block_New;
+ p_filter->pf_audio_buffer_new = transcode_audio_alloc;
p_filter->fmt_in = *p_fmt_in;
p_filter->fmt_out = *p_fmt_out;
p_filter->p_cfg = p_sys->p_afilters_cfg[id->i_ufilter];
p_filter->p_module = module_Need( p_filter, "audio filter2", psz_name,
- VLC_TRUE );
+ true );
if( p_filter->p_module )
{
p_filter->fmt_out.audio.i_bitspersample =
else
{
vlc_object_detach( p_filter );
- vlc_object_destroy( p_filter );
+ vlc_object_release( p_filter );
p_filter = 0;
}
id->p_decoder->fmt_out = id->p_decoder->fmt_in;
id->p_decoder->fmt_out.i_extra = 0;
id->p_decoder->fmt_out.p_extra = 0;
- id->p_decoder->pf_decode_audio = 0;
+ id->p_decoder->pf_decode_audio = NULL;
id->p_decoder->pf_aout_buffer_new = audio_new_buffer;
id->p_decoder->pf_aout_buffer_del = audio_del_buffer;
/* id->p_decoder->p_cfg = p_sys->p_audio_cfg; */
msg_Err( p_stream, "cannot find decoder" );
return VLC_EGENERIC;
}
- id->p_decoder->fmt_out.audio.i_bitspersample =
+ id->p_decoder->fmt_out.audio.i_bitspersample =
audio_BitsPerSample( id->p_decoder->fmt_out.i_codec );
fmt_last = id->p_decoder->fmt_out;
/* Fix AAC SBR changing number of channels and sampling rate */
id->p_decoder->fmt_out.i_codec );
id->p_encoder->fmt_in.audio.i_format = id->p_decoder->fmt_out.i_codec;
- /* Initialization of encoder format structures */
- es_format_Init( &id->p_encoder->fmt_in, AUDIO_ES, VLC_FOURCC('f','l','3','2') );
- id->p_encoder->fmt_in.audio.i_format = VLC_FOURCC('f','l','3','2');
-
- id->p_encoder->fmt_in.audio.i_rate = id->p_encoder->fmt_out.audio.i_rate;
+ if( ( id->p_encoder->fmt_out.i_codec == VLC_FOURCC('s','a','m','r') ) ||
+ ( id->p_encoder->fmt_out.i_codec == VLC_FOURCC('s','a','w','b') ) )
+ id->p_encoder->fmt_in.audio.i_rate = id->p_encoder->fmt_out.audio.i_rate;
+ else
+ id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;
id->p_encoder->fmt_in.audio.i_physical_channels =
id->p_encoder->fmt_out.audio.i_physical_channels;
id->p_encoder->fmt_in.audio.i_original_channels =
id->p_encoder->p_cfg = p_stream->p_sys->p_audio_cfg;
id->p_encoder->p_module =
- module_Need( id->p_encoder, "encoder", p_sys->psz_aenc, VLC_TRUE );
+ module_Need( id->p_encoder, "encoder", p_sys->psz_aenc, true );
if( !id->p_encoder->p_module )
{
msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_aenc );
id->p_encoder->fmt_in.audio.i_bitspersample =
audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
- /* Fix AAC SBR changing number of channels and sampling rate */
- if( id->p_decoder->fmt_in.i_codec == VLC_FOURCC('m','p','4','a') &&
- fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate &&
- fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels )
- {
- id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;
- id->p_encoder->fmt_out.audio.i_rate = fmt_last.audio.i_rate;
- }
-
/* Load conversion filters */
if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ||
fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate )
msg_Err( p_stream, "no audio filter found (%4.4s->%4.4s)",
(char *)&fmt_last.i_codec,
(char *)&id->p_encoder->fmt_in.i_codec );
- transcode_audio_close( p_stream, id );
+ transcode_audio_close( id );
return VLC_EGENERIC;
}
/* reload encoder */
id->p_encoder->p_cfg = p_stream->p_sys->p_audio_cfg;
id->p_encoder->p_module =
- module_Need( id->p_encoder, "encoder", p_sys->psz_aenc, VLC_TRUE );
+ module_Need( id->p_encoder, "encoder", p_sys->psz_aenc, true );
if( !id->p_encoder->p_module )
{
msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_aenc );
- transcode_audio_close( p_stream, id );
+ transcode_audio_close( id );
return VLC_EGENERIC;
}
id->p_encoder->fmt_in.audio.i_format = id->p_encoder->fmt_in.i_codec;
" %i to %i channels", fmt_last.audio.i_channels,
id->p_encoder->fmt_in.audio.i_channels );
- transcode_audio_close( p_stream, id );
+ transcode_audio_close( id );
return VLC_EGENERIC;
#endif
}
id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;
id->p_encoder->fmt_out.audio.i_rate = fmt_last.audio.i_rate;
#else
- transcode_audio_close( p_stream, id );
+ transcode_audio_close( id );
return VLC_EGENERIC;
#endif
}
return VLC_SUCCESS;
}
-static void transcode_audio_close( sout_stream_t *p_stream,
- sout_stream_id_t *id )
+static void transcode_audio_close( sout_stream_id_t *id )
{
int i;
vlc_object_detach( id->pp_filter[i] );
if( id->pp_filter[i]->p_module )
module_Unneed( id->pp_filter[i], id->pp_filter[i]->p_module );
- vlc_object_destroy( id->pp_filter[i] );
+ vlc_object_release( id->pp_filter[i] );
}
+ id->i_filter = 0;
+
for( i = 0; i < id->i_ufilter; i++ )
{
vlc_object_detach( id->pp_ufilter[i] );
if( id->pp_ufilter[i]->p_module )
module_Unneed( id->pp_ufilter[i], id->pp_ufilter[i]->p_module );
- vlc_object_destroy( id->pp_ufilter[i] );
+ vlc_object_release( id->pp_ufilter[i] );
}
+ id->i_ufilter = 0;
}
static int transcode_audio_process( sout_stream_t *p_stream,
block_t *p_block, *p_audio_block;
int i;
*out = NULL;
- input_thread_t *p_input = NULL;
-
- if( p_stream->p_parent->p_parent && p_stream->p_parent->p_parent->
- i_object_type == VLC_OBJECT_INPUT )
- p_input = (input_thread_t *)p_stream->p_parent->p_parent;
while( (p_audio_buf = id->p_decoder->pf_decode_audio( id->p_decoder,
&in )) )
{
- if( p_input )
- stats_UpdateInteger( p_input, p_input->p->counters.p_decoded_audio,
- 1, NULL );
+ sout_UpdateStatistic( p_stream->p_sout, SOUT_STATISTIC_DECODED_AUDIO, 1 );
if( p_sys->b_master_sync )
{
mtime_t i_dts = date_Get( &id->interpolated_pts ) + 1;
static void audio_release_buffer( aout_buffer_t *p_buffer )
{
if( p_buffer && p_buffer->p_sys ) block_Release( p_buffer->p_sys );
- if( p_buffer ) free( p_buffer );
+ free( p_buffer );
}
static aout_buffer_t *audio_new_buffer( decoder_t *p_dec, int i_samples )
}
p_buffer = malloc( sizeof(aout_buffer_t) );
- p_buffer->b_discontinuity = VLC_FALSE;
+ if( !p_buffer ) return NULL;
+ p_buffer->b_discontinuity = false;
p_buffer->pf_release = audio_release_buffer;
p_buffer->p_sys = p_block = block_New( p_dec, i_size );
static void audio_del_buffer( decoder_t *p_dec, aout_buffer_t *p_buffer )
{
+ VLC_UNUSED(p_dec);
if( p_buffer && p_buffer->p_sys ) block_Release( p_buffer->p_sys );
- if( p_buffer ) free( p_buffer );
+ free( p_buffer );
}
/*
* video
*/
+
+static filter_t *transcode_video_filter_new( sout_stream_t *p_stream,
+ es_format_t *p_fmt_in,
+ es_format_t *p_fmt_out,
+ config_chain_t *p_cfg,
+ const char *psz_name )
+{
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+ filter_t *p_filter;
+ int i;
+
+ if( !p_stream || !p_fmt_in || !p_fmt_out ) return NULL;
+
+ p_filter = vlc_object_create( p_stream, VLC_OBJECT_FILTER );
+ vlc_object_attach( p_filter, p_stream );
+
+ p_filter->pf_vout_buffer_new = video_new_buffer_filter;
+ p_filter->pf_vout_buffer_del = video_del_buffer_filter;
+
+ es_format_Copy( &p_filter->fmt_in, p_fmt_in );
+ es_format_Copy( &p_filter->fmt_out, p_fmt_out );
+ p_filter->p_cfg = p_cfg;
+
+ p_filter->p_module = module_Need( p_filter, "video filter2",
+ psz_name, true );
+ if( !p_filter->p_module )
+ {
+ msg_Dbg( p_stream, "no video filter found" );
+ vlc_object_detach( p_filter );
+ vlc_object_release( p_filter );
+ return NULL;
+ }
+
+ p_filter->p_owner = malloc( sizeof(filter_owner_sys_t) );
+ if( !p_filter->p_owner )
+ {
+ module_Unneed( p_filter,p_filter->p_module );
+ vlc_object_detach( p_filter );
+ vlc_object_release( p_filter );
+ return NULL;
+ }
+
+ for( i = 0; i < PICTURE_RING_SIZE; i++ )
+ p_filter->p_owner->pp_pics[i] = 0;
+ p_filter->p_owner->p_sys = p_sys;
+
+ return p_filter;
+}
+
+static void transcode_video_filter_close( sout_stream_t *p_stream,
+ filter_t *p_filter )
+{
+ int j;
+
+ if( !p_stream || !p_filter ) return;
+
+ vlc_object_detach( p_filter );
+ if( p_filter->p_module )
+ module_Unneed( p_filter, p_filter->p_module );
+
+ /* Clean-up pictures ring buffer */
+ for( j = 0; j < PICTURE_RING_SIZE; j++ )
+ {
+ if( p_filter->p_owner->pp_pics[j] )
+ video_del_buffer( VLC_OBJECT(p_filter),
+ p_filter->p_owner->pp_pics[j] );
+ }
+ free( p_filter->p_owner );
+ vlc_object_release( p_filter );
+ p_filter = NULL;
+}
+
static int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
id->p_decoder->fmt_out = id->p_decoder->fmt_in;
id->p_decoder->fmt_out.i_extra = 0;
id->p_decoder->fmt_out.p_extra = 0;
- id->p_decoder->pf_decode_video = 0;
+ id->p_decoder->pf_decode_video = NULL;
+ id->p_decoder->pf_get_cc = NULL;
+ id->p_decoder->pf_get_cc = 0;
id->p_decoder->pf_vout_buffer_new = video_new_buffer_decoder;
id->p_decoder->pf_vout_buffer_del = video_del_buffer_decoder;
id->p_decoder->pf_picture_link = video_link_picture_decoder;
id->p_encoder->p_cfg = p_sys->p_video_cfg;
id->p_encoder->p_module =
- module_Need( id->p_encoder, "encoder", p_sys->psz_venc, VLC_TRUE );
+ module_Need( id->p_encoder, "encoder", p_sys->psz_venc, true );
if( !id->p_encoder->p_module )
{
msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_venc );
int i_priority = p_sys->b_high_priority ? VLC_THREAD_PRIORITY_OUTPUT :
VLC_THREAD_PRIORITY_VIDEO;
p_sys->id_video = id;
- vlc_mutex_init( p_stream, &p_sys->lock_out );
+ vlc_mutex_init( &p_sys->lock_out );
vlc_cond_init( p_stream, &p_sys->cond );
memset( p_sys->pp_pics, 0, sizeof(p_sys->pp_pics) );
p_sys->i_first_pic = 0;
p_sys->p_buffers = NULL;
p_sys->b_die = p_sys->b_error = 0;
if( vlc_thread_create( p_sys, "encoder", EncoderThread, i_priority,
- VLC_FALSE ) )
+ false ) )
{
msg_Err( p_stream, "cannot spawn encoder thread" );
module_Unneed( id->p_decoder, id->p_decoder->p_module );
msg_Dbg( p_stream, "encoder aspect is %i:%i", id->p_encoder->fmt_out.video.i_aspect, VOUT_ASPECT_FACTOR );
id->p_encoder->p_module =
- module_Need( id->p_encoder, "encoder", p_sys->psz_venc, VLC_TRUE );
+ module_Need( id->p_encoder, "encoder", p_sys->psz_venc, true );
if( !id->p_encoder->p_module )
{
msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_venc );
static void transcode_video_close( sout_stream_t *p_stream,
sout_stream_id_t *id )
{
- int i, j;
+ int i;
if( p_stream->p_sys->i_threads >= 1 )
{
/* Close filters */
for( i = 0; i < id->i_filter; i++ )
{
- vlc_object_detach( id->pp_filter[i] );
- if( id->pp_filter[i]->p_module )
- module_Unneed( id->pp_filter[i], id->pp_filter[i]->p_module );
-
- /* Clean-up pictures ring buffer */
- for( j = 0; j < PICTURE_RING_SIZE; j++ )
- {
- if( id->pp_filter[i]->p_owner->pp_pics[j] )
- video_del_buffer( VLC_OBJECT(id->pp_filter[i]),
- id->pp_filter[i]->p_owner->pp_pics[j] );
- }
- free( id->pp_filter[i]->p_owner );
- vlc_object_destroy( id->pp_filter[i] );
+ transcode_video_filter_close( p_stream, id->pp_filter[i] );
id->pp_filter[i] = NULL;
}
+ id->i_filter = 0;
for( i = 0; i < id->i_ufilter; i++ )
{
- vlc_object_detach( id->pp_ufilter[i] );
- if( id->pp_ufilter[i]->p_module )
- module_Unneed( id->pp_ufilter[i], id->pp_ufilter[i]->p_module );
-
- /* Clean-up pictures ring buffer */
- for( j = 0; j < PICTURE_RING_SIZE; j++ )
- {
- if( id->pp_ufilter[i]->p_owner->pp_pics[j] )
- video_del_buffer( VLC_OBJECT(id->pp_ufilter[i]),
- id->pp_ufilter[i]->p_owner->pp_pics[j] );
- }
- free( id->pp_ufilter[i]->p_owner );
- vlc_object_destroy( id->pp_ufilter[i] );
+ transcode_video_filter_close( p_stream, id->pp_ufilter[i] );
id->pp_ufilter[i] = NULL;
}
+ id->i_ufilter = 0;
}
static int transcode_video_process( sout_stream_t *p_stream,
int i_duplicate = 1, i;
picture_t *p_pic, *p_pic2 = NULL;
*out = NULL;
- input_thread_t *p_input = NULL;
-
- if( p_stream->p_parent->p_parent && p_stream->p_parent->p_parent->
- i_object_type == VLC_OBJECT_INPUT )
- p_input = (input_thread_t *)p_stream->p_parent->p_parent;
while( (p_pic = id->p_decoder->pf_decode_video( id->p_decoder, &in )) )
{
subpicture_t *p_subpic = NULL;
- if( p_input )
- stats_UpdateInteger( p_input, p_input->p->counters.p_decoded_video,
- 1, NULL );
+
+ sout_UpdateStatistic( p_stream->p_sout, SOUT_STATISTIC_DECODED_VIDEO, 1 );
if( p_stream->p_sout->i_out_pace_nocontrol && p_sys->b_hurry_up )
{
mtime_t current_date = mdate();
if( current_date + 50000 > p_pic->date )
{
- msg_Dbg( p_stream, "late picture skipped ("I64Fd")",
+ msg_Dbg( p_stream, "late picture skipped (%"PRId64")",
current_date + 50000 - p_pic->date );
p_pic->pf_release( p_pic );
continue;
{
p_pic->pf_release( p_pic );
transcode_video_close( p_stream, id );
- id->b_transcode = VLC_FALSE;
+ id->b_transcode = false;
return VLC_EGENERIC;
}
if( p_stream->p_sys->b_deinterlace )
{
id->pp_filter[id->i_filter] =
- vlc_object_create( p_stream, VLC_OBJECT_FILTER );
- vlc_object_attach( id->pp_filter[id->i_filter], p_stream );
-
- id->pp_filter[id->i_filter]->pf_vout_buffer_new =
- video_new_buffer_filter;
- id->pp_filter[id->i_filter]->pf_vout_buffer_del =
- video_del_buffer_filter;
-
- id->pp_filter[id->i_filter]->fmt_in = id->p_decoder->fmt_out;
- id->pp_filter[id->i_filter]->fmt_out = id->p_decoder->fmt_out;
- id->pp_filter[id->i_filter]->p_cfg = p_sys->p_deinterlace_cfg;
- id->pp_filter[id->i_filter]->p_module =
- module_Need( id->pp_filter[id->i_filter],
- "video filter2", p_sys->psz_deinterlace,
- VLC_TRUE );
- if( id->pp_filter[id->i_filter]->p_module )
- {
- id->pp_filter[id->i_filter]->p_owner =
- malloc( sizeof(filter_owner_sys_t) );
- for( i = 0; i < PICTURE_RING_SIZE; i++ )
- id->pp_filter[id->i_filter]->p_owner->pp_pics[i] = 0;
- id->pp_filter[id->i_filter]->p_owner->p_sys = p_sys;
+ transcode_video_filter_new( p_stream,
+ &id->p_decoder->fmt_out, &id->p_decoder->fmt_out,
+ p_sys->p_deinterlace_cfg,
+ p_sys->psz_deinterlace );
+ if( id->pp_filter[id->i_filter] )
id->i_filter++;
- }
- else
+ }
+
+#if (defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)) || defined(HAVE_LIBSWSCALE_SWSCALE_H)
+ if( ( id->p_decoder->fmt_out.video.i_chroma !=
+ id->p_encoder->fmt_in.video.i_chroma ) ||
+ ( id->p_decoder->fmt_out.video.i_width !=
+ id->p_encoder->fmt_out.video.i_width ) ||
+ ( id->p_decoder->fmt_out.video.i_height !=
+ id->p_encoder->fmt_out.video.i_height ) )
+ {
+ id->pp_filter[id->i_filter] =
+ transcode_video_filter_new( p_stream,
+ &id->p_decoder->fmt_out, &id->p_encoder->fmt_in,
+ NULL, "scale" );
+ if( !id->pp_filter[id->i_filter] )
{
- msg_Dbg( p_stream, "no video filter found" );
- vlc_object_detach( id->pp_filter[id->i_filter] );
- vlc_object_destroy( id->pp_filter[id->i_filter] );
+ p_pic->pf_release( p_pic );
+ transcode_video_close( p_stream, id );
+ id->b_transcode = false;
+ return VLC_EGENERIC;
}
+ id->i_filter++;
}
+#if 0 /* FIXME: */
+ /* we don't do chroma conversion or scaling in croppad */
+// es_format_t fmt_in, fmt_out;
+// es_format_Copy( &fmt_out, &id->p_encoder->fmt_in );
+// es_format_Copy( &fmt_in, &id->p_encoder->fmt_in );
+
+ if( ( id->p_decoder->fmt_out.video.i_chroma ==
+ id->p_encoder->fmt_in.video.i_chroma ) &&
+
+ ( ( (int)id->p_decoder->fmt_out.video.i_width !=
+ p_sys->i_crop_width ) ||
+ ( p_sys->i_crop_width != p_sys->i_nopadd_width ) ||
+ ( p_sys->i_nopadd_width !=
+ (int)id->p_encoder->fmt_out.video.i_width ) ||
+
+ ( (int)id->p_decoder->fmt_out.video.i_height !=
+ p_sys->i_crop_height ) ||
+ ( p_sys->i_crop_height != p_sys->i_nopadd_height ) ||
+ ( p_sys->i_nopadd_height !=
+ (int)id->p_encoder->fmt_out.video.i_height ) ) )
+ {
+ id->pp_filter[id->i_filter] =
+ transcode_video_filter_new( p_stream,
+ &id->p_decoder->fmt_out, &id->p_encoder->fmt_in,
+ NULL, "croppadd" );
+ if( id->pp_filter[id->i_filter] )
+ {
+ /* Set crop and padding information */
+ id->pp_filter[id->i_filter]->fmt_in.video.i_x_offset = p_sys->i_src_x_offset;
+ id->pp_filter[id->i_filter]->fmt_in.video.i_y_offset = p_sys->i_src_y_offset;
+ id->pp_filter[id->i_filter]->fmt_in.video.i_visible_width = p_sys->i_crop_width;
+ id->pp_filter[id->i_filter]->fmt_in.video.i_visible_height = p_sys->i_crop_height;
+
+ id->pp_filter[id->i_filter]->fmt_out.video.i_x_offset = p_sys->i_dst_x_offset;
+ id->pp_filter[id->i_filter]->fmt_out.video.i_y_offset = p_sys->i_dst_y_offset;
+ id->pp_filter[id->i_filter]->fmt_out.video.i_visible_width = p_sys->i_nopadd_width;
+ id->pp_filter[id->i_filter]->fmt_out.video.i_visible_height = p_sys->i_nopadd_height;
+ id->i_filter++;
+ }
+ }
+#endif
+#else
/* Check if we need a filter for chroma conversion or resizing */
if( id->p_decoder->fmt_out.video.i_chroma !=
id->p_encoder->fmt_in.video.i_chroma ||
p_sys->i_nopadd_height != (int)id->p_encoder->fmt_out.video.i_height)
{
id->pp_filter[id->i_filter] =
- vlc_object_create( p_stream, VLC_OBJECT_FILTER );
- vlc_object_attach( id->pp_filter[id->i_filter], p_stream );
-
- id->pp_filter[id->i_filter]->pf_vout_buffer_new =
- video_new_buffer_filter;
- id->pp_filter[id->i_filter]->pf_vout_buffer_del =
- video_del_buffer_filter;
-
- id->pp_filter[id->i_filter]->fmt_in = id->p_decoder->fmt_out;
- id->pp_filter[id->i_filter]->fmt_out = id->p_encoder->fmt_in;
- id->pp_filter[id->i_filter]->p_cfg = NULL;
+ transcode_video_filter_new( p_stream,
+ &id->p_decoder->fmt_out, &id->p_encoder->fmt_in,
+ NULL, "crop padd" );
+ if( !id->pp_filter[id->i_filter] )
+ {
+ p_pic->pf_release( p_pic );
+ transcode_video_close( p_stream, id );
+ id->b_transcode = false;
+ return VLC_EGENERIC;
+ }
+ /* Set crop and padding information */
id->pp_filter[id->i_filter]->fmt_in.video.i_x_offset = p_sys->i_src_x_offset;
id->pp_filter[id->i_filter]->fmt_in.video.i_y_offset = p_sys->i_src_y_offset;
id->pp_filter[id->i_filter]->fmt_in.video.i_visible_width = p_sys->i_crop_width;
id->pp_filter[id->i_filter]->fmt_out.video.i_visible_width = p_sys->i_nopadd_width;
id->pp_filter[id->i_filter]->fmt_out.video.i_visible_height = p_sys->i_nopadd_height;
- id->pp_filter[id->i_filter]->p_module =
- module_Need( id->pp_filter[id->i_filter],
- "crop padd", 0, 0 );
- if( id->pp_filter[id->i_filter]->p_module )
- {
- id->pp_filter[id->i_filter]->p_owner =
- malloc( sizeof(filter_owner_sys_t) );
- for( i = 0; i < PICTURE_RING_SIZE; i++ )
- id->pp_filter[id->i_filter]->p_owner->pp_pics[i] = 0;
- id->pp_filter[id->i_filter]->p_owner->p_sys = p_sys;
-
- id->i_filter++;
- }
- else
- {
- msg_Dbg( p_stream, "no video filter found" );
- vlc_object_detach( id->pp_filter[id->i_filter] );
- vlc_object_destroy( id->pp_filter[id->i_filter] );
-
- p_pic->pf_release( p_pic );
- transcode_video_close( p_stream, id );
- id->b_transcode = VLC_FALSE;
- return VLC_EGENERIC;
- }
+ id->i_filter++;
}
-
+#endif
for( i = 0; (i < p_sys->i_vfilters) && (id->i_ufilter < TRANSCODE_FILTERS); i++ )
{
id->pp_ufilter[id->i_ufilter] =
- vlc_object_create( p_stream, VLC_OBJECT_FILTER );
- vlc_object_attach( id->pp_ufilter[id->i_ufilter], p_stream );
-
- id->pp_ufilter[id->i_ufilter]->pf_vout_buffer_new =
- video_new_buffer_filter;
- id->pp_ufilter[id->i_ufilter]->pf_vout_buffer_del =
- video_del_buffer_filter;
-
- id->pp_ufilter[id->i_ufilter]->fmt_in = id->p_encoder->fmt_in;
- id->pp_ufilter[id->i_ufilter]->fmt_out = id->p_encoder->fmt_in;
- id->pp_ufilter[id->i_ufilter]->p_cfg = p_sys->p_vfilters_cfg[i];
- id->pp_ufilter[id->i_ufilter]->p_module =
- module_Need( id->pp_ufilter[id->i_ufilter],
- "video filter2", p_sys->psz_vfilters[i], VLC_TRUE );
- if( id->pp_ufilter[id->i_ufilter]->p_module )
- {
- id->pp_ufilter[id->i_ufilter]->p_owner =
- malloc( sizeof(filter_owner_sys_t) );
- for( i = 0; i < PICTURE_RING_SIZE; i++ )
- id->pp_ufilter[id->i_ufilter]->p_owner->pp_pics[i] = 0;
- id->pp_ufilter[id->i_ufilter]->p_owner->p_sys = p_sys;
+ transcode_video_filter_new( p_stream,
+ &id->p_decoder->fmt_out, &id->p_encoder->fmt_in,
+ p_sys->p_vfilters_cfg[i], p_sys->psz_vfilters[i] );
+ if( id->pp_ufilter[id->i_filter] )
id->i_ufilter++;
- }
else
- {
- msg_Dbg( p_stream, "no video filter found" );
- vlc_object_detach( id->pp_ufilter[id->i_ufilter] );
- vlc_object_destroy( id->pp_ufilter[id->i_ufilter] );
id->pp_ufilter[id->i_ufilter] = NULL;
- }
}
}
if( p_sys->p_spu )
{
p_subpic = spu_SortSubpictures( p_sys->p_spu, p_pic->date,
- VLC_FALSE /* Fixme: check if stream is paused */ );
+ false /* Fixme: check if stream is paused */ );
/* TODO: get another pic */
}
}
p_pic = malloc( sizeof(picture_t) );
+ if( !p_pic ) return NULL;
p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
vout_AllocatePicture( VLC_OBJECT(p_dec), p_pic,
p_dec->fmt_out.video.i_chroma,
if( !p_pic->i_planes )
{
free( p_pic );
- return 0;
+ return NULL;
}
p_pic->pf_release = video_release_buffer;
p_pic->p_sys = malloc( sizeof(picture_sys_t) );
+ if( !p_pic->p_sys )
+ {
+ free( p_pic );
+ return NULL;
+ }
+
p_pic->p_sys->p_owner = p_this;
p_pic->i_status = RESERVED_PICTURE;
static void video_del_buffer( vlc_object_t *p_this, picture_t *p_pic )
{
- if( p_pic && p_pic->p_data_orig ) free( p_pic->p_data_orig );
- if( p_pic && p_pic->p_sys ) free( p_pic->p_sys );
- if( p_pic ) free( p_pic );
+ VLC_UNUSED(p_this);
+ if( p_pic )
+ {
+ free( p_pic->p_data_orig );
+ free( p_pic->p_sys );
+ free( p_pic );
+ }
}
static void video_del_buffer_decoder( decoder_t *p_decoder, picture_t *p_pic )
{
+ VLC_UNUSED(p_decoder);
p_pic->i_refcount = 0;
p_pic->i_status = DESTROYED_PICTURE;
}
static void video_del_buffer_filter( filter_t *p_filter, picture_t *p_pic )
{
+ VLC_UNUSED(p_filter);
p_pic->i_refcount = 0;
p_pic->i_status = DESTROYED_PICTURE;
}
static void video_link_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
{
+ VLC_UNUSED(p_dec);
p_pic->i_refcount++;
}
static void video_unlink_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
{
+ VLC_UNUSED(p_dec);
video_release_buffer( p_pic );
}
*/
/* Initialization of decoder structures */
+ id->p_decoder->pf_decode_sub = NULL;
id->p_decoder->pf_spu_buffer_new = spu_new_buffer;
id->p_decoder->pf_spu_buffer_del = spu_del_buffer;
id->p_decoder->p_owner = (decoder_owner_sys_t *)p_stream;
id->p_encoder->p_cfg = p_sys->p_spu_cfg;
id->p_encoder->p_module =
- module_Need( id->p_encoder, "encoder", p_sys->psz_senc, VLC_TRUE );
+ module_Need( id->p_encoder, "encoder", p_sys->psz_senc, true );
if( !id->p_encoder->p_module )
{
return VLC_SUCCESS;
}
-static void transcode_spu_close( sout_stream_t *p_stream, sout_stream_id_t *id)
+static void transcode_spu_close( sout_stream_id_t *id)
{
/* Close decoder */
if( id->p_decoder->p_module )
*out = NULL;
p_subpic = id->p_decoder->pf_decode_sub( id->p_decoder, &in );
- if( !p_subpic ) return VLC_EGENERIC;
+ if( !p_subpic )
+ return VLC_EGENERIC;
+
+ sout_UpdateStatistic( p_stream->p_sout, SOUT_STATISTIC_DECODED_SUBTITLE, 1 );
if( p_sys->b_master_sync && p_sys->i_master_drift )
{
p_block = id->p_encoder->pf_encode_sub( id->p_encoder, p_subpic );
spu_del_buffer( id->p_decoder, p_subpic );
-
if( p_block )
{
block_ChainAppend( out, p_block );
static int transcode_osd_new( sout_stream_t *p_stream, sout_stream_id_t *id )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- es_format_t fmt;
- fmt.i_cat = SPU_ES;
- fmt.i_id = 0xbd1f; /* pid ?? */
- fmt.i_group = 3; /* pmt entry ?? */
- fmt.i_codec = VLC_FOURCC( 'Y', 'U', 'V', 'A' );
- fmt.psz_language = strdup( "osd" );
-
- id = malloc( sizeof( sout_stream_id_t ) );
- memset( id, 0, sizeof(sout_stream_id_t) );
-
- id->id = NULL;
- id->p_decoder = NULL;
- id->p_encoder = NULL;
-
- /* Create encoder object */
- id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
- if( !id->p_encoder )
- {
- msg_Err( p_stream, "out of memory" );
- goto error;
- }
- vlc_object_attach( id->p_encoder, p_stream );
- id->p_encoder->p_module = NULL;
-
- /* Create fake destination format */
- es_format_Init( &id->p_encoder->fmt_out, fmt.i_cat, 0 );
- id->p_encoder->fmt_out.i_id = fmt.i_id;
- id->p_encoder->fmt_out.i_group = fmt.i_group;
- id->p_encoder->fmt_out.psz_language = strdup( fmt.psz_language );
+ id->p_decoder->fmt_in.i_cat = SPU_ES;
+ id->p_encoder->fmt_out.psz_language = strdup( "osd" );
if( p_sys->i_osdcodec != 0 || p_sys->psz_osdenc )
{
msg_Dbg( p_stream, "creating osdmenu transcoding from fcc=`%4.4s' "
- "to fcc=`%4.4s'", (char*)&fmt.i_codec,
+ "to fcc=`%4.4s'", (char*)&id->p_encoder->fmt_out.i_codec,
(char*)&p_sys->i_osdcodec );
/* Complete destination format */
id->p_encoder->fmt_out.i_codec = p_sys->i_osdcodec;
/* Open encoder */
- /* Initialization of encoder format structures */
- es_format_Init( &id->p_encoder->fmt_in, fmt.i_cat, fmt.i_codec );
- id->p_encoder->fmt_in.psz_language = strdup( fmt.psz_language );
+ es_format_Init( &id->p_encoder->fmt_in, id->p_decoder->fmt_in.i_cat,
+ VLC_FOURCC('Y','U','V','A') );
+ id->p_encoder->fmt_in.psz_language = strdup( "osd" );
id->p_encoder->p_cfg = p_sys->p_osd_cfg;
id->p_encoder->p_module =
- module_Need( id->p_encoder, "encoder", p_sys->psz_osdenc, VLC_TRUE );
+ module_Need( id->p_encoder, "encoder", p_sys->psz_osdenc, true );
if( !id->p_encoder->p_module )
{
/* open output stream */
id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_encoder->fmt_out );
- id->b_transcode = VLC_TRUE;
+ id->b_transcode = true;
if( !id->id ) goto error;
}
else
{
msg_Dbg( p_stream, "not transcoding a stream (fcc=`%4.4s')",
- (char*)&fmt.i_codec );
- id->id = p_sys->p_out->pf_add( p_sys->p_out, &fmt );
- id->b_transcode = VLC_FALSE;
+ (char*)&id->p_decoder->fmt_out.i_codec );
+ id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_decoder->fmt_out );
+ id->b_transcode = false;
if( !id->id ) goto error;
}
- p_sys->id_osd = id;
- p_sys->b_es_osd = VLC_TRUE;
-
if( !p_sys->p_spu )
{
p_sys->p_spu = spu_Create( p_stream );
- if( spu_Init( p_sys->p_spu ) != VLC_SUCCESS )
- msg_Err( p_sys, "spu initialisation failed" );
+ spu_Init( p_sys->p_spu );
}
- if( fmt.psz_language )
- free( fmt.psz_language );
-
return VLC_SUCCESS;
error:
msg_Err( p_stream, "starting osd encoding thread failed" );
if( id->p_encoder->p_module )
module_Unneed( id->p_encoder, id->p_encoder->p_module );
- if( id->p_encoder )
- {
- vlc_object_detach( id->p_encoder );
- vlc_object_destroy( id->p_encoder );
- }
- if( fmt.psz_language ) free( fmt.psz_language );
- if( id ) free( id );
- p_sys->id_osd = NULL;
- p_sys->b_es_osd = VLC_FALSE;
+ p_sys->b_osd = false;
return VLC_EGENERIC;
}
sout_stream_sys_t *p_sys = p_stream->p_sys;
/* Close encoder */
- if( p_sys->b_es_osd && id )
+ if( p_sys->b_osd && id )
{
if( id->p_encoder->p_module )
module_Unneed( id->p_encoder, id->p_encoder->p_module );
-
- if( id->id ) p_sys->p_out->pf_del( p_sys->p_out, id->id );
-
- if( id->p_encoder )
- {
- vlc_object_detach( id->p_encoder );
- vlc_object_destroy( id->p_encoder );
- }
}
- p_sys->b_es_osd = VLC_FALSE;
- if( id ) free( id );
+ p_sys->b_osd = false;
}
static int transcode_osd_process( sout_stream_t *p_stream,
/* Check if we have a subpicture to send */
if( p_sys->p_spu && in->i_dts > 0)
{
- p_subpic = spu_SortSubpictures( p_sys->p_spu, in->i_dts, VLC_FALSE );
+ p_subpic = spu_SortSubpictures( p_sys->p_spu, in->i_dts, false );
}
else
{
if( !p_sys->p_spu )
{
p_sys->p_spu = spu_Create( p_stream );
- if( spu_Init( p_sys->p_spu ) != VLC_SUCCESS )
- msg_Err( p_stream, "spu initialisation failed" );
+ spu_Init( p_sys->p_spu );
}
}
if( p_subpic->i_stop ) p_subpic->i_stop -= p_sys->i_master_drift;
}
- p_block = p_sys->id_osd->p_encoder->pf_encode_sub( p_sys->id_osd->p_encoder, p_subpic );
+ p_block = id->p_encoder->pf_encode_sub( id->p_encoder, p_subpic );
+ spu_DestroySubpicture( p_sys->p_spu, p_subpic );
if( p_block )
{
p_block->i_dts = p_block->i_pts = in->i_dts;
block_ChainAppend( out, p_block );
- if( *out )
- {
- if( p_sys->p_out->pf_send( p_sys->p_out, p_sys->id_osd->id, *out ) == VLC_SUCCESS )
- spu_DestroySubpicture( p_sys->p_spu, p_subpic );
- }
return VLC_SUCCESS;
}
}
projects / vlc / blobdiff