/*****************************************************************************
* transcode.c: transcoding stream output module
*****************************************************************************
- * Copyright (C) 2003-2004 VideoLAN
+ * Copyright (C) 2003-2004 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
+ * Jean-Paul Saman <jpsaman #_at_# m2x dot nl>
*
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <string.h>
-
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
-#include <vlc/vout.h>
-#include <vlc/decoder.h>
-#include "vlc_filter.h"
-#include "osd.h"
+#include <vlc_input.h>
+#include <vlc_sout.h>
+#include <vlc_aout.h>
+#include <vlc_vout.h>
+#include <vlc_codec.h>
+#include <vlc_block.h>
+#include <vlc_filter.h>
+#include <vlc_osd.h>
+
+#include <math.h>
+
+#define MASTER_SYNC_MAX_DRIFT 100000
+
+/* FIXME Ugly */
+#include "../../src/input/input_internal.h"
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define VENC_TEXT N_("Video encoder")
#define VENC_LONGTEXT N_( \
- "Allows you to specify the video encoder to use and its associated " \
- "options." )
+ "This is the video encoder module that will be used (and its associated "\
+ "options).")
#define VCODEC_TEXT N_("Destination video codec")
#define VCODEC_LONGTEXT N_( \
- "Allows you to specify the destination video codec used for the " \
- "streaming output." )
+ "This is the video codec that will be used.")
#define VB_TEXT N_("Video bitrate")
#define VB_LONGTEXT N_( \
- "Allows you to specify the video bitrate used for the streaming " \
- "output." )
+ "Target bitrate of the transcoded video stream." )
#define SCALE_TEXT N_("Video scaling")
#define SCALE_LONGTEXT N_( \
- "Allows you to scale the video before encoding." )
+ "Scale factor to apply to the video while transcoding (eg: 0.25)")
#define FPS_TEXT N_("Video frame-rate")
#define FPS_LONGTEXT N_( \
- "Allows you to specify an output frame rate for the video." )
+ "Target output frame rate for the video stream." )
#define DEINTERLACE_TEXT N_("Deinterlace video")
#define DEINTERLACE_LONGTEXT N_( \
- "Allows you to deinterlace the video before encoding." )
+ "Deinterlace the video before encoding." )
+#define DEINTERLACE_MODULE_TEXT N_("Deinterlace module")
+#define DEINTERLACE_MODULE_LONGTEXT N_( \
+ "Specify the deinterlace module to use." )
#define WIDTH_TEXT N_("Video width")
#define WIDTH_LONGTEXT N_( \
- "Allows you to specify the output video width." )
+ "Output video width." )
#define HEIGHT_TEXT N_("Video height")
#define HEIGHT_LONGTEXT N_( \
- "Allows you to specify the output video height." )
-
-#define CROPTOP_TEXT N_("Video crop top")
+ "Output video height." )
+#define MAXWIDTH_TEXT N_("Maximum video width")
+#define MAXWIDTH_LONGTEXT N_( \
+ "Maximum output video width." )
+#define MAXHEIGHT_TEXT N_("Maximum video height")
+#define MAXHEIGHT_LONGTEXT N_( \
+ "Maximum output video height." )
+#define VFILTER_TEXT N_("Video filter")
+#define VFILTER_LONGTEXT N_( \
+ "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_( \
- "Allows you to specify the top coordinate for the video cropping." )
-#define CROPLEFT_TEXT N_("Video crop left")
+ "Number of pixels to crop at the top of the video." )
+#define CROPLEFT_TEXT N_("Video crop (left)")
#define CROPLEFT_LONGTEXT N_( \
- "Allows you to specify the left coordinate for the video cropping." )
-#define CROPBOTTOM_TEXT N_("Video crop bottom")
+ "Number of pixels to crop at the left of the video." )
+#define CROPBOTTOM_TEXT N_("Video crop (bottom)")
#define CROPBOTTOM_LONGTEXT N_( \
- "Allows you to specify the bottom coordinate for the video cropping." )
-#define CROPRIGHT_TEXT N_("Video crop right")
+ "Number of pixels to crop at the bottom of the video." )
+#define CROPRIGHT_TEXT N_("Video crop (right)")
#define CROPRIGHT_LONGTEXT N_( \
- "Allows you to specify the right coordinate for the video cropping." )
+ "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_( \
- "Allows you to specify the audio encoder to use and its associated " \
- "options." )
+ "This is the audio encoder module that will be used (and its associated "\
+ "options).")
#define ACODEC_TEXT N_("Destination audio codec")
#define ACODEC_LONGTEXT N_( \
- "Allows you to specify the destination audio codec used for the " \
- "streaming output." )
+ "This is the audio codec that will be used.")
#define AB_TEXT N_("Audio bitrate")
#define AB_LONGTEXT N_( \
- "Allows you to specify the audio bitrate used for the streaming " \
- "output." )
+ "Target bitrate of the transcoded audio stream." )
#define ARATE_TEXT N_("Audio sample rate")
#define ARATE_LONGTEXT N_( \
- "Allows you to specify the audio sample rate used for the streaming " \
- "output." )
+ "Sample rate of the transcoded audio stream (11250, 22500, 44100 or 48000).")
#define ACHANS_TEXT N_("Audio channels")
#define ACHANS_LONGTEXT N_( \
- "Allows you to specify the number of audio channels used for the " \
- "streaming output." )
+ "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_( \
- "Allows you to specify the subtitles encoder to use and its associated " \
- "options." )
+ "This is the subtitles encoder module that will be used (and its " \
+ "associated options)." )
#define SCODEC_TEXT N_("Destination subtitles codec")
#define SCODEC_LONGTEXT N_( \
- "Allows you to specify the destination subtitles codec used for the " \
- "streaming output." )
-#define SFILTER_TEXT N_("Subpictures filter")
+ "This is the subtitles codec that will be used." )
+
+#define SFILTER_TEXT N_("Overlays")
#define SFILTER_LONGTEXT N_( \
- "Allows you to specify subpictures filters used during the video " \
- "transcoding. The subpictures produced by the filters will be overlayed " \
- "directly onto the video." )
+ "This allows you to add overlays (also known as \"subpictures\" on the "\
+ "transcoded video stream. The subpictures produced by the filters will "\
+ "be overlayed directly onto the video. You must specify a comma-separated "\
+ "list of subpicture modules" )
+
+#define OSD_TEXT N_("OSD menu")
+#define OSD_LONGTEXT N_(\
+ "Stream the On Screen Display menu (using the osdmenu subpicture module)." )
#define THREADS_TEXT N_("Number of threads")
#define THREADS_LONGTEXT N_( \
- "Allows you to specify the number of threads used for the transcoding." )
+ "Number of threads used for the transcoding." )
+#define HP_TEXT N_("High priority")
+#define HP_LONGTEXT N_( \
+ "Runs the optional encoder thread at the OUTPUT priority instead of " \
+ "VIDEO." )
#define ASYNC_TEXT N_("Synchronise on audio track")
#define ASYNC_LONGTEXT N_( \
"This option will drop/duplicate video frames to synchronise the video " \
"track on the audio track." )
+#define HURRYUP_TEXT N_( "Hurry up" )
+#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[] =
+{
+ "deinterlace", "ffmpeg-deinterlace"
+};
+
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
SCALE_LONGTEXT, VLC_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 );
add_bool( SOUT_CFG_PREFIX "deinterlace", 0, NULL, DEINTERLACE_TEXT,
DEINTERLACE_LONGTEXT, VLC_FALSE );
+ add_string( SOUT_CFG_PREFIX "deinterlace-module", "deinterlace", NULL,
+ DEINTERLACE_MODULE_TEXT, DEINTERLACE_MODULE_LONGTEXT,
+ VLC_FALSE );
+ change_string_list( ppsz_deinterlace_type, 0, 0 );
add_integer( SOUT_CFG_PREFIX "width", 0, NULL, WIDTH_TEXT,
WIDTH_LONGTEXT, VLC_TRUE );
add_integer( SOUT_CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT,
HEIGHT_LONGTEXT, VLC_TRUE );
+ add_integer( SOUT_CFG_PREFIX "maxwidth", 0, NULL, MAXWIDTH_TEXT,
+ MAXWIDTH_LONGTEXT, VLC_TRUE );
+ add_integer( SOUT_CFG_PREFIX "maxheight", 0, NULL, MAXHEIGHT_TEXT,
+ MAXHEIGHT_LONGTEXT, VLC_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 "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 );
add_string( SOUT_CFG_PREFIX "aenc", NULL, NULL, AENC_TEXT,
AENC_LONGTEXT, VLC_FALSE );
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,
NULL, NULL,
SFILTER_TEXT, SFILTER_LONGTEXT, VLC_FALSE );
+ 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 );
+ add_bool( SOUT_CFG_PREFIX "high-priority", 0, NULL, HP_TEXT, HP_LONGTEXT,
+ VLC_TRUE );
vlc_module_end();
static const char *ppsz_sout_options[] = {
"venc", "vcodec", "vb", "croptop", "cropbottom", "cropleft", "cropright",
- "scale", "fps", "width", "height", "deinterlace", "threads",
- "aenc", "acodec", "ab", "samplerate", "channels",
- "senc", "scodec", "soverlay", "sfilter",
- "audio-sync", NULL
+ "paddtop", "paddbottom", "paddleft", "paddright",
+ "canvas-width", "canvas-height", "canvas-aspect",
+ "scale", "fps", "width", "height", "vfilter", "deinterlace",
+ "deinterlace-module", "threads", "hurry-up", "aenc", "acodec", "ab",
+ "afilter", "samplerate", "channels", "senc", "scodec", "soverlay",
+ "sfilter", "osd", "audio-sync", "high-priority", "maxwidth", "maxheight",
+ NULL
};
/*****************************************************************************
static int transcode_spu_process( sout_stream_t *, sout_stream_id_t *,
block_t *, block_t ** );
+static int transcode_osd_new ( sout_stream_t *, sout_stream_id_t * );
+static void transcode_osd_close ( sout_stream_t *, sout_stream_id_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 int pi_channels_maps[6] =
#define PICTURE_RING_SIZE 64
#define SUBPICTURE_RING_SIZE 20
+#define TRANSCODE_FILTERS 10
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;
- int i_width;
- int i_height;
+ unsigned int i_width, i_maxwidth;
+ unsigned int i_height, i_maxheight;
vlc_bool_t 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;
+
/* SPU */
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;
+ 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;
+
/* Sync */
vlc_bool_t b_master_sync;
mtime_t i_master_drift;
struct decoder_owner_sys_t
{
picture_t *pp_pics[PICTURE_RING_SIZE];
+ sout_stream_sys_t *p_sys;
};
struct filter_owner_sys_t
{
picture_t *pp_pics[PICTURE_RING_SIZE];
+ sout_stream_sys_t *p_sys;
};
/*****************************************************************************
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 */
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 );
if( p_sys->i_acodec )
{
+ 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 );
+ p_sys->i_channels = 2;
+ }
msg_Dbg( p_stream, "codec audio=%4.4s %dHz %d channels %dKb/s",
(char *)&p_sys->i_acodec, p_sys->i_sample_rate,
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;
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 );
}
var_Get( p_stream, SOUT_CFG_PREFIX "fps", &val );
p_sys->f_fps = val.f_float;
+ var_Get( p_stream, SOUT_CFG_PREFIX "hurry-up", &val );
+ p_sys->b_hurry_up = val.b_bool;
+
var_Get( p_stream, SOUT_CFG_PREFIX "width", &val );
p_sys->i_width = val.i_int;
var_Get( p_stream, SOUT_CFG_PREFIX "height", &val );
p_sys->i_height = val.i_int;
+ var_Get( p_stream, SOUT_CFG_PREFIX "maxwidth", &val );
+ p_sys->i_maxwidth = val.i_int;
+
+ var_Get( p_stream, SOUT_CFG_PREFIX "maxheight", &val );
+ 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 )
+ {
+ 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;
+ }
+
var_Get( p_stream, SOUT_CFG_PREFIX "deinterlace", &val );
p_sys->b_deinterlace = val.b_bool;
+ var_Get( p_stream, SOUT_CFG_PREFIX "deinterlace-module", &val );
+ p_sys->psz_deinterlace = NULL;
+ p_sys->p_deinterlace_cfg = NULL;
+ if( val.psz_string && *val.psz_string )
+ {
+ char *psz_next;
+ 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 );
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 );
+
+ }
+ if( val.psz_string ) free( val.psz_string );
+
var_Get( p_stream, SOUT_CFG_PREFIX "threads", &val );
p_sys->i_threads = val.i_int;
+ var_Get( p_stream, SOUT_CFG_PREFIX "high-priority", &val );
+ p_sys->b_high_priority = val.b_bool;
if( p_sys->i_vcodec )
{
}
/* Subpictures transcoding parameters */
- p_sys->p_spu = 0;
+ p_sys->p_spu = NULL;
p_sys->psz_senc = NULL;
p_sys->p_spu_cfg = NULL;
p_sys->i_scodec = 0;
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 );
}
}
if( val.psz_string ) free( val.psz_string );
+ /* OSD menu transcoding parameters */
+ p_sys->psz_osdenc = NULL;
+ p_sys->p_osd_cfg = NULL;
+ p_sys->i_osdcodec = 0;
+ p_sys->b_es_osd = VLC_FALSE;
+
+ var_Get( p_stream, SOUT_CFG_PREFIX "osd", &val );
+ p_sys->b_sout_osd = val.b_bool;
+ if( p_sys->b_sout_osd )
+ {
+ vlc_value_t osd_val;
+ char *psz_next;
+
+ psz_next = config_ChainCreate( &p_sys->psz_osdenc,
+ &p_sys->p_osd_cfg, strdup( "dvbsub") );
+ if( psz_next ) free( psz_next );
+
+ p_sys->i_osdcodec = VLC_FOURCC('Y','U','V','P' );
+
+ msg_Dbg( p_stream, "codec osd=%4.4s", (char *)&p_sys->i_osdcodec );
+
+ if( !p_sys->p_spu )
+ {
+ osd_val.psz_string = strdup("osdmenu");
+ p_sys->p_spu = spu_Create( p_stream );
+ 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 );
+ }
+ 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 );
+ }
+ }
+
+ /* 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;
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 );
}
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 );
}
if( p_sys->psz_venc ) free( p_sys->psz_venc );
+ while( p_sys->p_deinterlace_cfg != NULL )
+ {
+ config_chain_t *p_next = p_sys->p_deinterlace_cfg->p_next;
+
+ if( p_sys->p_deinterlace_cfg->psz_name )
+ free( p_sys->p_deinterlace_cfg->psz_name );
+ if( p_sys->p_deinterlace_cfg->psz_value )
+ free( p_sys->p_deinterlace_cfg->psz_value );
+ free( p_sys->p_deinterlace_cfg );
+
+ p_sys->p_deinterlace_cfg = p_next;
+ }
+ if( p_sys->psz_deinterlace ) free( p_sys->psz_deinterlace );
+
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 );
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 );
+
+ p_sys->p_osd_cfg = p_next;
+ }
+ if( p_sys->psz_osdenc ) free( p_sys->psz_osdenc );
+
vlc_object_destroy( p_sys );
}
decoder_t *p_decoder;
/* Filters */
- filter_t *pp_filter[10];
+ filter_t *pp_filter[TRANSCODE_FILTERS];
int i_filter;
+ /* User specified filters */
+ filter_t *pp_ufilter[TRANSCODE_FILTERS];
+ int i_ufilter;
/* Encoder */
encoder_t *p_encoder;
date_t interpolated_pts;
};
-
static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
vlc_object_attach( id->p_decoder, p_stream );
id->p_decoder->p_module = NULL;
id->p_decoder->fmt_in = *p_fmt;
- id->p_decoder->fmt_out = *p_fmt;
- id->p_decoder->fmt_out.i_extra = 0;
- id->p_decoder->fmt_out.p_extra = 0;
id->p_decoder->b_pace_control = VLC_TRUE;
/* Create encoder object */
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;
- id->p_encoder->fmt_out.audio.i_channels = p_sys->i_channels > 0 ?
- p_sys->i_channels : p_fmt->audio.i_channels;
id->p_encoder->fmt_out.i_bitrate = p_sys->i_abitrate;
id->p_encoder->fmt_out.audio.i_bitspersample =
p_fmt->audio.i_bitspersample;
+ id->p_encoder->fmt_out.audio.i_channels = p_sys->i_channels > 0 ?
+ p_sys->i_channels : p_fmt->audio.i_channels;
+ /* Sanity check for audio channels */
+ id->p_encoder->fmt_out.audio.i_channels =
+ __MIN( id->p_encoder->fmt_out.audio.i_channels,
+ id->p_decoder->fmt_in.audio.i_channels );
+ id->p_encoder->fmt_out.audio.i_original_channels =
+ id->p_decoder->fmt_in.audio.i_physical_channels;
+ if( id->p_decoder->fmt_in.audio.i_channels ==
+ id->p_encoder->fmt_out.audio.i_channels )
+ {
+ id->p_encoder->fmt_out.audio.i_physical_channels =
+ id->p_decoder->fmt_in.audio.i_physical_channels;
+ }
+ else
+ {
+ id->p_encoder->fmt_out.audio.i_physical_channels =
+ pi_channels_maps[id->p_encoder->fmt_out.audio.i_channels];
+ }
/* Build decoder -> filter -> encoder chain */
if( transcode_audio_new( p_stream, id ) )
id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_encoder->fmt_out );
id->b_transcode = VLC_TRUE;
- if( !id->id ) goto error;
+ if( !id->id )
+ {
+ transcode_audio_close( p_stream, id );
+ goto error;
+ }
date_Init( &id->interpolated_pts, p_fmt->audio.i_rate, 1 );
}
/* Complete destination format */
id->p_encoder->fmt_out.i_codec = p_sys->i_vcodec;
- id->p_encoder->fmt_out.video.i_width = p_sys->i_width;
- id->p_encoder->fmt_out.video.i_height = p_sys->i_height;
+ id->p_encoder->fmt_out.video.i_width = p_sys->i_width & ~1;
+ id->p_encoder->fmt_out.video.i_height = p_sys->i_height & ~1;
id->p_encoder->fmt_out.i_bitrate = p_sys->i_vbitrate;
/* Build decoder -> filter -> encoder chain */
if( p_sys->f_fps > 0 )
{
id->p_encoder->fmt_out.video.i_frame_rate =
- p_sys->f_fps * 1001 + 0.5;
+ (p_sys->f_fps * 1001) + 0.5;
id->p_encoder->fmt_out.video.i_frame_rate_base = 1001;
}
}
id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_encoder->fmt_out );
id->b_transcode = VLC_TRUE;
- if( !id->id ) goto error;
+ if( !id->id )
+ {
+ transcode_spu_close( p_stream, id );
+ goto error;
+ }
}
else if( p_fmt->i_cat == SPU_ES && p_sys->b_soverlay )
{
if( !id->id ) goto error;
}
+ if( p_sys->b_sout_osd )
+ {
+ /* Create a fake OSD menu elementary stream */
+ if( !p_sys->b_es_osd && (p_sys->i_osdcodec != 0 || p_sys->psz_osdenc) )
+ {
+ if( transcode_osd_new( p_stream, p_sys->id_osd ) )
+ {
+ msg_Err( p_stream, "cannot create osd chain" );
+ goto error;
+ }
+ p_sys->b_es_osd = VLC_TRUE;
+ }
+ }
return id;
error:
{
vlc_object_detach( id->p_decoder );
vlc_object_destroy( 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;
}
free( id );
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
+ if( p_sys->b_es_osd )
+ transcode_osd_close( p_stream, p_sys->id_osd );
+
if( id->b_transcode )
{
switch( id->p_decoder->fmt_in.i_cat )
{
vlc_object_detach( id->p_decoder );
vlc_object_destroy( 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;
}
-
free( id );
return VLC_SUCCESS;
block_t *p_buffer )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- block_t *p_out;
+ block_t *p_out = NULL;
if( !id->b_transcode && id->id )
{
- if( p_sys->b_master_sync && p_sys->i_master_drift )
+ /* Transcode OSD menu pictures. */
+ if( p_sys->b_es_osd )
{
- if( p_buffer->i_dts > 0 )
- {
- p_buffer->i_dts -= p_sys->i_master_drift;
- if( p_buffer->i_dts < 0 )
- {
- block_Release( p_buffer );
- return VLC_EGENERIC;
- }
- }
- if( p_buffer->i_pts > 0 )
- {
- p_buffer->i_pts -= p_sys->i_master_drift;
- if( p_buffer->i_pts < 0 )
- {
- block_Release( p_buffer );
- return VLC_EGENERIC;
- }
- }
+ transcode_osd_process( p_stream, id, p_buffer, &p_out );
}
-
return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer );
}
else if( !id->b_transcode )
break;
default:
+ p_out = NULL;
block_Release( p_buffer );
break;
}
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 );
- p_filter->pf_audio_buffer_new = __block_New;
+ p_filter->pf_audio_buffer_new = (block_t* (*) (filter_t*, int))__block_New;
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;
}
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
es_format_t fmt_last;
- int i_pass = 6;
+ int i;
/*
* Open decoder
*/
/* 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;
id->p_decoder->pf_decode_audio = 0;
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_video_cfg;
+ /* id->p_decoder->p_cfg = p_sys->p_audio_cfg; */
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
id->p_decoder->fmt_out.i_codec );
id->p_encoder->fmt_in.audio.i_format = id->p_decoder->fmt_out.i_codec;
- /* Sanity check for audio channels */
- id->p_encoder->fmt_out.audio.i_channels =
- __MIN( id->p_encoder->fmt_out.audio.i_channels,
- id->p_decoder->fmt_out.audio.i_channels );
- if( id->p_decoder->fmt_out.audio.i_channels ==
- id->p_encoder->fmt_out.audio.i_channels )
- id->p_encoder->fmt_out.audio.i_physical_channels =
- id->p_encoder->fmt_out.audio.i_original_channels =
- id->p_decoder->fmt_out.audio.i_physical_channels;
- else
- id->p_encoder->fmt_out.audio.i_physical_channels =
- id->p_encoder->fmt_out.audio.i_original_channels =
- pi_channels_maps[id->p_encoder->fmt_out.audio.i_channels];
-
/* 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_in.audio.i_original_channels =
- id->p_encoder->fmt_out.audio.i_physical_channels;
+ id->p_encoder->fmt_out.audio.i_physical_channels;
+ id->p_encoder->fmt_in.audio.i_original_channels =
+ id->p_encoder->fmt_out.audio.i_original_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 );
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" );
+ 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 )
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;
}
}
/* Final checks to see if conversions were successful */
if( fmt_last.i_codec != id->p_encoder->fmt_in.i_codec )
{
- msg_Dbg( p_stream, "no audio filter found (%4.4s->%4.4s)",
+ msg_Err( p_stream, "no audio filter found (%4.4s->%4.4s)",
(char *)&fmt_last.i_codec,
(char *)&id->p_encoder->fmt_in.i_codec );
transcode_audio_close( p_stream, id );
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_Dbg( 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 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;
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
}
if( fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate )
{
- msg_Dbg( p_stream, "no audio filter found for resampling from"
+ msg_Err( p_stream, "no audio filter found for resampling from"
" %iHz to %iHz", fmt_last.audio.i_rate,
id->p_encoder->fmt_in.audio.i_rate );
+#if 0
+ /* FIXME : this might work, but only if the encoder is restarted */
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 );
+ return VLC_EGENERIC;
+#endif
}
/* FIXME: Hack for mp3 transcoding support */
/* 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++ )
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,
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 );
if( p_sys->b_master_sync )
{
mtime_t i_dts = date_Get( &id->interpolated_pts ) + 1;
+ if ( p_audio_buf->start_date - i_dts > MASTER_SYNC_MAX_DRIFT
+ || p_audio_buf->start_date - i_dts < -MASTER_SYNC_MAX_DRIFT )
+ {
+ msg_Dbg( p_stream, "drift is too high, resetting master sync" );
+ date_Set( &id->interpolated_pts, p_audio_buf->start_date );
+ i_dts = p_audio_buf->start_date + 1;
+ }
p_sys->i_master_drift = p_audio_buf->start_date - i_dts;
date_Increment( &id->interpolated_pts, p_audio_buf->i_nb_samples );
p_audio_buf->start_date -= p_sys->i_master_drift;
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;
}
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 );
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;
id->p_decoder->pf_decode_video = 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->p_owner = malloc( sizeof(decoder_owner_sys_t) );
for( i = 0; i < PICTURE_RING_SIZE; i++ )
id->p_decoder->p_owner->pp_pics[i] = 0;
- //id->p_decoder->p_cfg = p_sys->p_video_cfg;
+ 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_encoder, "encoder", p_sys->psz_venc, VLC_TRUE );
if( !id->p_encoder->p_module )
{
- msg_Err( p_stream, "cannot find encoder" );
+ msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_venc );
module_Unneed( id->p_decoder, id->p_decoder->p_module );
id->p_decoder->p_module = 0;
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 );
+ 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 )
{
+ 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 );
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,
- VLC_THREAD_PRIORITY_VIDEO, VLC_FALSE ) )
+ if( vlc_thread_create( p_sys, "encoder", EncoderThread, i_priority,
+ VLC_FALSE ) )
{
msg_Err( p_stream, "cannot spawn encoder thread" );
module_Unneed( id->p_decoder, id->p_decoder->p_module );
}
}
- date_Set( &id->interpolated_pts, 0 );
-
return VLC_SUCCESS;
}
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- /* Hack because of the copy packetizer which can fail to detect the
- * proper size (which forces us to wait until the 1st frame
- * is decoded) */
- int i_width = id->p_decoder->fmt_out.video.i_width -
- p_sys->i_crop_left - p_sys->i_crop_right;
- int i_height = id->p_decoder->fmt_out.video.i_height -
- p_sys->i_crop_top - p_sys->i_crop_bottom;
+ /* 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;
+
+ /* 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;
+
+ /* 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 );
+
+ /* 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 );
+
+ /* 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 && p_sys->f_scale )
{
- /* Apply the scaling */
- id->p_encoder->fmt_out.video.i_width = i_width * p_sys->f_scale;
- id->p_encoder->fmt_out.video.i_height = i_height * p_sys->f_scale;
+ /* Global scaling. Make sure width will remain a factor of 16 */
+ float f_real_scale;
+ int i_new_height;
+ int i_new_width = i_src_width * p_sys->f_scale;
+
+ if( i_new_width % 16 <= 7 && i_new_width >= 16 )
+ i_new_width -= i_new_width % 16;
+ else
+ i_new_width += 16 - i_new_width % 16;
+
+ f_real_scale = (float)( i_new_width ) / (float) i_src_width;
+
+ i_new_height = __MAX( 16, i_src_height * (float)f_real_scale );
+
+ f_scale_width = f_real_scale;
+ f_scale_height = (float) i_new_height / (float) i_src_height;
}
else if( id->p_encoder->fmt_out.video.i_width > 0 &&
id->p_encoder->fmt_out.video.i_height <= 0 )
{
- id->p_encoder->fmt_out.video.i_height =
- id->p_encoder->fmt_out.video.i_width / (double)i_width * i_height;
+ /* Only width specified */
+ f_scale_width = (float)id->p_encoder->fmt_out.video.i_width /
+ p_sys->i_crop_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 )
{
- id->p_encoder->fmt_out.video.i_width =
- id->p_encoder->fmt_out.video.i_height / (double)i_height * i_width;
- }
-
- /* Make sure the size is at least a multiple of 2 */
- id->p_encoder->fmt_out.video.i_width =
- (id->p_encoder->fmt_out.video.i_width + 1) >> 1 << 1;
- id->p_encoder->fmt_out.video.i_height =
- (id->p_encoder->fmt_out.video.i_height + 1) >> 1 << 1;
-
- id->p_encoder->fmt_in.video.i_width =
- id->p_encoder->fmt_out.video.i_width;
- id->p_encoder->fmt_in.video.i_height =
- id->p_encoder->fmt_out.video.i_height;
-
+ /* Only height specified */
+ f_scale_height = (float)id->p_encoder->fmt_out.video.i_height /
+ p_sys->i_crop_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;
+ }
+
+ /* 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 )
+ {
+ f_scale_width = (float)p_sys->i_maxwidth / p_sys->i_crop_width;
+ }
+ if( p_sys->i_maxheight && f_scale_height > (float)p_sys->i_maxheight /
+ p_sys->i_crop_height )
+ {
+ f_scale_height = (float)p_sys->i_maxheight / p_sys->i_crop_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;
+ }
+ }
+
+ /* 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_in.video.i_width = i_dst_width;
+ id->p_encoder->fmt_in.video.i_height = i_dst_height;
+
+ msg_Dbg( p_stream, "source %ix%i, crop %ix%i, "
+ "destination %ix%i, padding %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
+ );
+
+ /* Handle frame rate conversion */
if( !id->p_encoder->fmt_out.video.i_frame_rate ||
!id->p_encoder->fmt_out.video.i_frame_rate_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 =
- id->p_decoder->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_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 );
+
id->p_encoder->p_module =
module_Need( id->p_encoder, "encoder", p_sys->psz_venc, VLC_TRUE );
if( !id->p_encoder->p_module )
{
- msg_Err( p_stream, "cannot find encoder" );
+ msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_venc );
return VLC_EGENERIC;
}
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 );
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;
}
}
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
int i_duplicate = 1, i;
- picture_t *p_pic;
+ 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;
+ 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 )
+ {
+ mtime_t current_date = mdate();
+ if( current_date + 50000 > p_pic->date )
+ {
+ msg_Dbg( p_stream, "late picture skipped ("I64Fd")",
+ current_date + 50000 - p_pic->date );
+ p_pic->pf_release( p_pic );
+ continue;
+ }
+ }
if( p_sys->b_master_sync )
{
mtime_t i_master_drift = p_sys->i_master_drift;
mtime_t i_pts;
- if( !i_master_drift )
+ 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 )
{
- /* No audio track ? */
- p_sys->i_master_drift = i_master_drift = p_pic->date;
+ msg_Dbg( p_stream, "drift is too high, resetting master sync" );
+ date_Set( &id->interpolated_pts, p_pic->date );
+ i_pts = p_pic->date + 1;
}
-
- i_pts = date_Get( &id->interpolated_pts ) + 1;
i_video_drift = p_pic->date - i_pts;
i_duplicate = 1;
/* 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)",
(int)(i_video_drift - i_master_drift) );
#endif
p_pic->pf_release( p_pic );
- return VLC_EGENERIC;
+ 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)",
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", "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 =
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++;
}
/* 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 ||
- id->p_decoder->fmt_out.video.i_width !=
- id->p_encoder->fmt_out.video.i_width ||
- id->p_decoder->fmt_out.video.i_height !=
- id->p_encoder->fmt_out.video.i_height ||
- p_sys->i_crop_top > 0 || p_sys->i_crop_bottom > 0 ||
- p_sys->i_crop_left > 0 || p_sys->i_crop_right > 0 )
+
+ (int)id->p_decoder->fmt_out.video.i_width != p_sys->i_crop_width ||
+ p_sys->i_crop_width != p_sys->i_nopadd_width ||
+ p_sys->i_nopadd_width != (int)id->p_encoder->fmt_out.video.i_width ||
+
+ (int)id->p_decoder->fmt_out.video.i_height != p_sys->i_crop_height ||
+ p_sys->i_crop_height != p_sys->i_nopadd_height ||
+ p_sys->i_nopadd_height != (int)id->p_encoder->fmt_out.video.i_height)
{
id->pp_filter[id->i_filter] =
vlc_object_create( p_stream, VLC_OBJECT_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],
- "video filter2", 0, 0 );
+ "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++;
}
return VLC_EGENERIC;
}
}
+
+ for( i = 0; (i < p_sys->i_vfilters) && (id->i_ufilter < TRANSCODE_FILTERS); i++ )
+ {
+ id->pp_ufilter[id->i_ufilter] =
+ vlc_object_create( p_stream, VLC_OBJECT_FILTER );
+ vlc_object_attach( id->pp_ufilter[id->i_ufilter], p_stream );
+
+ id->pp_ufilter[id->i_ufilter]->pf_vout_buffer_new =
+ video_new_buffer_filter;
+ id->pp_ufilter[id->i_ufilter]->pf_vout_buffer_del =
+ video_del_buffer_filter;
+
+ id->pp_ufilter[id->i_ufilter]->fmt_in = id->p_encoder->fmt_in;
+ id->pp_ufilter[id->i_ufilter]->fmt_out = id->p_encoder->fmt_in;
+ id->pp_ufilter[id->i_ufilter]->p_cfg = p_sys->p_vfilters_cfg[i];
+ id->pp_ufilter[id->i_ufilter]->p_module =
+ module_Need( id->pp_ufilter[id->i_ufilter],
+ "video filter2", p_sys->psz_vfilters[i], VLC_TRUE );
+ if( id->pp_ufilter[id->i_ufilter]->p_module )
+ {
+ id->pp_ufilter[id->i_ufilter]->p_owner =
+ malloc( sizeof(filter_owner_sys_t) );
+ for( i = 0; i < PICTURE_RING_SIZE; i++ )
+ id->pp_ufilter[id->i_ufilter]->p_owner->pp_pics[i] = 0;
+ id->pp_ufilter[id->i_ufilter]->p_owner->p_sys = p_sys;
+ 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;
+ }
+ }
}
/* Run filter chain */
/* 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 */
}
i_scale_width, i_scale_height );
}
- if( p_sys->i_threads >= 1 )
+ /* Run user specified filter chain */
+ for( i = 0; i < id->i_ufilter; i++ )
{
- vlc_mutex_lock( &p_sys->lock_out );
- p_sys->pp_pics[p_sys->i_last_pic++] = p_pic;
- p_sys->i_last_pic %= PICTURE_RING_SIZE;
- *out = p_sys->p_buffers;
- p_sys->p_buffers = NULL;
- vlc_cond_signal( &p_sys->cond );
- vlc_mutex_unlock( &p_sys->lock_out );
+ p_pic = id->pp_ufilter[i]->pf_video_filter( id->pp_ufilter[i],
+ p_pic );
}
- else
+
+ if( p_sys->i_threads == 0 )
{
block_t *p_block;
p_block = id->p_encoder->pf_encode_video( id->p_encoder, p_pic );
block_ChainAppend( out, p_block );
+ }
+
+ if( p_sys->b_master_sync )
+ {
+ 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 )
+ {
+ msg_Dbg( p_stream, "drift is too high, resetting master sync" );
+ date_Set( &id->interpolated_pts, p_pic->date );
+ i_pts = p_pic->date + 1;
+ }
+ date_Increment( &id->interpolated_pts, 1 );
+ }
- if( p_sys->b_master_sync )
- date_Increment( &id->interpolated_pts, 1 );
+ 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) )
+ {
+ msg_Dbg( p_stream, "drift is too high, resetting master sync" );
+ date_Set( &id->interpolated_pts, p_pic->date );
+ i_pts = p_pic->date + 1;
+ }
+ date_Increment( &id->interpolated_pts, 1 );
- if( p_sys->b_master_sync && i_duplicate > 1 )
+ if( p_sys->i_threads >= 1 )
{
- mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
- date_Increment( &id->interpolated_pts, 1 );
+ /* We can't modify the picture, we need to duplicate it */
+ p_pic2 = video_new_buffer_decoder( id->p_decoder );
+ if( p_pic2 != NULL )
+ {
+ vout_CopyPicture( p_stream, p_pic2, p_pic );
+ p_pic2->date = i_pts;
+ }
+ }
+ else
+ {
+ block_t *p_block;
p_pic->date = i_pts;
p_block = id->p_encoder->pf_encode_video(id->p_encoder, p_pic);
block_ChainAppend( out, p_block );
}
+ }
+ if( p_sys->i_threads == 0 )
+ {
p_pic->pf_release( p_pic );
}
+ else
+ {
+ vlc_mutex_lock( &p_sys->lock_out );
+ p_sys->pp_pics[p_sys->i_last_pic++] = p_pic;
+ p_sys->i_last_pic %= PICTURE_RING_SIZE;
+ *out = p_sys->p_buffers;
+ p_sys->p_buffers = NULL;
+ if( p_pic2 != NULL )
+ {
+ p_sys->pp_pics[p_sys->i_last_pic++] = p_pic2;
+ p_sys->i_last_pic %= PICTURE_RING_SIZE;
+ }
+ vlc_cond_signal( &p_sys->cond );
+ vlc_mutex_unlock( &p_sys->lock_out );
+ }
}
return VLC_SUCCESS;
vlc_mutex_lock( &p_sys->lock_out );
block_ChainAppend( &p_sys->p_buffers, p_block );
- if( p_sys->b_master_sync )
- date_Increment( &id->interpolated_pts, 1 );
-
-#if 0
- if( p_sys->b_master_sync && i_duplicate > 1 )
- {
- mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
- date_Increment( &id->interpolated_pts, 1 );
- p_pic->date = i_pts;
- p_block = id->p_encoder->pf_encode_video(id->p_encoder, p_pic);
- block_ChainAppend( &p_sys->p_buffers, p_block );
- }
-#endif
vlc_mutex_unlock( &p_sys->lock_out );
-
p_pic->pf_release( p_pic );
}
{
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;
else if( p_pic && p_pic->i_refcount > 0 ) p_pic->i_refcount--;
}
-static picture_t *video_new_buffer( vlc_object_t *p_this, picture_t **pp_ring )
+static picture_t *video_new_buffer( vlc_object_t *p_this, picture_t **pp_ring,
+ sout_stream_sys_t *p_sys )
{
decoder_t *p_dec = (decoder_t *)p_this;
picture_t *p_pic;
if( pp_ring[i] == 0 ) break;
}
+ if( i == PICTURE_RING_SIZE && p_sys->i_threads >= 1 )
+ {
+ int i_first_pic = p_sys->i_first_pic;
+
+ if( p_sys->i_first_pic != p_sys->i_last_pic )
+ {
+ /* Encoder still has stuff to encode, wait to clear-up the list */
+ while( p_sys->i_first_pic == i_first_pic )
+ msleep( 100000 );
+ }
+
+ /* 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 )
+ {
+ 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( i == PICTURE_RING_SIZE )
{
msg_Err( p_this, "decoder/filter is leaking pictures, "
p_pic->i_status = RESERVED_PICTURE;
pp_ring[i] = p_pic;
-
return p_pic;
}
static picture_t *video_new_buffer_decoder( decoder_t *p_dec )
{
return video_new_buffer( VLC_OBJECT(p_dec),
- p_dec->p_owner->pp_pics );
+ p_dec->p_owner->pp_pics, p_dec->p_owner->p_sys );
}
static picture_t *video_new_buffer_filter( filter_t *p_filter )
{
return video_new_buffer( VLC_OBJECT(p_filter),
- p_filter->p_owner->pp_pics );
+ p_filter->p_owner->pp_pics,
+ p_filter->p_owner->p_sys );
}
static void video_del_buffer( vlc_object_t *p_this, picture_t *p_pic )
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_cfg = p_sys->p_spu_cfg; */
id->p_decoder->p_module =
module_Need( id->p_decoder, "decoder", "$codec", 0 );
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 );
if( !id->p_encoder->p_module )
{
module_Unneed( id->p_decoder, id->p_decoder->p_module );
- msg_Err( p_stream, "cannot find encoder" );
+ msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_senc );
return VLC_EGENERIC;
}
}
sout_stream_t *p_stream = (sout_stream_t *)p_dec->p_owner;
spu_DestroySubpicture( p_stream->p_sys->p_spu, p_subpic );
}
+
+/*
+ * OSD menu
+ */
+static int transcode_osd_new( sout_stream_t *p_stream, sout_stream_id_t *id )
+{
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+ es_format_t fmt;
+
+ fmt.i_cat = SPU_ES;
+ fmt.i_id = 0xbd1f; /* pid ?? */
+ fmt.i_group = 3; /* pmt entry ?? */
+ fmt.i_codec = VLC_FOURCC( 'Y', 'U', 'V', 'A' );
+ fmt.psz_language = strdup( "osd" );
+
+ id = malloc( sizeof( sout_stream_id_t ) );
+ memset( id, 0, sizeof(sout_stream_id_t) );
+
+ id->id = NULL;
+ id->p_decoder = NULL;
+ id->p_encoder = NULL;
+
+ /* Create encoder object */
+ id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
+ if( !id->p_encoder )
+ {
+ msg_Err( p_stream, "out of memory" );
+ goto error;
+ }
+ vlc_object_attach( id->p_encoder, p_stream );
+ id->p_encoder->p_module = NULL;
+
+ /* Create fake destination format */
+ es_format_Init( &id->p_encoder->fmt_out, fmt.i_cat, 0 );
+ id->p_encoder->fmt_out.i_id = fmt.i_id;
+ id->p_encoder->fmt_out.i_group = fmt.i_group;
+ id->p_encoder->fmt_out.psz_language = strdup( fmt.psz_language );
+
+ if( p_sys->i_osdcodec != 0 || p_sys->psz_osdenc )
+ {
+ msg_Dbg( p_stream, "creating osdmenu transcoding from fcc=`%4.4s' "
+ "to fcc=`%4.4s'", (char*)&fmt.i_codec,
+ (char*)&p_sys->i_osdcodec );
+
+ /* Complete destination format */
+ id->p_encoder->fmt_out.i_codec = p_sys->i_osdcodec;
+
+ /* Open encoder */
+ /* Initialization of encoder format structures */
+ es_format_Init( &id->p_encoder->fmt_in, fmt.i_cat, fmt.i_codec );
+ id->p_encoder->fmt_in.psz_language = strdup( fmt.psz_language );
+
+ 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 );
+
+ if( !id->p_encoder->p_module )
+ {
+ msg_Err( p_stream, "cannot find 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;
+
+ if( !id->id ) goto error;
+ }
+ else
+ {
+ msg_Dbg( p_stream, "not transcoding a stream (fcc=`%4.4s')",
+ (char*)&fmt.i_codec );
+ id->id = p_sys->p_out->pf_add( p_sys->p_out, &fmt );
+ id->b_transcode = VLC_FALSE;
+
+ if( !id->id ) goto error;
+ }
+
+ p_sys->id_osd = id;
+ p_sys->b_es_osd = VLC_TRUE;
+
+ if( !p_sys->p_spu )
+ {
+ p_sys->p_spu = spu_Create( p_stream );
+ if( spu_Init( p_sys->p_spu ) != VLC_SUCCESS )
+ msg_Err( p_sys, "spu initialisation failed" );
+ }
+
+ if( fmt.psz_language )
+ free( fmt.psz_language );
+
+ return VLC_SUCCESS;
+
+ error:
+ msg_Err( p_stream, "starting osd encoding thread failed" );
+ if( id->p_encoder->p_module )
+ module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ if( id->p_encoder )
+ {
+ vlc_object_detach( id->p_encoder );
+ vlc_object_destroy( id->p_encoder );
+ }
+ if( fmt.psz_language ) free( fmt.psz_language );
+ if( id ) free( id );
+ p_sys->id_osd = NULL;
+ p_sys->b_es_osd = VLC_FALSE;
+ return VLC_EGENERIC;
+}
+
+static void transcode_osd_close( sout_stream_t *p_stream, sout_stream_id_t *id)
+{
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+
+ /* Close encoder */
+ if( p_sys->b_es_osd && id )
+ {
+ if( id->p_encoder->p_module )
+ module_Unneed( id->p_encoder, id->p_encoder->p_module );
+
+ if( id->id ) p_sys->p_out->pf_del( p_sys->p_out, id->id );
+
+ if( id->p_encoder )
+ {
+ vlc_object_detach( id->p_encoder );
+ vlc_object_destroy( id->p_encoder );
+ }
+ }
+ p_sys->b_es_osd = VLC_FALSE;
+ if( id ) free( id );
+}
+
+static int transcode_osd_process( sout_stream_t *p_stream,
+ sout_stream_id_t *id,
+ block_t *in, block_t **out )
+{
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+ subpicture_t *p_subpic = NULL;
+
+ /* 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 );
+ }
+ else
+ {
+ msg_Warn( p_stream, "spu channel not initialized, doing it now" );
+ if( !p_sys->p_spu )
+ {
+ p_sys->p_spu = spu_Create( p_stream );
+ if( spu_Init( p_sys->p_spu ) != VLC_SUCCESS )
+ msg_Err( p_stream, "spu initialisation failed" );
+ }
+ }
+
+ if( p_subpic )
+ {
+ block_t *p_block = NULL;
+
+ if( p_sys->b_master_sync && p_sys->i_master_drift )
+ {
+ p_subpic->i_start -= p_sys->i_master_drift;
+ if( p_subpic->i_stop ) p_subpic->i_stop -= p_sys->i_master_drift;
+ }
+
+ p_block = p_sys->id_osd->p_encoder->pf_encode_sub( p_sys->id_osd->p_encoder, p_subpic );
+ if( p_block )
+ {
+ p_block->i_dts = p_block->i_pts = in->i_dts;
+ block_ChainAppend( out, p_block );
+ if( *out )
+ {
+ if( p_sys->p_out->pf_send( p_sys->p_out, p_sys->id_osd->id, *out ) == VLC_SUCCESS )
+ spu_DestroySubpicture( p_sys->p_spu, p_subpic );
+ }
+ return VLC_SUCCESS;
+ }
+ }
+ return VLC_EGENERIC;
+}
projects / vlc / blobdiff