/*****************************************************************************
* 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>
* Gildas Bazin <gbazin@videolan.org>
* Jean-Paul Saman <jpsaman #_at_# m2x dot nl>
+ * Antoine Cellerier <dionoea at videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_sout.h>
#include <vlc_aout.h>
#include <vlc_vout.h>
#include <vlc_codec.h>
+#include <vlc_meta.h>
#include <vlc_block.h>
#include <vlc_filter.h>
#include <vlc_osd.h>
#define MASTER_SYNC_MAX_DRIFT 100000
-/* FIXME Ugly */
-#include "../../src/input/input_internal.h"
+#include <assert.h>
/*****************************************************************************
* Module descriptor
"Video filters will be applied to the video streams (after overlays " \
"are applied). You must enter a comma-separated list of filters." )
-#define CROPTOP_TEXT N_("Video crop (top)")
-#define CROPTOP_LONGTEXT N_( \
- "Number of pixels to crop at the top of the video." )
-#define CROPLEFT_TEXT N_("Video crop (left)")
-#define CROPLEFT_LONGTEXT N_( \
- "Number of pixels to crop at the left of the video." )
-#define CROPBOTTOM_TEXT N_("Video crop (bottom)")
-#define CROPBOTTOM_LONGTEXT N_( \
- "Number of pixels to crop at the bottom of the video." )
-#define CROPRIGHT_TEXT N_("Video crop (right)")
-#define CROPRIGHT_LONGTEXT N_( \
- "Number of pixels to crop at the right of the video." )
-
-#define PADDTOP_TEXT N_("Video padding (top)")
-#define PADDTOP_LONGTEXT N_( \
- "Size of the black border to add at the top of the video." )
-#define PADDLEFT_TEXT N_("Video padding (left)")
-#define PADDLEFT_LONGTEXT N_( \
- "Size of the black border to add at the left of the video." )
-#define PADDBOTTOM_TEXT N_("Video padding (bottom)")
-#define PADDBOTTOM_LONGTEXT N_( \
- "Size of the black border to add at the bottom of the video." )
-#define PADDRIGHT_TEXT N_("Video padding (right)")
-#define PADDRIGHT_LONGTEXT N_( \
- "Size of the black border to add at the right of the video." )
-
-#define CANVAS_WIDTH_TEXT N_("Video canvas width")
-#define CANVAS_WIDTH_LONGTEXT N_( \
- "This will automatically crod and pad the video to a specified width." )
-#define CANVAS_HEIGHT_TEXT N_("Video canvas height")
-#define CANVAS_HEIGHT_LONGTEXT N_( \
- "This will automatically crod and pad the video to a specified height." )
-#define CANVAS_ASPECT_TEXT N_("Video canvas aspect ratio")
-#define CANVAS_ASPECT_LONGTEXT N_( \
- "This sets aspect (like 4:3) of the video canvas and letterbox the video "\
- "accordingly." )
-
#define AENC_TEXT N_("Audio encoder")
#define AENC_LONGTEXT N_( \
"This is the audio encoder module that will be used (and its associated "\
#define HURRYUP_LONGTEXT N_( "The transcoder will drop frames if your CPU " \
"can't keep up with the encoding rate." )
-static const char *ppsz_deinterlace_type[] =
+static const char *const ppsz_deinterlace_type[] =
{
"deinterlace", "ffmpeg-deinterlace"
};
#define SOUT_CFG_PREFIX "sout-transcode-"
-vlc_module_begin();
- set_shortname( _("Transcode"));
- set_description( _("Transcode stream output") );
- set_capability( "sout stream", 50 );
- add_shortcut( "transcode" );
- set_callbacks( Open, Close );
- set_category( CAT_SOUT );
- set_subcategory( SUBCAT_SOUT_STREAM );
- set_section( N_("Video"), NULL );
+vlc_module_begin ()
+ set_shortname( N_("Transcode"))
+ set_description( N_("Transcode stream output") )
+ set_capability( "sout stream", 50 )
+ add_shortcut( "transcode" )
+ set_callbacks( Open, Close )
+ set_category( CAT_SOUT )
+ 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 );
-
- add_integer( SOUT_CFG_PREFIX "croptop", 0, NULL, CROPTOP_TEXT,
- CROPTOP_LONGTEXT, VLC_TRUE );
- add_integer( SOUT_CFG_PREFIX "cropleft", 0, NULL, CROPLEFT_TEXT,
- CROPLEFT_LONGTEXT, VLC_TRUE );
- add_integer( SOUT_CFG_PREFIX "cropbottom", 0, NULL, CROPBOTTOM_TEXT,
- CROPBOTTOM_LONGTEXT, VLC_TRUE );
- add_integer( SOUT_CFG_PREFIX "cropright", 0, NULL, CROPRIGHT_TEXT,
- CROPRIGHT_LONGTEXT, VLC_TRUE );
-
- add_integer( SOUT_CFG_PREFIX "paddtop", 0, NULL, PADDTOP_TEXT,
- PADDTOP_LONGTEXT, VLC_TRUE );
- add_integer( SOUT_CFG_PREFIX "paddleft", 0, NULL, PADDLEFT_TEXT,
- PADDLEFT_LONGTEXT, VLC_TRUE );
- add_integer( SOUT_CFG_PREFIX "paddbottom", 0, NULL, PADDBOTTOM_TEXT,
- PADDBOTTOM_LONGTEXT, VLC_TRUE );
- add_integer( SOUT_CFG_PREFIX "paddright", 0, NULL, PADDRIGHT_TEXT,
- PADDRIGHT_LONGTEXT, VLC_TRUE );
-
- add_integer( SOUT_CFG_PREFIX "canvas-width", 0, NULL, CANVAS_WIDTH_TEXT,
- CANVAS_WIDTH_LONGTEXT, VLC_TRUE );
- add_integer( SOUT_CFG_PREFIX "canvas-height", 0, NULL, CANVAS_HEIGHT_TEXT,
- CANVAS_HEIGHT_LONGTEXT, VLC_TRUE );
- add_string( SOUT_CFG_PREFIX "canvas-aspect", NULL, NULL, CANVAS_ASPECT_TEXT,
- CANVAS_ASPECT_LONGTEXT, VLC_FALSE );
-
- set_section( N_("Audio"), NULL );
+ VFILTER_TEXT, VFILTER_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 );
+ 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 );
+ 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 );
+ 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();
+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",
+static const char *const ppsz_sout_options[] = {
+ "venc", "vcodec", "vb",
"scale", "fps", "width", "height", "vfilter", "deinterlace",
"deinterlace-module", "threads", "hurry-up", "aenc", "acodec", "ab",
"afilter", "samplerate", "channels", "senc", "scodec", "soverlay",
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 int transcode_video_new ( sout_stream_t *, sout_stream_id_t * );
static void transcode_video_close ( sout_stream_t *, sout_stream_id_t * );
+static void transcode_video_encoder_init( sout_stream_t *, sout_stream_id_t *);
static int transcode_video_encoder_open( sout_stream_t *, sout_stream_id_t *);
static int transcode_video_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 ** );
static int transcode_osd_process( sout_stream_t *, sout_stream_id_t *,
block_t *, block_t ** );
-static int EncoderThread( struct sout_stream_sys_t * p_sys );
+static void* EncoderThread( vlc_object_t * p_this );
-static int pi_channels_maps[6] =
+static const int pi_channels_maps[6] =
{
0,
AOUT_CHAN_CENTER, AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
#define PICTURE_RING_SIZE 64
#define SUBPICTURE_RING_SIZE 20
-#define TRANSCODE_FILTERS 10
+
+#define ENC_FRAMERATE (25 * 1000 + .5)
+#define ENC_FRAMERATE_BASE 1000
struct sout_stream_sys_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];
- int i_afilters;
+
+ char *psz_af2;
/* Video */
vlc_fourcc_t i_vcodec; /* codec video (0 if not transcode) */
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;
- char *psz_vfilters[TRANSCODE_FILTERS];
- config_chain_t *p_vfilters_cfg[TRANSCODE_FILTERS];
- int i_vfilters;
-
- int i_crop_top;
- int i_crop_bottom;
- int i_crop_right;
- int i_crop_left;
-
- int i_padd_top;
- int i_padd_bottom;
- int i_padd_right;
- int i_padd_left;
-
- int i_canvas_width;
- int i_canvas_height;
- int i_canvas_aspect;
-
- /* Video, calculated */
- int i_src_x_offset;
- int i_src_y_offset;
- int i_crop_width;
- int i_crop_height;
-
- int i_dst_x_offset;
- int i_dst_y_offset;
- int i_nopadd_width;
- int i_nopadd_height;
+ bool b_high_priority;
+ bool b_hurry_up;
+
+ char *psz_vf2;
/* 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;
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_osd; /* VLC_TRUE when osd es is registered */
+ 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;
}
var_Get( p_stream, SOUT_CFG_PREFIX "afilter", &val );
- p_sys->i_afilters = 0;
if( val.psz_string && *val.psz_string )
+ p_sys->psz_af2 = val.psz_string;
+ else
{
- 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;
+ free( val.psz_string );
+ p_sys->psz_af2 = NULL;
}
/* Video transcoding parameters */
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;
p_sys->i_maxheight = val.i_int;
var_Get( p_stream, SOUT_CFG_PREFIX "vfilter", &val );
- p_sys->i_vfilters = 0;
if( val.psz_string && *val.psz_string )
+ p_sys->psz_vf2 = val.psz_string;
+ else
{
- char *psz_parser = val.psz_string;
-
- while( (psz_parser != NULL) && (*psz_parser != '\0')
- && (p_sys->i_vfilters < TRANSCODE_FILTERS) )
- {
- psz_parser = config_ChainCreate(
- &p_sys->psz_vfilters[p_sys->i_vfilters],
- &p_sys->p_vfilters_cfg[p_sys->i_vfilters],
- psz_parser );
- p_sys->i_vfilters++;
- if( psz_parser != NULL && *psz_parser != '\0' ) psz_parser++;
- }
- }
- if( val.psz_string ) free( val.psz_string );
- 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;
+ free( val.psz_string );
+ p_sys->psz_vf2 = NULL;
}
var_Get( p_stream, SOUT_CFG_PREFIX "deinterlace", &val );
psz_next = config_ChainCreate( &p_sys->psz_deinterlace,
&p_sys->p_deinterlace_cfg,
val.psz_string );
- if( psz_next ) free( psz_next );
- }
- if( val.psz_string ) free( val.psz_string );
-
- var_Get( p_stream, SOUT_CFG_PREFIX "croptop", &val );
- p_sys->i_crop_top = val.i_int;
- var_Get( p_stream, SOUT_CFG_PREFIX "cropbottom", &val );
- p_sys->i_crop_bottom = val.i_int;
- var_Get( p_stream, SOUT_CFG_PREFIX "cropleft", &val );
- p_sys->i_crop_left = val.i_int;
- var_Get( p_stream, SOUT_CFG_PREFIX "cropright", &val );
- p_sys->i_crop_right = val.i_int;
-
- var_Get( p_stream, SOUT_CFG_PREFIX "paddtop", &val );
- p_sys->i_padd_top = val.i_int;
- var_Get( p_stream, SOUT_CFG_PREFIX "paddbottom", &val );
- p_sys->i_padd_bottom = val.i_int;
- var_Get( p_stream, SOUT_CFG_PREFIX "paddleft", &val );
- 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 );
- 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 );
-
+ free( psz_next );
}
- 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_osd = VLC_FALSE;
+ p_sys->b_osd = false;
var_Get( p_stream, SOUT_CFG_PREFIX "osd", &val );
if( val.b_bool )
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;
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 )
- {
- 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 );
-
- p_sys->p_audio_cfg = p_next;
- }
- 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 )
- {
- config_chain_t *p_next = p_sys->p_video_cfg->p_next;
+ free( p_sys->psz_af2 );
- 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 );
+ config_ChainDestroy( p_sys->p_audio_cfg );
+ free( p_sys->psz_aenc );
- p_sys->p_video_cfg = p_next;
- }
- if( p_sys->psz_venc ) free( p_sys->psz_venc );
+ free( p_sys->psz_vf2 );
- while( p_sys->p_deinterlace_cfg != NULL )
- {
- config_chain_t *p_next = p_sys->p_deinterlace_cfg->p_next;
+ config_ChainDestroy( p_sys->p_video_cfg );
+ free( p_sys->psz_venc );
- 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 );
-
- p_sys->p_deinterlace_cfg = p_next;
- }
- if( 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;
+ config_ChainDestroy( p_sys->p_deinterlace_cfg );
+ free( p_sys->psz_deinterlace );
- 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 );
-
- p_sys->p_spu_cfg = p_next;
- }
- if( p_sys->psz_senc ) free( p_sys->psz_senc );
+ config_ChainDestroy( p_sys->p_spu_cfg );
+ free( p_sys->psz_senc );
if( p_sys->p_spu ) spu_Destroy( p_sys->p_spu );
- while( p_sys->p_osd_cfg != NULL )
- {
- 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 );
+ config_ChainDestroy( p_sys->p_osd_cfg );
+ free( p_sys->psz_osdenc );
- p_sys->p_osd_cfg = p_next;
- }
- if( p_sys->psz_osdenc ) free( p_sys->psz_osdenc );
-
- vlc_object_destroy( p_sys );
+ vlc_object_release( p_sys );
}
struct sout_stream_id_t
{
- vlc_fourcc_t b_transcode;
+ bool b_transcode;
/* id of the out stream */
void *id;
decoder_t *p_decoder;
/* Filters */
- filter_t *pp_filter[TRANSCODE_FILTERS];
- int i_filter;
+ filter_chain_t *p_f_chain;
/* User specified filters */
- filter_t *pp_ufilter[TRANSCODE_FILTERS];
- int i_ufilter;
+ filter_chain_t *p_uf_chain;
/* Encoder */
encoder_t *p_encoder;
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_stream_id_t *id;
- id = malloc( sizeof( sout_stream_id_t ) );
+ id = calloc( 1, 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;
id->p_decoder = NULL;
/* Create decoder object */
id->p_decoder = vlc_object_create( p_stream, VLC_OBJECT_DECODER );
if( !id->p_decoder )
- {
- msg_Err( p_stream, "out of memory" );
goto error;
- }
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 );
+ id->p_encoder = sout_EncoderCreate( p_stream );
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;
/* 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->id = sout_StreamIdAdd( p_sys->p_out, &id->p_encoder->fmt_out );
+ 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 =
- (p_sys->f_fps * 1001) + 0.5;
- id->p_encoder->fmt_out.video.i_frame_rate_base = 1001;
+ (p_sys->f_fps * 1000) + 0.5;
+ id->p_encoder->fmt_out.video.i_frame_rate_base =
+ ENC_FRAMERATE_BASE;
}
}
else if( ( p_fmt->i_cat == SPU_ES ) &&
}
/* 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->id = sout_StreamIdAdd( p_sys->p_out, &id->p_encoder->fmt_out );
+ 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 ) )
"to fcc=`%4.4s'", (char*)&p_fmt->i_codec,
(char*)&p_sys->i_scodec );
- id->b_transcode = VLC_TRUE;
+ 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 = VLC_TRUE;
+ 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->id = sout_StreamIdAdd( p_sys->p_out, p_fmt );
+ id->b_transcode = false;
if( !id->id ) goto error;
}
return id;
- error:
- if( id->p_decoder )
+error:
+ if( id )
{
- vlc_object_detach( id->p_decoder );
- vlc_object_destroy( id->p_decoder );
- id->p_decoder = NULL;
- }
+ if( id->p_decoder )
+ {
+ vlc_object_detach( id->p_decoder );
+ vlc_object_release( id->p_decoder );
+ id->p_decoder = NULL;
+ }
- if( id->p_encoder )
- {
- vlc_object_detach( id->p_encoder );
- es_format_Clean( &id->p_encoder->fmt_out );
- vlc_object_destroy( id->p_encoder );
- id->p_encoder = NULL;
- }
+ if( id->p_encoder )
+ {
+ vlc_object_detach( id->p_encoder );
+ es_format_Clean( &id->p_encoder->fmt_out );
+ vlc_object_release( id->p_encoder );
+ id->p_encoder = NULL;
+ }
- free( id );
+ free( id );
+ }
return NULL;
}
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 );
if( p_sys->b_osd )
transcode_osd_close( p_stream, id );
else
- transcode_spu_close( p_stream, id );
+ transcode_spu_close( id );
break;
}
}
- if( id->id ) p_sys->p_out->pf_del( p_sys->p_out, id->id );
+ if( id->id ) sout_StreamIdDel( p_sys->p_out, id->id );
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 );
sout_stream_sys_t *p_sys = p_stream->p_sys;
block_t *p_out = NULL;
- if( !id->b_transcode && id->id )
- {
- return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer );
- }
- else if( !id->b_transcode )
+ if( !id->b_transcode )
{
+ if( id->id )
+ return sout_StreamIdSend( p_sys->p_out, id->id, p_buffer );
+
block_Release( p_buffer );
return VLC_EGENERIC;
}
break;
}
- if( p_out ) return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_out );
+ if( p_out )
+ return sout_StreamIdSend( p_sys->p_out, id->id, p_out );
return VLC_SUCCESS;
}
/****************************************************************************
- * decoder reencoder part
+ * decoder helper
****************************************************************************/
-static int audio_BitsPerSample( vlc_fourcc_t i_format )
+static inline void video_timer_start( encoder_t * p_encoder )
{
- switch( i_format )
- {
- case VLC_FOURCC('u','8',' ',' '):
- case VLC_FOURCC('s','8',' ',' '):
- return 8;
-
- case VLC_FOURCC('u','1','6','l'):
- case VLC_FOURCC('s','1','6','l'):
- case VLC_FOURCC('u','1','6','b'):
- case VLC_FOURCC('s','1','6','b'):
- return 16;
-
- case VLC_FOURCC('u','2','4','l'):
- case VLC_FOURCC('s','2','4','l'):
- case VLC_FOURCC('u','2','4','b'):
- case VLC_FOURCC('s','2','4','b'):
- return 24;
+ stats_TimerStart( p_encoder, "encoding video frame",
+ STATS_TIMER_VIDEO_FRAME_ENCODING );
+}
- case VLC_FOURCC('u','3','2','l'):
- case VLC_FOURCC('s','3','2','l'):
- case VLC_FOURCC('u','3','2','b'):
- case VLC_FOURCC('s','3','2','b'):
- case VLC_FOURCC('f','l','3','2'):
- case VLC_FOURCC('f','i','3','2'):
- return 32;
+static inline void video_timer_stop( encoder_t * p_encoder )
+{
+ stats_TimerStop( p_encoder, STATS_TIMER_VIDEO_FRAME_ENCODING );
+}
- case VLC_FOURCC('f','l','6','4'):
- return 64;
- }
+static inline void video_timer_close( encoder_t * p_encoder )
+{
+ stats_TimerDump( p_encoder, STATS_TIMER_VIDEO_FRAME_ENCODING );
+ stats_TimerClean( p_encoder, STATS_TIMER_VIDEO_FRAME_ENCODING );
+}
- return 0;
+static inline void audio_timer_start( encoder_t * p_encoder )
+{
+ stats_TimerStart( p_encoder, "encoding audio frame",
+ STATS_TIMER_AUDIO_FRAME_ENCODING );
}
-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,
- char *psz_name )
+static inline void audio_timer_stop( encoder_t * p_encoder )
{
- sout_stream_sys_t *p_sys = p_stream->p_sys;
- filter_t *p_filter = vlc_object_create( p_stream, VLC_OBJECT_FILTER );
+ stats_TimerStop( p_encoder, STATS_TIMER_AUDIO_FRAME_ENCODING );
+}
- vlc_object_attach( p_filter, p_stream );
- p_filter->pf_audio_buffer_new = (block_t* (*) (filter_t*, int))__block_New;
+static inline void audio_timer_close( encoder_t * p_encoder )
+{
+ stats_TimerDump( p_encoder, STATS_TIMER_AUDIO_FRAME_ENCODING );
+ stats_TimerClean( p_encoder, STATS_TIMER_AUDIO_FRAME_ENCODING );
+}
- 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];
+/****************************************************************************
+ * decoder reencoder part
+ ****************************************************************************/
- 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 =
- audio_BitsPerSample( p_filter->fmt_out.i_codec );
- *p_fmt_in = p_filter->fmt_out;
- }
- else
- {
- vlc_object_detach( p_filter );
- vlc_object_destroy( p_filter );
- p_filter = 0;
- }
+static block_t *transcode_audio_alloc( filter_t *p_filter, int size )
+{
+ VLC_UNUSED( p_filter );
+ return block_Alloc( size );
+}
- return p_filter;
+static int transcode_audio_filter_allocation_init( filter_t *p_filter,
+ void *data )
+{
+ VLC_UNUSED(data);
+ p_filter->pf_audio_buffer_new = transcode_audio_alloc;
+ return VLC_SUCCESS;
}
static int transcode_audio_new( sout_stream_t *p_stream,
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; */
id->p_decoder->p_module =
- module_Need( id->p_decoder, "decoder", "$codec", 0 );
+ module_need( id->p_decoder, "decoder", "$codec", false );
if( !id->p_decoder->p_module )
{
- msg_Err( p_stream, "cannot find decoder" );
+ msg_Err( p_stream, "cannot find audio decoder" );
return VLC_EGENERIC;
}
id->p_decoder->fmt_out.audio.i_bitspersample =
- audio_BitsPerSample( id->p_decoder->fmt_out.i_codec );
+ aout_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 */
if( !(id->p_decoder->fmt_in.i_codec == VLC_FOURCC('m','p','4','a') &&
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;
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_channels =
id->p_encoder->fmt_out.audio.i_channels;
id->p_encoder->fmt_in.audio.i_bitspersample =
- audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
+ aout_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 );
+ 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 );
- module_Unneed( id->p_decoder, id->p_decoder->p_module );
+ msg_Err( p_stream, "cannot find audio encoder (module:%s fourcc:%4.4s)",
+ p_sys->psz_aenc ? p_sys->psz_aenc : "any",
+ (char *)&p_sys->i_acodec );
+ module_unneed( id->p_decoder, id->p_decoder->p_module );
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 );
+ aout_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;
- }
+ /* Init filter chain */
+ id->p_f_chain = filter_chain_New( p_stream, "audio filter2", true,
+ transcode_audio_filter_allocation_init, NULL, NULL );
+ filter_chain_Reset( id->p_f_chain, &fmt_last, &id->p_encoder->fmt_in );
/* 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 )
{
/* We'll have to go through fl32 first */
- es_format_t fmt_out = id->p_encoder->fmt_in;
- 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, NULL );
-
- if( id->pp_filter[id->i_filter] ) id->i_filter++;
+ fmt_last.i_codec = fmt_last.audio.i_format = VLC_FOURCC('f','l','3','2');
+ fmt_last.audio.i_bitspersample = aout_BitsPerSample( fmt_last.i_codec );
+ filter_chain_AppendFilter( id->p_f_chain, NULL, NULL, NULL, &fmt_last );
+ fmt_last = *filter_chain_GetFmtOut( id->p_f_chain );
}
- for( i = 0; i < TRANSCODE_FILTERS; i++ )
+ for( i = 0; i < 4; 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) )
{
- id->pp_filter[id->i_filter] =
- transcode_audio_filter_new( p_stream, id, &fmt_last,
- &id->p_encoder->fmt_in, NULL );
-
- if( id->pp_filter[id->i_filter] )
- id->i_filter++;
- else
- break;
+ msg_Dbg( p_stream, "Looking for filter "
+ "(%4.4s->%4.4s, channels %d->%d, rate %d->%d)",
+ (char *)&fmt_last.i_codec,
+ (char *)&id->p_encoder->fmt_in.i_codec,
+ 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 );
+ filter_chain_AppendFilter( id->p_f_chain, NULL, NULL,
+ &fmt_last, &id->p_encoder->fmt_in );
+ fmt_last = *filter_chain_GetFmtOut( id->p_f_chain );
}
+ else break;
}
/* Final checks to see if conversions were successful */
if( fmt_last.i_codec != id->p_encoder->fmt_in.i_codec )
{
- msg_Err( p_stream, "no audio filter found (%4.4s->%4.4s)",
+ msg_Err( p_stream, "no audio filter found "
+ "(%4.4s->%4.4s, channels %d->%d, rate %d->%d)",
(char *)&fmt_last.i_codec,
- (char *)&id->p_encoder->fmt_in.i_codec );
- transcode_audio_close( p_stream, id );
+ (char *)&id->p_encoder->fmt_in.i_codec,
+ 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 );
+ transcode_audio_close( id );
return VLC_EGENERIC;
}
/* Load user specified audio filters now */
- for( i = 0; (i < p_sys->i_afilters) &&
- (id->i_ufilter < TRANSCODE_FILTERS); i++ )
+ if( p_sys->psz_af2 )
{
- 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;
+ id->p_uf_chain = filter_chain_New( p_stream, "audio filter2", false,
+ transcode_audio_filter_allocation_init, NULL, NULL );
+ filter_chain_Reset( id->p_uf_chain, &fmt_last, &id->p_encoder->fmt_in );
+ filter_chain_AppendFromString( id->p_uf_chain, p_sys->psz_af2 );
+ fmt_last = *filter_chain_GetFmtOut( id->p_uf_chain );
}
if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels )
{
#if 1
- module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ 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 */
/* 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 )
+ module_need( id->p_encoder, "encoder", p_sys->psz_aenc, true );
+ if( !id->p_encoder->p_module ||
+ fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ||
+ fmt_last.i_codec != id->p_encoder->fmt_in.i_codec )
{
- msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_aenc );
- transcode_audio_close( p_stream, id );
+ if( id->p_encoder->p_module )
+ {
+ module_unneed( id->p_encoder, id->p_encoder->p_module );
+ id->p_encoder->p_module = NULL;
+ }
+ msg_Err( p_stream, "cannot find audio encoder (module:%s fourcc:%4.4s)",
+ p_sys->psz_aenc ? p_sys->psz_aenc : "any",
+ (char *)&p_sys->i_acodec );
+ transcode_audio_close( 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 );
+ aout_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 );
+ 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;
+ audio_timer_close( id->p_encoder );
/* Close decoder */
if( id->p_decoder->p_module )
- module_Unneed( id->p_decoder, id->p_decoder->p_module );
+ module_unneed( id->p_decoder, id->p_decoder->p_module );
id->p_decoder->p_module = NULL;
+ if( id->p_decoder->p_description )
+ vlc_meta_Delete( id->p_decoder->p_description );
+ id->p_decoder->p_description = NULL;
+
/* Close encoder */
if( id->p_encoder->p_module )
- module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ module_unneed( id->p_encoder, id->p_encoder->p_module );
id->p_encoder->p_module = NULL;
/* 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 );
- 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] );
- }
+ if( id->p_f_chain )
+ filter_chain_Delete( id->p_f_chain );
+ if( id->p_uf_chain )
+ filter_chain_Delete( id->p_uf_chain );
}
static int transcode_audio_process( sout_stream_t *p_stream,
sout_stream_sys_t *p_sys = p_stream->p_sys;
aout_buffer_t *p_audio_buf;
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;
p_audio_block->i_samples = p_audio_buf->i_nb_samples;
/* Run filter chain */
- for( i = 0; i < id->i_filter; i++ )
- {
- p_audio_block =
- id->pp_filter[i]->pf_audio_filter( id->pp_filter[i],
- 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_block = filter_chain_AudioFilter( id->p_f_chain, p_audio_block );
+ if( id->p_uf_chain )
+ p_audio_block = filter_chain_AudioFilter( id->p_uf_chain, p_audio_block );
+ assert( 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->start_date = p_audio_block->i_dts;
p_audio_buf->end_date = p_audio_block->i_dts + p_audio_block->i_length;
+ audio_timer_start( id->p_encoder );
p_block = id->p_encoder->pf_encode_audio( id->p_encoder, p_audio_buf );
+ audio_timer_stop( id->p_encoder );
+
block_ChainAppend( out, p_block );
block_Release( p_audio_block );
free( p_audio_buf );
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) );
if( !p_buffer ) return NULL;
- p_buffer->b_discontinuity = VLC_FALSE;
+ 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 int transcode_video_filter_allocation_init( filter_t *p_filter,
+ void *p_data )
+{
+ sout_stream_sys_t *p_sys = (sout_stream_sys_t*)p_data;
+ int i;
+
+ p_filter->pf_vout_buffer_new = video_new_buffer_filter;
+ p_filter->pf_vout_buffer_del = video_del_buffer_filter;
+
+ p_filter->p_owner = malloc( sizeof(filter_owner_sys_t) );
+ if( !p_filter->p_owner )
+ return VLC_EGENERIC;
+
+ 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 VLC_SUCCESS;
+}
+
+static void transcode_video_filter_allocation_clear( filter_t *p_filter )
+{
+ int j;
+
+ /* 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 );
+}
+
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_decoder->pf_picture_unlink = video_unlink_picture_decoder;
id->p_decoder->p_owner = malloc( sizeof(decoder_owner_sys_t) );
+ if( !id->p_decoder->p_owner )
+ return VLC_EGENERIC;
+
for( i = 0; i < PICTURE_RING_SIZE; i++ )
id->p_decoder->p_owner->pp_pics[i] = 0;
id->p_decoder->p_owner->p_sys = p_sys;
/* id->p_decoder->p_cfg = p_sys->p_video_cfg; */
id->p_decoder->p_module =
- module_Need( id->p_decoder, "decoder", "$codec", 0 );
+ module_need( id->p_decoder, "decoder", "$codec", false );
if( !id->p_decoder->p_module )
{
- msg_Err( p_stream, "cannot find decoder" );
+ msg_Err( p_stream, "cannot find video decoder" );
+ free( id->p_decoder->p_owner );
return VLC_EGENERIC;
}
/* The dimensions will be set properly later on.
* Just put sensible values so we can test an encoder is available. */
id->p_encoder->fmt_in.video.i_width =
- id->p_encoder->fmt_out.video.i_width ?
- id->p_encoder->fmt_out.video.i_width :
- id->p_decoder->fmt_in.video.i_width ?
- id->p_decoder->fmt_in.video.i_width : 16;
+ id->p_encoder->fmt_out.video.i_width ?:
+ id->p_decoder->fmt_in.video.i_width ?: 16;
id->p_encoder->fmt_in.video.i_height =
- id->p_encoder->fmt_out.video.i_height ?
- id->p_encoder->fmt_out.video.i_height :
- id->p_decoder->fmt_in.video.i_height ?
- id->p_decoder->fmt_in.video.i_height : 16;
- id->p_encoder->fmt_in.video.i_frame_rate = 25;
- id->p_encoder->fmt_in.video.i_frame_rate_base = 1;
+ id->p_encoder->fmt_out.video.i_height ?:
+ id->p_decoder->fmt_in.video.i_height ?: 16;
+ id->p_encoder->fmt_in.video.i_frame_rate = ENC_FRAMERATE;
+ id->p_encoder->fmt_in.video.i_frame_rate_base = ENC_FRAMERATE_BASE;
id->p_encoder->i_threads = p_sys->i_threads;
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 );
- module_Unneed( id->p_decoder, id->p_decoder->p_module );
+ msg_Err( p_stream, "cannot find video encoder (module:%s fourcc:%4.4s)",
+ p_sys->psz_venc ? p_sys->psz_venc : "any",
+ (char *)&p_sys->i_vcodec );
+ module_unneed( id->p_decoder, id->p_decoder->p_module );
id->p_decoder->p_module = 0;
+ free( id->p_decoder->p_owner );
return VLC_EGENERIC;
}
/* Close the encoder.
* We'll open it only when we have the first frame. */
- module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ 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 );
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_cond_init( p_stream, &p_sys->cond );
+ vlc_mutex_init( &p_sys->lock_out );
+ vlc_cond_init( &p_sys->cond );
memset( p_sys->pp_pics, 0, sizeof(p_sys->pp_pics) );
p_sys->i_first_pic = 0;
p_sys->i_last_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 ) )
+ if( vlc_thread_create( p_sys, "encoder", EncoderThread, i_priority ) )
{
msg_Err( p_stream, "cannot spawn encoder thread" );
- module_Unneed( id->p_decoder, id->p_decoder->p_module );
+ module_unneed( id->p_decoder, id->p_decoder->p_module );
id->p_decoder->p_module = 0;
+ free( id->p_decoder->p_owner );
return VLC_EGENERIC;
}
}
return VLC_SUCCESS;
}
-static int transcode_video_encoder_open( sout_stream_t *p_stream,
- sout_stream_id_t *id )
+static void transcode_video_encoder_init( sout_stream_t *p_stream,
+ sout_stream_id_t *id )
{
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;
+ /* Calculate scaling
+ * 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;
- /* with/height scaling */
- float f_scale_width = 1;
- float f_scale_height = 1;
+ /* with/height scaling */
+ float f_scale_width = 1;
+ float f_scale_height = 1;
- /* width/height of output stream */
- int i_dst_width;
- int i_dst_height;
+ /* width/height of output stream */
+ int i_dst_width;
+ int i_dst_height;
- /* aspect ratio */
- float f_aspect = (float)id->p_decoder->fmt_out.video.i_aspect /
- VOUT_ASPECT_FACTOR;
+ /* aspect ratio */
+ float f_aspect = (float)id->p_decoder->fmt_out.video.i_aspect /
+ VOUT_ASPECT_FACTOR;
- msg_Dbg( p_stream, "decoder aspect is %i:%i",
- id->p_decoder->fmt_out.video.i_aspect, VOUT_ASPECT_FACTOR );
+ msg_Dbg( p_stream, "decoder aspect is %i:%i",
+ id->p_decoder->fmt_out.video.i_aspect, VOUT_ASPECT_FACTOR );
- /* Change f_aspect from source frame to source pixel */
- f_aspect = f_aspect * i_src_height / i_src_width;
- msg_Dbg( p_stream, "source pixel aspect is %f:1", f_aspect );
-
- /* width/height after cropping */
- p_sys->i_src_x_offset = p_sys->i_crop_left & ~1;
- p_sys->i_src_y_offset = p_sys->i_crop_top & ~1;
- p_sys->i_crop_width = i_src_width - ( p_sys->i_crop_left & ~1 ) -
- ( p_sys->i_crop_right & ~1 );
- p_sys->i_crop_height = i_src_height - ( p_sys->i_crop_top & ~1 ) -
- ( p_sys->i_crop_bottom & ~1 );
+ /* Change f_aspect from source frame to source pixel */
+ f_aspect = f_aspect * i_src_height / i_src_width;
+ msg_Dbg( p_stream, "source pixel aspect is %f:1", f_aspect );
/* Calculate scaling factor for specified parameters */
if( id->p_encoder->fmt_out.video.i_width <= 0 &&
id->p_encoder->fmt_out.video.i_height <= 0 )
{
/* Only width specified */
- f_scale_width = (float)id->p_encoder->fmt_out.video.i_width /
- p_sys->i_crop_width;
+ f_scale_width = (float)id->p_encoder->fmt_out.video.i_width/i_src_width;
f_scale_height = f_scale_width;
}
else if( id->p_encoder->fmt_out.video.i_width <= 0 &&
id->p_encoder->fmt_out.video.i_height > 0 )
{
/* Only height specified */
- f_scale_height = (float)id->p_encoder->fmt_out.video.i_height /
- p_sys->i_crop_height;
+ f_scale_height = (float)id->p_encoder->fmt_out.video.i_height/i_src_height;
f_scale_width = f_scale_height;
}
else if( id->p_encoder->fmt_out.video.i_width > 0 &&
id->p_encoder->fmt_out.video.i_height > 0 )
{
/* Width and height specified */
- f_scale_width = (float)id->p_encoder->fmt_out.video.i_width
- / p_sys->i_crop_width;
- f_scale_height = (float)id->p_encoder->fmt_out.video.i_height
- / p_sys->i_crop_height;
+ f_scale_width = (float)id->p_encoder->fmt_out.video.i_width/i_src_width;
+ f_scale_height = (float)id->p_encoder->fmt_out.video.i_height/i_src_height;
}
/* 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 )
+ i_src_width )
{
- f_scale_width = (float)p_sys->i_maxwidth / p_sys->i_crop_width;
+ f_scale_width = (float)p_sys->i_maxwidth / i_src_width;
}
+
if( p_sys->i_maxheight && f_scale_height > (float)p_sys->i_maxheight /
- p_sys->i_crop_height )
+ i_src_height )
{
- f_scale_height = (float)p_sys->i_maxheight / p_sys->i_crop_height;
+ f_scale_height = (float)p_sys->i_maxheight / i_src_height;
}
+
/* Change aspect ratio from source pixel to scaled pixel */
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
- */
- if ( p_sys->i_canvas_aspect > 0 )
- {
- float f_target_aspect = (float)p_sys->i_canvas_aspect /
- VOUT_ASPECT_FACTOR;
-
- if( p_sys->i_canvas_width > 0 && p_sys->i_canvas_height > 0)
- {
- /* Calculate pixel aspect of canvas */
- f_target_aspect = f_target_aspect / p_sys->i_canvas_width *
- p_sys->i_canvas_height;
- }
- if( f_target_aspect > f_aspect )
- {
- /* Reduce width scale to increase aspect */
- f_scale_width = f_scale_width * f_aspect / f_target_aspect;
- }
- else
- {
- /* Reduce height scale to decrease aspect */
- f_scale_height = f_scale_height * f_target_aspect / f_aspect;
- }
- f_aspect = f_target_aspect;
- msg_Dbg( p_stream, "canvas scaled pixel aspect is %f:1", f_aspect );
- }
-
/* f_scale_width and f_scale_height are now final */
/* 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 );
-
- p_sys->i_nopadd_width = i_dst_width;
- p_sys->i_nopadd_height = i_dst_height;
- p_sys->i_dst_x_offset = 0;
- 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 */
- i_dst_width = p_sys->i_nopadd_width + ( p_sys->i_padd_left & ~1 ) +
- ( p_sys->i_padd_right & ~1 );
- p_sys->i_dst_x_offset = ( p_sys->i_padd_left & ~1 );
- }
- 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 */
- int i_crop = 2 * (int)( ( p_sys->i_canvas_width & ~1 ) /
- f_scale_width / 2 + 0.5 );
-
- p_sys->i_src_x_offset += ( ( p_sys->i_crop_width - i_crop ) / 2 )
- & ~1;
- p_sys->i_crop_width = i_crop;
- i_dst_width = p_sys->i_canvas_width & ~1;
- p_sys->i_nopadd_width = i_dst_width;
- }
- else if( p_sys->i_canvas_width > p_sys->i_nopadd_width )
- {
- /* need to padd */
- i_dst_width = p_sys->i_canvas_width & ~1;
- p_sys->i_dst_x_offset = ( i_dst_width - p_sys->i_nopadd_width )/2;
- p_sys->i_dst_x_offset = p_sys->i_dst_x_offset & ~1;
- }
- }
-
- if( p_sys->i_canvas_height <= 0 )
- {
- /* No canvas set, add padding border */
- i_dst_height = p_sys->i_nopadd_height + ( p_sys->i_padd_top & ~1 ) +
- ( p_sys->i_padd_bottom & ~1 );
- p_sys->i_dst_y_offset = ( p_sys->i_padd_top & ~1 );
- }
- 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 */
- int i_crop = 2 * (int)( ( p_sys->i_canvas_height & ~1 ) /
- f_scale_height / 2 + 0.5 );
-
- p_sys->i_src_y_offset += ( ( p_sys->i_crop_height - i_crop ) / 2 )
- & ~1;
- p_sys->i_crop_height = i_crop;
- i_dst_height = p_sys->i_canvas_height & ~1;
- p_sys->i_nopadd_height = i_dst_height;
- }
- else if( p_sys->i_canvas_height > p_sys->i_nopadd_height )
- {
- /* need to padd */
- i_dst_height = p_sys->i_canvas_height & ~1;
- p_sys->i_dst_y_offset = ( i_dst_height - p_sys->i_nopadd_height )
- /2;
- p_sys->i_dst_y_offset = p_sys->i_dst_y_offset & ~1;
- }
- }
+ i_dst_width = 2 * (int)(f_scale_width*i_src_width/2+0.5);
+ i_dst_height = 2 * (int)(f_scale_height*i_src_height/2+0.5);
/* Change aspect ratio from scaled pixel to output frame */
f_aspect = f_aspect * i_dst_width / i_dst_height;
/* Store calculated values */
- id->p_encoder->fmt_out.video.i_width = i_dst_width;
- id->p_encoder->fmt_out.video.i_height = i_dst_height;
+ id->p_encoder->fmt_out.video.i_width =
+ id->p_encoder->fmt_out.video.i_visible_width = i_dst_width;
+ id->p_encoder->fmt_out.video.i_height =
+ id->p_encoder->fmt_out.video.i_visible_height = i_dst_height;
- id->p_encoder->fmt_in.video.i_width = i_dst_width;
- id->p_encoder->fmt_in.video.i_height = i_dst_height;
+ id->p_encoder->fmt_in.video.i_width =
+ id->p_encoder->fmt_in.video.i_visible_width = i_dst_width;
+ id->p_encoder->fmt_in.video.i_height =
+ id->p_encoder->fmt_in.video.i_visible_height = i_dst_height;
- msg_Dbg( p_stream, "source %ix%i, crop %ix%i, "
- "destination %ix%i, padding %ix%i",
+ msg_Dbg( p_stream, "source %ix%i, destination %ix%i",
i_src_width, i_src_height,
- p_sys->i_crop_width, p_sys->i_crop_height,
- p_sys->i_nopadd_width, p_sys->i_nopadd_height,
i_dst_width, i_dst_height
);
else
{
/* Pick a sensible default value */
- id->p_encoder->fmt_out.video.i_frame_rate = 25;
- id->p_encoder->fmt_out.video.i_frame_rate_base = 1;
+ id->p_encoder->fmt_out.video.i_frame_rate = ENC_FRAMERATE;
+ id->p_encoder->fmt_out.video.i_frame_rate_base = ENC_FRAMERATE_BASE;
}
}
/* Check whether a particular aspect ratio was requested */
if( !id->p_encoder->fmt_out.video.i_aspect )
{
- id->p_encoder->fmt_out.video.i_aspect = (int)( f_aspect * VOUT_ASPECT_FACTOR + 0.5 );
+ id->p_encoder->fmt_out.video.i_aspect =
+ (int)( f_aspect * VOUT_ASPECT_FACTOR + 0.5 );
}
id->p_encoder->fmt_in.video.i_aspect =
id->p_encoder->fmt_out.video.i_aspect;
- msg_Dbg( p_stream, "encoder aspect is %i:%i", id->p_encoder->fmt_out.video.i_aspect, VOUT_ASPECT_FACTOR );
+ msg_Dbg( p_stream, "encoder aspect is %i:%i",
+ id->p_encoder->fmt_out.video.i_aspect, VOUT_ASPECT_FACTOR );
+
+ id->p_encoder->fmt_in.video.i_chroma = id->p_encoder->fmt_in.i_codec;
+}
+
+static int transcode_video_encoder_open( sout_stream_t *p_stream,
+ sout_stream_id_t *id )
+{
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+
+
+ msg_Dbg( p_stream, "destination (after video filters) %ix%i",
+ id->p_encoder->fmt_in.video.i_width,
+ id->p_encoder->fmt_in.video.i_height );
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 );
+ msg_Err( p_stream, "cannot find video encoder (module:%s fourcc:%4.4s)",
+ p_sys->psz_venc ? p_sys->psz_venc : "any",
+ (char *)&p_sys->i_vcodec );
return VLC_EGENERIC;
}
id->p_encoder->fmt_out.i_codec = VLC_FOURCC('m','p','g','v');
}
- id->id = p_stream->p_sys->p_out->pf_add( p_stream->p_sys->p_out,
- &id->p_encoder->fmt_out );
+ id->id = sout_StreamIdAdd( p_stream->p_sys->p_out,
+ &id->p_encoder->fmt_out );
if( !id->id )
{
msg_Err( p_stream, "cannot add this stream" );
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 )
{
vlc_cond_destroy( &p_stream->p_sys->cond );
}
+ video_timer_close( id->p_encoder );
+
/* Close decoder */
if( id->p_decoder->p_module )
- module_Unneed( id->p_decoder, id->p_decoder->p_module );
+ module_unneed( id->p_decoder, id->p_decoder->p_module );
+ if( id->p_decoder->p_description )
+ vlc_meta_Delete( id->p_decoder->p_description );
if( id->p_decoder->p_owner )
{
/* Close encoder */
if( id->p_encoder->p_module )
- module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ module_unneed( id->p_encoder, id->p_encoder->p_module );
/* 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] );
- id->pp_filter[i] = NULL;
- }
-
- 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] );
- id->pp_ufilter[i] = NULL;
- }
+ if( id->p_f_chain )
+ filter_chain_Delete( id->p_f_chain );
+ if( id->p_uf_chain )
+ filter_chain_Delete( id->p_uf_chain );
}
static int transcode_video_process( sout_stream_t *p_stream,
block_t *in, block_t **out )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- int i_duplicate = 1, i;
+ int i_duplicate = 1;
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;
if( !id->p_encoder->p_module )
{
- if( transcode_video_encoder_open( p_stream, id ) != VLC_SUCCESS )
- {
- p_pic->pf_release( p_pic );
- transcode_video_close( p_stream, id );
- id->b_transcode = VLC_FALSE;
- return VLC_EGENERIC;
- }
+ transcode_video_encoder_init( p_stream, id );
+
+ id->p_f_chain = filter_chain_New( p_stream, "video filter2",
+ false,
+ transcode_video_filter_allocation_init,
+ transcode_video_filter_allocation_clear,
+ p_stream->p_sys );
/* Deinterlace */
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;
-
- 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] );
- }
+ filter_chain_AppendFilter( id->p_f_chain,
+ p_sys->psz_deinterlace,
+ p_sys->p_deinterlace_cfg,
+ &id->p_decoder->fmt_out,
+ &id->p_decoder->fmt_out );
}
- /* 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)
+ /* Take care of the scaling and chroma conversions */
+ 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_in.video.i_width ) ||
+ ( id->p_decoder->fmt_out.video.i_height !=
+ id->p_encoder->fmt_in.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;
-
- 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->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] );
+ filter_chain_AppendFilter( id->p_f_chain,
+ NULL, NULL,
+ &id->p_decoder->fmt_out,
+ &id->p_encoder->fmt_in );
+ }
- p_pic->pf_release( p_pic );
- transcode_video_close( p_stream, id );
- id->b_transcode = VLC_FALSE;
- return VLC_EGENERIC;
- }
+ if( p_sys->psz_vf2 )
+ {
+ const es_format_t *p_fmt_out;
+ id->p_uf_chain = filter_chain_New( p_stream, "video filter2",
+ true,
+ transcode_video_filter_allocation_init,
+ transcode_video_filter_allocation_clear,
+ p_stream->p_sys );
+ filter_chain_Reset( id->p_uf_chain, &id->p_encoder->fmt_in,
+ &id->p_encoder->fmt_in );
+ filter_chain_AppendFromString( id->p_uf_chain, p_sys->psz_vf2 );
+ p_fmt_out = filter_chain_GetFmtOut( id->p_uf_chain );
+ es_format_Copy( &id->p_encoder->fmt_in, p_fmt_out );
+ id->p_encoder->fmt_out.video.i_width =
+ id->p_encoder->fmt_in.video.i_width;
+ id->p_encoder->fmt_out.video.i_height =
+ id->p_encoder->fmt_in.video.i_height;
+ id->p_encoder->fmt_out.video.i_aspect =
+ id->p_encoder->fmt_in.video.i_aspect;
}
- for( i = 0; (i < p_sys->i_vfilters) && (id->i_ufilter < TRANSCODE_FILTERS); i++ )
+ if( transcode_video_encoder_open( p_stream, id ) != VLC_SUCCESS )
{
- 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;
- 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;
- }
+ p_pic->pf_release( p_pic );
+ transcode_video_close( p_stream, id );
+ id->b_transcode = false;
+ return VLC_EGENERIC;
}
}
/* Run filter chain */
- for( i = 0; i < id->i_filter; i++ )
- {
- p_pic = id->pp_filter[i]->pf_video_filter(id->pp_filter[i], p_pic);
- }
+ if( id->p_f_chain )
+ p_pic = filter_chain_VideoFilter( id->p_f_chain, p_pic );
/*
* Encoding
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 */, false );
/* TODO: get another pic */
}
/* Overlay subpicture */
if( p_subpic )
{
- int i_scale_width, i_scale_height;
- video_format_t *p_fmt;
+ video_format_t fmt;
- i_scale_width = id->p_encoder->fmt_in.video.i_width * 1000 /
- id->p_decoder->fmt_out.video.i_width;
- i_scale_height = id->p_encoder->fmt_in.video.i_height * 1000 /
- id->p_decoder->fmt_out.video.i_height;
-
- if( p_pic->i_refcount && !id->i_filter )
+ if( p_pic->i_refcount && !filter_chain_GetLength( id->p_f_chain ) )
{
/* We can't modify the picture, we need to duplicate it */
picture_t *p_tmp = video_new_buffer_decoder( id->p_decoder );
if( p_tmp )
{
- vout_CopyPicture( p_stream, p_tmp, p_pic );
+ picture_Copy( p_tmp, p_pic );
p_pic->pf_release( p_pic );
p_pic = p_tmp;
}
}
- if( id->i_filter )
- p_fmt = &id->pp_filter[id->i_filter -1]->fmt_out.video;
+ if( filter_chain_GetLength( id->p_f_chain ) > 0 )
+ fmt = filter_chain_GetFmtOut( id->p_f_chain )->video;
else
- p_fmt = &id->p_decoder->fmt_out.video;
+ fmt = id->p_decoder->fmt_out.video;
/* FIXME (shouldn't have to be done here) */
- p_fmt->i_sar_num = p_fmt->i_aspect *
- p_fmt->i_height / p_fmt->i_width;
- p_fmt->i_sar_den = VOUT_ASPECT_FACTOR;
+ fmt.i_sar_num = fmt.i_aspect * fmt.i_height / fmt.i_width;
+ fmt.i_sar_den = VOUT_ASPECT_FACTOR;
- spu_RenderSubpictures( p_sys->p_spu, p_fmt, p_pic, p_pic, p_subpic,
- i_scale_width, i_scale_height );
+ spu_RenderSubpictures( p_sys->p_spu, p_pic, &fmt,
+ p_subpic, &id->p_decoder->fmt_out.video, false );
}
/* Run user specified filter chain */
- for( i = 0; i < id->i_ufilter; i++ )
- {
- p_pic = id->pp_ufilter[i]->pf_video_filter( id->pp_ufilter[i],
- p_pic );
- }
+ if( id->p_uf_chain )
+ p_pic = filter_chain_VideoFilter( id->p_uf_chain, p_pic );
if( p_sys->i_threads == 0 )
{
block_t *p_block;
+
+ video_timer_start( id->p_encoder );
p_block = id->p_encoder->pf_encode_video( id->p_encoder, p_pic );
+ video_timer_stop( id->p_encoder );
+
block_ChainAppend( out, p_block );
}
p_pic2 = video_new_buffer_decoder( id->p_decoder );
if( p_pic2 != NULL )
{
- vout_CopyPicture( p_stream, p_pic2, p_pic );
+ picture_Copy( p_pic2, p_pic );
p_pic2->date = i_pts;
}
}
{
block_t *p_block;
p_pic->date = i_pts;
+ video_timer_start( id->p_encoder );
p_block = id->p_encoder->pf_encode_video(id->p_encoder, p_pic);
+ video_timer_stop( id->p_encoder );
block_ChainAppend( out, p_block );
}
}
return VLC_SUCCESS;
}
-static int EncoderThread( sout_stream_sys_t *p_sys )
+static void* EncoderThread( vlc_object_t* p_this )
{
+ sout_stream_sys_t *p_sys = (sout_stream_sys_t*)p_this;
sout_stream_id_t *id = p_sys->id_video;
picture_t *p_pic;
+ int canc = vlc_savecancel ();
- while( !p_sys->b_die && !p_sys->b_error )
+ while( vlc_object_alive (p_sys) && !p_sys->b_error )
{
block_t *p_block;
while( p_sys->i_last_pic == p_sys->i_first_pic )
{
vlc_cond_wait( &p_sys->cond, &p_sys->lock_out );
- if( p_sys->b_die || p_sys->b_error ) break;
+ if( !vlc_object_alive (p_sys) || p_sys->b_error ) break;
}
- if( p_sys->b_die || p_sys->b_error )
+ if( !vlc_object_alive (p_sys) || p_sys->b_error )
{
vlc_mutex_unlock( &p_sys->lock_out );
break;
p_sys->i_first_pic %= PICTURE_RING_SIZE;
vlc_mutex_unlock( &p_sys->lock_out );
+ video_timer_start( id->p_encoder );
p_block = id->p_encoder->pf_encode_video( id->p_encoder, p_pic );
+ video_timer_stop( id->p_encoder );
+
vlc_mutex_lock( &p_sys->lock_out );
block_ChainAppend( &p_sys->p_buffers, p_block );
}
block_ChainRelease( p_sys->p_buffers );
- return 0;
+ vlc_restorecancel (canc);
+ return NULL;
}
struct picture_sys_t
/* Find an empty space in the picture ring buffer */
for( i = 0; i < PICTURE_RING_SIZE; i++ )
{
- if( pp_ring[i] != 0 && pp_ring[i]->i_status == DESTROYED_PICTURE )
+ if( pp_ring[i] != NULL && pp_ring[i]->i_status == DESTROYED_PICTURE )
{
pp_ring[i]->i_status = RESERVED_PICTURE;
return pp_ring[i];
}
for( i = 0; i < PICTURE_RING_SIZE; i++ )
{
- if( pp_ring[i] == 0 ) break;
+ if( pp_ring[i] == NULL ) break;
}
if( i == PICTURE_RING_SIZE && p_sys->i_threads >= 1 )
/* Find an empty space in the picture ring buffer */
for( i = 0; i < PICTURE_RING_SIZE; i++ )
{
- if( pp_ring[i] != 0 && pp_ring[i]->i_status == DESTROYED_PICTURE )
+ if( pp_ring[i] != NULL && pp_ring[i]->i_status == DESTROYED_PICTURE )
{
pp_ring[i]->i_status = RESERVED_PICTURE;
return pp_ring[i];
}
for( i = 0; i < PICTURE_RING_SIZE; i++ )
{
- if( pp_ring[i] == 0 ) break;
+ if( pp_ring[i] == NULL ) break;
}
}
i = 0;
}
- p_pic = malloc( sizeof(picture_t) );
+ p_pic = picture_New( p_dec->fmt_out.video.i_chroma,
+ p_dec->fmt_out.video.i_width,
+ p_dec->fmt_out.video.i_height,
+ p_dec->fmt_out.video.i_aspect );
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,
- p_dec->fmt_out.video.i_width,
- p_dec->fmt_out.video.i_height,
- p_dec->fmt_out.video.i_aspect );
-
- if( !p_pic->i_planes )
- {
- free( p_pic );
- return NULL;
- }
-
- p_pic->pf_release = video_release_buffer;
- p_pic->p_sys = malloc( sizeof(picture_sys_t) );
+ p_pic->p_sys = calloc( 1, sizeof(picture_sys_t) );
if( !p_pic->p_sys )
{
- free( p_pic );
+ picture_Release( p_pic );
return NULL;
}
-
- p_pic->p_sys->p_owner = p_this;
- p_pic->i_status = RESERVED_PICTURE;
+ p_pic->pf_release = video_release_buffer;
+ p_pic->i_refcount = 0;
pp_ring[i] = p_pic;
return p_pic;
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_q );
+ 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;
+ picture_CleanupQuant( p_pic );
}
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;
+ picture_CleanupQuant( p_pic );
}
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_decoder->p_cfg = p_sys->p_spu_cfg; */
id->p_decoder->p_module =
- module_Need( id->p_decoder, "decoder", "$codec", 0 );
+ module_need( id->p_decoder, "decoder", "$codec", false );
if( !id->p_decoder->p_module )
{
- msg_Err( p_stream, "cannot find decoder" );
+ msg_Err( p_stream, "cannot find spu decoder" );
return VLC_EGENERIC;
}
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 )
{
- module_Unneed( id->p_decoder, id->p_decoder->p_module );
- msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_senc );
+ module_unneed( id->p_decoder, id->p_decoder->p_module );
+ msg_Err( p_stream, "cannot find spu encoder (%s)", p_sys->psz_senc );
return VLC_EGENERIC;
}
}
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 )
- module_Unneed( id->p_decoder, id->p_decoder->p_module );
+ module_unneed( id->p_decoder, id->p_decoder->p_module );
+ if( id->p_decoder->p_description )
+ vlc_meta_Delete( id->p_decoder->p_description );
/* Close encoder */
if( id->p_encoder->p_module )
- module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ module_unneed( id->p_encoder, id->p_encoder->p_module );
}
static int transcode_spu_process( sout_stream_t *p_stream,
*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 subpicture_t *spu_new_buffer( decoder_t *p_dec )
{
- sout_stream_t *p_stream = (sout_stream_t *)p_dec->p_owner;
- return spu_CreateSubpicture( p_stream->p_sys->p_spu );
+ VLC_UNUSED( p_dec );
+ return subpicture_New();
}
static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_subpic )
{
- sout_stream_t *p_stream = (sout_stream_t *)p_dec->p_owner;
- spu_DestroySubpicture( p_stream->p_sys->p_spu, p_subpic );
+ VLC_UNUSED( p_dec );
+ subpicture_Delete( p_subpic );
}
/*
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 )
{
- msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_osdenc );
+ msg_Err( p_stream, "cannot find spu encoder (%s)", p_sys->psz_osdenc );
goto error;
}
/* 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->id = sout_StreamIdAdd( p_sys->p_out, &id->p_encoder->fmt_out );
+ id->b_transcode = true;
if( !id->id ) goto error;
}
{
msg_Dbg( p_stream, "not transcoding a stream (fcc=`%4.4s')",
(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 = VLC_FALSE;
+ id->id = sout_StreamIdAdd( p_sys->p_out, &id->p_decoder->fmt_out );
+ id->b_transcode = false;
if( !id->id ) goto error;
}
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 );
- p_sys->b_osd = VLC_FALSE;
+ module_unneed( id->p_encoder, id->p_encoder->p_module );
+ p_sys->b_osd = false;
return VLC_EGENERIC;
}
sout_stream_sys_t *p_sys = p_stream->p_sys;
/* Close encoder */
- if( p_sys->b_osd && id )
+ if( id )
{
if( id->p_encoder->p_module )
- module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ module_unneed( id->p_encoder, id->p_encoder->p_module );
}
- p_sys->b_osd = VLC_FALSE;
+ 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, false );
}
else
{
}
p_block = id->p_encoder->pf_encode_sub( id->p_encoder, p_subpic );
- spu_DestroySubpicture( p_sys->p_spu, p_subpic );
+ subpicture_Delete( p_subpic );
if( p_block )
{
p_block->i_dts = p_block->i_pts = in->i_dts;
projects / vlc / blobdiff