X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Ftranscode.c;h=c44108e10364cd54ecdbf91931b35a2f5dd81947;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=00162fc7cdbc5b9b2a477a7122aa97f8ae24d9a3;hpb=868ae7e32bb82299d7481b10b0cd0cbeadda99e5;p=vlc diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c index 00162fc7cd..c44108e103 100644 --- a/modules/stream_out/transcode.c +++ b/modules/stream_out/transcode.c @@ -26,20 +26,23 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include - #include -#include -#include -#include -#include -#include "vlc_filter.h" -#include "vlc_osd.h" +#include +#include +#include +#include +#include +#include +#include +#include + +#include #define MASTER_SYNC_MAX_DRIFT 100000 +/* FIXME Ugly */ +#include "../../src/input/input_internal.h" + /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -135,6 +138,10 @@ #define ACHANS_TEXT N_("Audio channels") #define ACHANS_LONGTEXT N_( \ "Number of audio channels in the transcoded streams." ) +#define AFILTER_TEXT N_("Audio filter") +#define AFILTER_LONGTEXT N_( \ + "Audio filters will be applied to the audio streams (after conversion " \ + "filters are applied). You must enter a comma-separated list of filters." ) #define SENC_TEXT N_("Subtitles encoder") #define SENC_LONGTEXT N_( \ @@ -142,7 +149,7 @@ "associated options)." ) #define SCODEC_TEXT N_("Destination subtitles codec") #define SCODEC_LONGTEXT N_( \ - "This is the subtitles coded that will be used." ) + "This is the subtitles codec that will be used." ) #define SFILTER_TEXT N_("Overlays") #define SFILTER_LONGTEXT N_( \ @@ -172,7 +179,7 @@ #define HURRYUP_LONGTEXT N_( "The transcoder will drop frames if your CPU " \ "can't keep up with the encoding rate." ) -static char *ppsz_deinterlace_type[] = +static const char *ppsz_deinterlace_type[] = { "deinterlace", "ffmpeg-deinterlace" }; @@ -217,7 +224,7 @@ vlc_module_begin(); MAXWIDTH_LONGTEXT, VLC_TRUE ); add_integer( SOUT_CFG_PREFIX "maxheight", 0, NULL, MAXHEIGHT_TEXT, MAXHEIGHT_LONGTEXT, VLC_TRUE ); - add_module_list_cat( SOUT_CFG_PREFIX "vfilter", SUBCAT_VIDEO_VFILTER, + add_module_list( SOUT_CFG_PREFIX "vfilter", "video filter2", NULL, NULL, VFILTER_TEXT, VFILTER_LONGTEXT, VLC_FALSE ); @@ -259,6 +266,9 @@ vlc_module_begin(); ARATE_LONGTEXT, VLC_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, + NULL, NULL, + AFILTER_TEXT, AFILTER_LONGTEXT, VLC_FALSE ); set_section( N_("Overlays/Subtitles"), NULL ); add_string( SOUT_CFG_PREFIX "senc", NULL, NULL, SENC_TEXT, @@ -274,7 +284,7 @@ vlc_module_begin(); set_section( N_("On Screen Display"), NULL ); add_bool( SOUT_CFG_PREFIX "osd", 0, NULL, OSD_TEXT, OSD_LONGTEXT, VLC_FALSE ); - + set_section( N_("Miscellaneous"), NULL ); add_integer( SOUT_CFG_PREFIX "threads", 0, NULL, THREADS_TEXT, THREADS_LONGTEXT, VLC_TRUE ); @@ -285,12 +295,13 @@ vlc_module_end(); static const char *ppsz_sout_options[] = { "venc", "vcodec", "vb", "croptop", "cropbottom", "cropleft", "cropright", - "paddtop", "paddbottom", "paddleft", "paddright", - "canvas-width", "canvas-height", "canvas-aspect", + "paddtop", "paddbottom", "paddleft", "paddright", + "canvas-width", "canvas-height", "canvas-aspect", "scale", "fps", "width", "height", "vfilter", "deinterlace", "deinterlace-module", "threads", "hurry-up", "aenc", "acodec", "ab", - "samplerate", "channels", "senc", "scodec", "soverlay", "sfilter", - "osd", "audio-sync", "high-priority", "maxwidth", "maxheight", NULL + "afilter", "samplerate", "channels", "senc", "scodec", "soverlay", + "sfilter", "osd", "audio-sync", "high-priority", "maxwidth", "maxheight", + NULL }; /***************************************************************************** @@ -347,6 +358,7 @@ static int pi_channels_maps[6] = #define PICTURE_RING_SIZE 64 #define SUBPICTURE_RING_SIZE 20 +#define TRANSCODE_FILTERS 10 struct sout_stream_sys_t { @@ -363,15 +375,18 @@ struct sout_stream_sys_t /* Audio */ vlc_fourcc_t i_acodec; /* codec audio (0 if not transcode) */ char *psz_aenc; - sout_cfg_t *p_audio_cfg; + config_chain_t *p_audio_cfg; int i_sample_rate; int i_channels; int i_abitrate; + char *psz_afilters[TRANSCODE_FILTERS]; + config_chain_t *p_afilters_cfg[TRANSCODE_FILTERS]; + int i_afilters; /* Video */ vlc_fourcc_t i_vcodec; /* codec video (0 if not transcode) */ char *psz_venc; - sout_cfg_t *p_video_cfg; + config_chain_t *p_video_cfg; int i_vbitrate; double f_scale; double f_fps; @@ -379,12 +394,12 @@ struct sout_stream_sys_t unsigned int i_height, i_maxheight; vlc_bool_t b_deinterlace; char *psz_deinterlace; - sout_cfg_t *p_deinterlace_cfg; + config_chain_t *p_deinterlace_cfg; int i_threads; vlc_bool_t b_high_priority; vlc_bool_t b_hurry_up; - char *psz_vfilters[10]; - sout_cfg_t *p_vfilters_cfg[10]; + char *psz_vfilters[TRANSCODE_FILTERS]; + config_chain_t *p_vfilters_cfg[TRANSCODE_FILTERS]; int i_vfilters; int i_crop_top; @@ -400,7 +415,7 @@ struct sout_stream_sys_t int i_canvas_width; int i_canvas_height; int i_canvas_aspect; - + /* Video, calculated */ int i_src_x_offset; int i_src_y_offset; @@ -416,14 +431,14 @@ struct sout_stream_sys_t vlc_fourcc_t i_scodec; /* codec spu (0 if not transcode) */ char *psz_senc; vlc_bool_t b_soverlay; - sout_cfg_t *p_spu_cfg; + 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; - sout_cfg_t *p_osd_cfg; + 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; @@ -464,7 +479,7 @@ static int Open( vlc_object_t *p_this ) p_sys->i_master_drift = 0; - sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, + config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, p_stream->p_cfg ); /* Audio transcoding parameters */ @@ -474,8 +489,8 @@ static int Open( vlc_object_t *p_this ) if( val.psz_string && *val.psz_string ) { char *psz_next; - psz_next = sout_CfgCreate( &p_sys->psz_aenc, &p_sys->p_audio_cfg, - val.psz_string ); + psz_next = config_ChainCreate( &p_sys->psz_aenc, &p_sys->p_audio_cfg, + val.psz_string ); if( psz_next ) free( psz_next ); } if( val.psz_string ) free( val.psz_string ); @@ -502,8 +517,8 @@ static int Open( vlc_object_t *p_this ) if( p_sys->i_acodec ) { - if( (strncmp( (char *)&p_sys->i_acodec, "mp3", 3) == 0) && - (p_sys->i_channels > 2) ) + if( p_sys->i_acodec == VLC_FOURCC('m','p','3',0) && + p_sys->i_channels > 2 ) { msg_Warn( p_stream, "%d channels invalid for mp3, forcing to 2", p_sys->i_channels ); @@ -514,6 +529,30 @@ static int Open( vlc_object_t *p_this ) p_sys->i_channels, p_sys->i_abitrate / 1000 ); } + var_Get( p_stream, SOUT_CFG_PREFIX "afilter", &val ); + p_sys->i_afilters = 0; + if( val.psz_string && *val.psz_string ) + { + char *psz_parser = val.psz_string; + + while( (psz_parser != NULL) && (*psz_parser != '\0') + && (p_sys->i_afilters < TRANSCODE_FILTERS) ) + { + psz_parser = config_ChainCreate( + &p_sys->psz_afilters[p_sys->i_afilters], + &p_sys->p_afilters_cfg[p_sys->i_afilters], + psz_parser ); + p_sys->i_afilters++; + if( (psz_parser != NULL) && (*psz_parser != '\0') ) psz_parser++; + } + } + if( val.psz_string ) free( val.psz_string ); + if( p_sys->i_afilters < TRANSCODE_FILTERS-1 ) + { + p_sys->psz_afilters[p_sys->i_afilters] = NULL; + p_sys->p_afilters_cfg[p_sys->i_afilters] = NULL; + } + /* Video transcoding parameters */ var_Get( p_stream, SOUT_CFG_PREFIX "venc", &val ); p_sys->psz_venc = NULL; @@ -521,7 +560,7 @@ static int Open( vlc_object_t *p_this ) if( val.psz_string && *val.psz_string ) { char *psz_next; - psz_next = sout_CfgCreate( &p_sys->psz_venc, &p_sys->p_video_cfg, + psz_next = config_ChainCreate( &p_sys->psz_venc, &p_sys->p_video_cfg, val.psz_string ); if( psz_next ) free( psz_next ); } @@ -568,9 +607,10 @@ static int Open( vlc_object_t *p_this ) { char *psz_parser = val.psz_string; - while( psz_parser != NULL && *psz_parser != '\0' ) + while( (psz_parser != NULL) && (*psz_parser != '\0') + && (p_sys->i_vfilters < TRANSCODE_FILTERS) ) { - psz_parser = sout_CfgCreate( + psz_parser = config_ChainCreate( &p_sys->psz_vfilters[p_sys->i_vfilters], &p_sys->p_vfilters_cfg[p_sys->i_vfilters], psz_parser ); @@ -579,8 +619,11 @@ static int Open( vlc_object_t *p_this ) } } if( val.psz_string ) free( val.psz_string ); - p_sys->psz_vfilters[p_sys->i_vfilters] = NULL; - p_sys->p_vfilters_cfg[p_sys->i_vfilters] = NULL; + if( p_sys->i_vfilters < TRANSCODE_FILTERS-1 ) + { + p_sys->psz_vfilters[p_sys->i_vfilters] = NULL; + p_sys->p_vfilters_cfg[p_sys->i_vfilters] = NULL; + } var_Get( p_stream, SOUT_CFG_PREFIX "deinterlace", &val ); p_sys->b_deinterlace = val.b_bool; @@ -591,7 +634,7 @@ static int Open( vlc_object_t *p_this ) if( val.psz_string && *val.psz_string ) { char *psz_next; - psz_next = sout_CfgCreate( &p_sys->psz_deinterlace, + psz_next = config_ChainCreate( &p_sys->psz_deinterlace, &p_sys->p_deinterlace_cfg, val.psz_string ); if( psz_next ) free( psz_next ); @@ -615,35 +658,27 @@ static int Open( vlc_object_t *p_this ) p_sys->i_padd_left = val.i_int; var_Get( p_stream, SOUT_CFG_PREFIX "paddright", &val ); p_sys->i_padd_right = val.i_int; - + var_Get( p_stream, SOUT_CFG_PREFIX "canvas-width", &val ); p_sys->i_canvas_width = val.i_int; var_Get( p_stream, SOUT_CFG_PREFIX "canvas-height", &val ); p_sys->i_canvas_height = val.i_int; - + var_Get( p_stream, SOUT_CFG_PREFIX "canvas-aspect", &val ); - if ( val.psz_string ) + p_sys->i_canvas_aspect = 0; + if( val.psz_string && *val.psz_string ) { char *psz_parser = strchr( val.psz_string, ':' ); - if( psz_parser ) { *psz_parser++ = '\0'; - p_sys->i_canvas_aspect = atoi( val.psz_string ) * VOUT_ASPECT_FACTOR - / atoi( psz_parser ); - } - else - { - msg_Warn( p_stream, "bad aspect ratio %s", val.psz_string ); - p_sys->i_canvas_aspect = 0; + p_sys->i_canvas_aspect = atoi( val.psz_string ) * + VOUT_ASPECT_FACTOR / atoi( psz_parser ); } + else msg_Warn( p_stream, "bad aspect ratio %s", val.psz_string ); - free( val.psz_string ); - } - else - { - p_sys->i_canvas_aspect = 0; } + if( val.psz_string ) free( val.psz_string ); var_Get( p_stream, SOUT_CFG_PREFIX "threads", &val ); p_sys->i_threads = val.i_int; @@ -667,7 +702,7 @@ static int Open( vlc_object_t *p_this ) if( val.psz_string && *val.psz_string ) { char *psz_next; - psz_next = sout_CfgCreate( &p_sys->psz_senc, &p_sys->p_spu_cfg, + psz_next = config_ChainCreate( &p_sys->psz_senc, &p_sys->p_spu_cfg, val.psz_string ); if( psz_next ) free( psz_next ); } @@ -713,7 +748,7 @@ static int Open( vlc_object_t *p_this ) vlc_value_t osd_val; char *psz_next; - psz_next = sout_CfgCreate( &p_sys->psz_osdenc, + psz_next = config_ChainCreate( &p_sys->psz_osdenc, &p_sys->p_osd_cfg, strdup( "dvbsub") ); if( psz_next ) free( psz_next ); @@ -761,9 +796,18 @@ static void Close( vlc_object_t * p_this ) sout_StreamDelete( p_sys->p_out ); + 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] ); + } + while( p_sys->p_audio_cfg != NULL ) { - sout_cfg_t *p_next = p_sys->p_audio_cfg->p_next; + 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 ); @@ -775,9 +819,18 @@ static void Close( vlc_object_t * p_this ) } if( 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] ); + } + while( p_sys->p_video_cfg != NULL ) { - sout_cfg_t *p_next = p_sys->p_video_cfg->p_next; + 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 ); @@ -791,7 +844,7 @@ static void Close( vlc_object_t * p_this ) while( p_sys->p_deinterlace_cfg != NULL ) { - sout_cfg_t *p_next = p_sys->p_deinterlace_cfg->p_next; + 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 ); @@ -805,7 +858,7 @@ static void Close( vlc_object_t * p_this ) while( p_sys->p_spu_cfg != NULL ) { - sout_cfg_t *p_next = p_sys->p_spu_cfg->p_next; + 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 ); @@ -821,7 +874,7 @@ static void Close( vlc_object_t * p_this ) while( p_sys->p_osd_cfg != NULL ) { - sout_cfg_t *p_next = p_sys->p_osd_cfg->p_next; + 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 ); @@ -847,10 +900,11 @@ struct sout_stream_id_t decoder_t *p_decoder; /* Filters */ - filter_t *pp_filter[10]; + filter_t *pp_filter[TRANSCODE_FILTERS]; int i_filter; - filter_t *pp_vfilter[10]; - int i_vfilter; + /* User specified filters */ + filter_t *pp_ufilter[TRANSCODE_FILTERS]; + int i_ufilter; /* Encoder */ encoder_t *p_encoder; @@ -1053,6 +1107,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) { vlc_object_detach( id->p_decoder ); vlc_object_destroy( id->p_decoder ); + id->p_decoder = NULL; } if( id->p_encoder ) @@ -1060,6 +1115,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) vlc_object_detach( id->p_encoder ); es_format_Clean( &id->p_encoder->fmt_out ); vlc_object_destroy( id->p_encoder ); + id->p_encoder = NULL; } free( id ); @@ -1095,6 +1151,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) { vlc_object_detach( id->p_decoder ); vlc_object_destroy( id->p_decoder ); + id->p_decoder = NULL; } if( id->p_encoder ) @@ -1102,8 +1159,8 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) vlc_object_detach( id->p_encoder ); es_format_Clean( &id->p_encoder->fmt_out ); vlc_object_destroy( id->p_encoder ); + id->p_encoder = NULL; } - free( id ); return VLC_SUCCESS; @@ -1203,8 +1260,10 @@ int audio_BitsPerSample( vlc_fourcc_t i_format ) static filter_t *transcode_audio_filter_new( sout_stream_t *p_stream, sout_stream_id_t *id, es_format_t *p_fmt_in, - es_format_t *p_fmt_out ) + es_format_t *p_fmt_out, + char *psz_name ) { + sout_stream_sys_t *p_sys = p_stream->p_sys; filter_t *p_filter = vlc_object_create( p_stream, VLC_OBJECT_FILTER ); vlc_object_attach( p_filter, p_stream ); @@ -1212,11 +1271,14 @@ static filter_t *transcode_audio_filter_new( sout_stream_t *p_stream, p_filter->fmt_in = *p_fmt_in; p_filter->fmt_out = *p_fmt_out; + if( psz_name ) + p_filter->p_cfg = p_sys->p_afilters_cfg[id->i_ufilter]; - p_filter->p_module = module_Need( p_filter, "audio filter2", 0, 0 ); + p_filter->p_module = module_Need( p_filter, "audio filter2", psz_name, + VLC_TRUE ); if( p_filter->p_module ) { - p_filter->fmt_out.audio.i_bitspersample = + p_filter->fmt_out.audio.i_bitspersample = audio_BitsPerSample( p_filter->fmt_out.i_codec ); *p_fmt_in = p_filter->fmt_out; } @@ -1235,7 +1297,7 @@ static int transcode_audio_new( sout_stream_t *p_stream, { sout_stream_sys_t *p_sys = p_stream->p_sys; es_format_t fmt_last; - int i_pass = 6; + int i; /* * Open decoder @@ -1252,17 +1314,19 @@ static int transcode_audio_new( sout_stream_t *p_stream, id->p_decoder->p_module = module_Need( id->p_decoder, "decoder", "$codec", 0 ); - if( !id->p_decoder->p_module ) { 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 decoders so we don't have to do this */ - fmt_last.audio.i_rate = id->p_decoder->fmt_in.audio.i_rate; + /* 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) ) + fmt_last.audio.i_rate = id->p_decoder->fmt_in.audio.i_rate; /* * Open encoder @@ -1274,8 +1338,9 @@ static int transcode_audio_new( sout_stream_t *p_stream, 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, AOUT_FMT_S16_NE ); - id->p_encoder->fmt_in.audio.i_format = AOUT_FMT_S16_NE; + 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; id->p_encoder->fmt_in.audio.i_physical_channels = id->p_encoder->fmt_out.audio.i_physical_channels; @@ -1287,20 +1352,28 @@ static int transcode_audio_new( sout_stream_t *p_stream, audio_BitsPerSample( id->p_encoder->fmt_in.i_codec ); 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 ); if( !id->p_encoder->p_module ) { msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_aenc ); module_Unneed( id->p_decoder, id->p_decoder->p_module ); - id->p_decoder->p_module = 0; + id->p_decoder->p_module = NULL; return VLC_EGENERIC; } id->p_encoder->fmt_in.audio.i_format = id->p_encoder->fmt_in.i_codec; 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 ) @@ -1310,24 +1383,26 @@ static int transcode_audio_new( sout_stream_t *p_stream, fmt_out.i_codec = fmt_out.audio.i_format = VLC_FOURCC('f','l','3','2'); id->pp_filter[id->i_filter] = - transcode_audio_filter_new( p_stream, id, &fmt_last, &fmt_out ); + transcode_audio_filter_new( p_stream, id, &fmt_last, &fmt_out, NULL ); if( id->pp_filter[id->i_filter] ) id->i_filter++; } - while( i_pass-- ) + for( i = 0; i < TRANSCODE_FILTERS; i++ ) { - 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 || - fmt_last.i_codec != id->p_encoder->fmt_in.i_codec ) + 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) || + (fmt_last.i_codec != id->p_encoder->fmt_in.i_codec) ) { id->pp_filter[id->i_filter] = transcode_audio_filter_new( p_stream, id, &fmt_last, - &id->p_encoder->fmt_in ); + &id->p_encoder->fmt_in, NULL ); - if( id->pp_filter[id->i_filter] ) id->i_filter++; - else break; + if( id->pp_filter[id->i_filter] ) + id->i_filter++; + else + break; } } @@ -1341,13 +1416,28 @@ static int transcode_audio_new( sout_stream_t *p_stream, return VLC_EGENERIC; } + /* Load user specified audio filters now */ + for( i = 0; (i < p_sys->i_afilters) && + (id->i_ufilter < TRANSCODE_FILTERS); i++ ) + { + id->pp_ufilter[id->i_ufilter] = + transcode_audio_filter_new( p_stream, id, &fmt_last, + &id->p_encoder->fmt_in, + p_sys->psz_afilters[i] ); + + if( id->pp_ufilter[id->i_ufilter] ) + id->i_ufilter++; + else + break; + } + if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ) { - msg_Err( p_stream, "no audio filter found for mixing from" - " %i to %i channels", fmt_last.audio.i_channels, - id->p_encoder->fmt_in.audio.i_channels ); -#if 0 - /* FIXME : this might work, but only if the encoder is restarted */ +#if 1 + module_Unneed( id->p_encoder, id->p_encoder->p_module ); + id->p_encoder->p_module = NULL; + + /* This might work, but only if the encoder is restarted */ id->p_encoder->fmt_in.audio.i_channels = fmt_last.audio.i_channels; id->p_encoder->fmt_out.audio.i_channels = fmt_last.audio.i_channels; @@ -1357,7 +1447,30 @@ static int transcode_audio_new( sout_stream_t *p_stream, id->p_encoder->fmt_out.audio.i_physical_channels = id->p_encoder->fmt_out.audio.i_original_channels = fmt_last.audio.i_physical_channels; + + msg_Dbg( p_stream, "number of audio channels for mixing changed, " + "trying to reopen the encoder for mixing %i to %i channels", + fmt_last.audio.i_channels, + id->p_encoder->fmt_in.audio.i_channels ); + + /* 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 ); + if( !id->p_encoder->p_module ) + { + msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_aenc ); + transcode_audio_close( p_stream, id ); + return VLC_EGENERIC; + } + id->p_encoder->fmt_in.audio.i_format = id->p_encoder->fmt_in.i_codec; + id->p_encoder->fmt_in.audio.i_bitspersample = + audio_BitsPerSample( id->p_encoder->fmt_in.i_codec ); #else + msg_Err( p_stream, "no audio filter found for mixing from" + " %i to %i channels", fmt_last.audio.i_channels, + id->p_encoder->fmt_in.audio.i_channels ); + transcode_audio_close( p_stream, id ); return VLC_EGENERIC; #endif @@ -1393,12 +1506,12 @@ static void transcode_audio_close( sout_stream_t *p_stream, /* Close decoder */ if( id->p_decoder->p_module ) module_Unneed( id->p_decoder, id->p_decoder->p_module ); - id->p_decoder->p_module = 0; + id->p_decoder->p_module = NULL; /* Close encoder */ if( id->p_encoder->p_module ) module_Unneed( id->p_encoder, id->p_encoder->p_module ); - id->p_encoder->p_module = 0; + id->p_encoder->p_module = NULL; /* Close filters */ for( i = 0; i < id->i_filter; i++ ) @@ -1408,6 +1521,13 @@ static void transcode_audio_close( sout_stream_t *p_stream, module_Unneed( id->pp_filter[i], id->pp_filter[i]->p_module ); vlc_object_destroy( id->pp_filter[i] ); } + 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] ); + } } static int transcode_audio_process( sout_stream_t *p_stream, @@ -1419,12 +1539,18 @@ 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 )) ) { - stats_UpdateInteger( p_stream->p_parent->p_parent, STATS_DECODED_AUDIO, - 1, NULL ); + if( p_input ) + stats_UpdateInteger( p_input, p_input->p->counters.p_decoded_audio, + 1, NULL ); if( p_sys->b_master_sync ) { mtime_t i_dts = date_Get( &id->interpolated_pts ) + 1; @@ -1457,6 +1583,14 @@ static int transcode_audio_process( sout_stream_t *p_stream, p_audio_block ); } + /* Run user specified filter chain */ + for( i = 0; i < id->i_ufilter; i++ ) + { + p_audio_block = + id->pp_ufilter[i]->pf_audio_filter( id->pp_ufilter[i], + p_audio_block ); + } + p_audio_buf->p_buffer = p_audio_block->p_buffer; p_audio_buf->i_nb_bytes = p_audio_block->i_buffer; p_audio_buf->i_nb_samples = p_audio_block->i_samples; @@ -1501,6 +1635,7 @@ 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; p_buffer->pf_release = audio_release_buffer; p_buffer->p_sys = p_block = block_New( p_dec, i_size ); @@ -1526,11 +1661,9 @@ 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; int i; - /* - * Open decoder + /* Open decoder + * Initialization of decoder structures */ - - /* Initialization of decoder structures */ 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; @@ -1598,7 +1731,11 @@ static int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id ) * We'll open it only when we have the first frame. */ module_Unneed( id->p_encoder, id->p_encoder->p_module ); if( id->p_encoder->fmt_out.p_extra ) + { free( id->p_encoder->fmt_out.p_extra ); + id->p_encoder->fmt_out.p_extra = NULL; + id->p_encoder->fmt_out.i_extra = 0; + } id->p_encoder->p_module = NULL; if( p_sys->i_threads >= 1 ) @@ -1632,7 +1769,6 @@ static int transcode_video_encoder_open( sout_stream_t *p_stream, sout_stream_sys_t *p_sys = p_stream->p_sys; /* Calculate scaling, padding, cropping etc. */ - /* width/height of source */ int i_src_width = id->p_decoder->fmt_out.video.i_width; int i_src_height = id->p_decoder->fmt_out.video.i_height; @@ -1711,10 +1847,10 @@ static int transcode_video_encoder_open( sout_stream_t *p_stream, / p_sys->i_crop_height; } - /* check maxwidth and maxheight */ - /* note: maxwidth and maxheight currently does not handle - * canvas and padding, just scaling and cropping. */ - + /* check maxwidth and maxheight + * note: maxwidth and maxheight currently does not handle + * canvas and padding, just scaling and cropping. + */ if( p_sys->i_maxwidth && f_scale_width > (float)p_sys->i_maxwidth / p_sys->i_crop_width ) { @@ -1730,8 +1866,9 @@ static int transcode_video_encoder_open( sout_stream_t *p_stream, f_aspect = f_aspect * f_scale_height / f_scale_width; msg_Dbg( p_stream, "scaled pixel aspect is %f:1", f_aspect ); - /* Correct scaling for target aspect ratio */ - /* Shrink video if necessary */ + /* Correct scaling for target aspect ratio + * Shrink video if necessary + */ if ( p_sys->i_canvas_aspect > 0 ) { float f_target_aspect = (float)p_sys->i_canvas_aspect / @@ -1758,10 +1895,9 @@ static int transcode_video_encoder_open( sout_stream_t *p_stream, } /* f_scale_width and f_scale_height are now final */ - - /* Calculate width, height from scaling */ - /* Make sure its multiple of 2 */ - + /* Calculate width, height from scaling + * Make sure its multiple of 2 + */ i_dst_width = 2 * (int)( p_sys->i_crop_width * f_scale_width / 2 + 0.5 ); i_dst_height = 2 * (int)( p_sys->i_crop_height * f_scale_height / 2 + 0.5 ); @@ -1772,7 +1908,6 @@ static int transcode_video_encoder_open( sout_stream_t *p_stream, p_sys->i_dst_y_offset = 0; /* Handle canvas and padding */ - if( p_sys->i_canvas_width <= 0 ) { /* No canvas width set, add explicit padding border */ @@ -1783,7 +1918,6 @@ static int transcode_video_encoder_open( sout_stream_t *p_stream, else { /* Canvas set, check if we have to padd or crop */ - if( p_sys->i_canvas_width < p_sys->i_nopadd_width ) { /* need to crop more, but keep same scaling */ @@ -1815,7 +1949,6 @@ static int transcode_video_encoder_open( sout_stream_t *p_stream, else { /* Canvas set, check if we have to padd or crop */ - if( p_sys->i_canvas_height < p_sys->i_nopadd_height ) { /* need to crop more, but keep same scaling */ @@ -1838,9 +1971,7 @@ static int transcode_video_encoder_open( sout_stream_t *p_stream, } } - /* Change aspect ratio from scaled pixel to output frame */ - f_aspect = f_aspect * i_dst_width / i_dst_height; /* Store calculated values */ @@ -1933,7 +2064,7 @@ static void transcode_video_close( sout_stream_t *p_stream, if( p_stream->p_sys->i_threads >= 1 ) { vlc_mutex_lock( &p_stream->p_sys->lock_out ); - p_stream->p_sys->b_die = 1; + vlc_object_kill( p_stream->p_sys ); vlc_cond_signal( &p_stream->p_sys->cond ); vlc_mutex_unlock( &p_stream->p_sys->lock_out ); vlc_thread_join( p_stream->p_sys ); @@ -1976,25 +2107,26 @@ static void transcode_video_close( sout_stream_t *p_stream, id->pp_filter[i]->p_owner->pp_pics[j] ); } free( id->pp_filter[i]->p_owner ); - vlc_object_destroy( id->pp_filter[i] ); + id->pp_filter[i] = NULL; } - for( i = 0; i < id->i_vfilter; i++ ) + + for( i = 0; i < id->i_ufilter; i++ ) { - vlc_object_detach( id->pp_vfilter[i] ); - if( id->pp_vfilter[i]->p_module ) - module_Unneed( id->pp_vfilter[i], id->pp_vfilter[i]->p_module ); + 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_vfilter[i]->p_owner->pp_pics[j] ) - video_del_buffer( VLC_OBJECT(id->pp_vfilter[i]), - id->pp_vfilter[i]->p_owner->pp_pics[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_vfilter[i]->p_owner ); - - vlc_object_destroy( id->pp_vfilter[i] ); + free( id->pp_ufilter[i]->p_owner ); + vlc_object_destroy( id->pp_ufilter[i] ); + id->pp_ufilter[i] = NULL; } } @@ -2006,12 +2138,18 @@ 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 = 0; - stats_UpdateInteger( p_stream->p_parent->p_parent, STATS_DECODED_VIDEO, - 1, NULL ); + subpicture_t *p_subpic = NULL; + if( p_input ) + stats_UpdateInteger( p_input, p_input->p->counters.p_decoded_video, + 1, NULL ); if( p_stream->p_sout->i_out_pace_nocontrol && p_sys->b_hurry_up ) { @@ -2045,7 +2183,7 @@ static int transcode_video_process( sout_stream_t *p_stream, /* Set the pts of the frame being encoded */ p_pic->date = i_pts; - if( i_video_drift < i_master_drift - 50000 ) + if( i_video_drift < (i_master_drift - 50000) ) { #if 0 msg_Dbg( p_stream, "dropping frame (%i)", @@ -2054,7 +2192,7 @@ static int transcode_video_process( sout_stream_t *p_stream, p_pic->pf_release( p_pic ); continue; } - else if( i_video_drift > i_master_drift + 50000 ) + else if( i_video_drift > (i_master_drift + 50000) ) { #if 0 msg_Dbg( p_stream, "adding frame (%i)", @@ -2091,7 +2229,8 @@ static int transcode_video_process( sout_stream_t *p_stream, 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, 0 ); + "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 = @@ -2113,11 +2252,11 @@ static int transcode_video_process( sout_stream_t *p_stream, /* 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 || - + (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) @@ -2135,7 +2274,6 @@ static int transcode_video_process( sout_stream_t *p_stream, id->pp_filter[id->i_filter]->fmt_out = id->p_encoder->fmt_in; id->pp_filter[id->i_filter]->p_cfg = NULL; - 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; @@ -2172,38 +2310,38 @@ static int transcode_video_process( sout_stream_t *p_stream, } } - for( i = 0; i < p_sys->i_vfilters; i++ ) + for( i = 0; (i < p_sys->i_vfilters) && (id->i_ufilter < TRANSCODE_FILTERS); i++ ) { - id->pp_vfilter[id->i_vfilter] = + id->pp_ufilter[id->i_ufilter] = vlc_object_create( p_stream, VLC_OBJECT_FILTER ); - vlc_object_attach( id->pp_vfilter[id->i_vfilter], p_stream ); + vlc_object_attach( id->pp_ufilter[id->i_ufilter], p_stream ); - id->pp_vfilter[id->i_vfilter]->pf_vout_buffer_new = + id->pp_ufilter[id->i_ufilter]->pf_vout_buffer_new = video_new_buffer_filter; - id->pp_vfilter[id->i_vfilter]->pf_vout_buffer_del = + id->pp_ufilter[id->i_ufilter]->pf_vout_buffer_del = video_del_buffer_filter; - id->pp_vfilter[id->i_vfilter]->fmt_in = id->p_encoder->fmt_in; - id->pp_vfilter[id->i_vfilter]->fmt_out = id->p_encoder->fmt_in; - id->pp_vfilter[id->i_vfilter]->p_cfg = p_sys->p_vfilters_cfg[i]; - id->pp_vfilter[id->i_vfilter]->p_module = - module_Need( id->pp_vfilter[id->i_vfilter], - "video filter2", p_sys->psz_vfilters[i], 0 ); - if( id->pp_vfilter[id->i_vfilter]->p_module ) + 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_vfilter[id->i_vfilter]->p_owner = + id->pp_ufilter[id->i_ufilter]->p_owner = malloc( sizeof(filter_owner_sys_t) ); for( i = 0; i < PICTURE_RING_SIZE; i++ ) - id->pp_vfilter[id->i_vfilter]->p_owner->pp_pics[i] = 0; - id->pp_vfilter[id->i_vfilter]->p_owner->p_sys = p_sys; - - id->i_vfilter++; + id->pp_ufilter[id->i_ufilter]->p_owner->pp_pics[i] = 0; + id->pp_ufilter[id->i_ufilter]->p_owner->p_sys = p_sys; + id->i_ufilter++; } else { msg_Dbg( p_stream, "no video filter found" ); - vlc_object_detach( id->pp_vfilter[id->i_vfilter] ); - vlc_object_destroy( id->pp_vfilter[id->i_vfilter] ); + 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; } } } @@ -2221,7 +2359,8 @@ static int transcode_video_process( sout_stream_t *p_stream, /* Check if we have a subpicture to overlay */ if( p_sys->p_spu ) { - p_subpic = spu_SortSubpictures( p_sys->p_spu, p_pic->date ); + p_subpic = spu_SortSubpictures( p_sys->p_spu, p_pic->date, + VLC_FALSE /* Fixme: check if stream is paused */ ); /* TODO: get another pic */ } @@ -2262,10 +2401,11 @@ static int transcode_video_process( sout_stream_t *p_stream, i_scale_width, i_scale_height ); } - /* Run vfilter chain */ - for( i = 0; i < id->i_vfilter; i++ ) + /* Run user specified filter chain */ + for( i = 0; i < id->i_ufilter; i++ ) { - p_pic = id->pp_vfilter[i]->pf_video_filter(id->pp_vfilter[i], p_pic); + p_pic = id->pp_ufilter[i]->pf_video_filter( id->pp_ufilter[i], + p_pic ); } if( p_sys->i_threads == 0 ) @@ -2291,8 +2431,8 @@ static int transcode_video_process( sout_stream_t *p_stream, if( p_sys->b_master_sync && i_duplicate > 1 ) { mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1; - if ( p_pic->date - i_pts > MASTER_SYNC_MAX_DRIFT - || p_pic->date - i_pts < -MASTER_SYNC_MAX_DRIFT ) + if( (p_pic->date - i_pts > MASTER_SYNC_MAX_DRIFT) + || ((p_pic->date - i_pts) < -MASTER_SYNC_MAX_DRIFT) ) { msg_Dbg( p_stream, "drift is too high, resetting master sync" ); date_Set( &id->interpolated_pts, p_pic->date ); @@ -2373,7 +2513,6 @@ static int EncoderThread( sout_stream_sys_t *p_sys ) block_ChainAppend( &p_sys->p_buffers, p_block ); vlc_mutex_unlock( &p_sys->lock_out ); - p_pic->pf_release( p_pic ); } @@ -2381,10 +2520,8 @@ static int EncoderThread( sout_stream_sys_t *p_sys ) { p_pic = p_sys->pp_pics[p_sys->i_first_pic++]; p_sys->i_first_pic %= PICTURE_RING_SIZE; - p_pic->pf_release( p_pic ); } - block_ChainRelease( p_sys->p_buffers ); return 0; @@ -2484,7 +2621,6 @@ static picture_t *video_new_buffer( vlc_object_t *p_this, picture_t **pp_ring, p_pic->i_status = RESERVED_PICTURE; pp_ring[i] = p_pic; - return p_pic; } @@ -2561,10 +2697,7 @@ static int transcode_spu_new( sout_stream_t *p_stream, sout_stream_id_t *id ) if( !p_sys->b_soverlay ) { - /* - * Open encoder - */ - + /* Open encoder */ /* Initialization of encoder format structures */ es_format_Init( &id->p_encoder->fmt_in, id->p_decoder->fmt_in.i_cat, id->p_decoder->fmt_in.i_codec ); @@ -2698,10 +2831,7 @@ static int transcode_osd_new( sout_stream_t *p_stream, sout_stream_id_t *id ) /* Complete destination format */ id->p_encoder->fmt_out.i_codec = p_sys->i_osdcodec; - /* - * Open encoder - */ - + /* 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 ); @@ -2796,7 +2926,7 @@ 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 ); + p_subpic = spu_SortSubpictures( p_sys->p_spu, in->i_dts, VLC_FALSE ); } else {