/*****************************************************************************
* 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"
-
-/* ffmpeg header */
-#ifdef HAVE_FFMPEG_AVCODEC_H
-# include <ffmpeg/avcodec.h>
-#else
-# include <avcodec.h>
-#endif
+#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>
-#if LIBAVCODEC_BUILD < 4704
-# define AV_NOPTS_VALUE 0
-#endif
+#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." )
+ "This is the subtitles codec that will be used." )
+
+#define SFILTER_TEXT N_("Overlays")
+#define SFILTER_LONGTEXT N_( \
+ "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 * );
#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 );
add_string( SOUT_CFG_PREFIX "venc", NULL, NULL, VENC_TEXT,
VENC_LONGTEXT, VLC_FALSE );
add_string( SOUT_CFG_PREFIX "vcodec", NULL, NULL, VCODEC_TEXT,
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 );
add_string( SOUT_CFG_PREFIX "acodec", NULL, NULL, ACODEC_TEXT,
ACHANS_LONGTEXT, VLC_FALSE );
add_integer( SOUT_CFG_PREFIX "samplerate", 0, NULL, ARATE_TEXT,
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,
SENC_LONGTEXT, VLC_FALSE );
add_string( SOUT_CFG_PREFIX "scodec", NULL, NULL, SCODEC_TEXT,
SCODEC_LONGTEXT, VLC_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,
+ 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 );
- add_bool( SOUT_CFG_PREFIX "audio-sync", 0, NULL, ASYNC_TEXT,
- ASYNC_LONGTEXT, VLC_FALSE );
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",
- "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 Del ( sout_stream_t *, sout_stream_id_t * );
static int Send( sout_stream_t *, sout_stream_id_t *, block_t* );
-static int transcode_audio_ffmpeg_new ( sout_stream_t *, sout_stream_id_t * );
-static void transcode_audio_ffmpeg_close ( sout_stream_t *, sout_stream_id_t * );
-static int transcode_audio_ffmpeg_process( sout_stream_t *, sout_stream_id_t *, block_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 int transcode_audio_process( sout_stream_t *, sout_stream_id_t *,
+ block_t *, block_t ** );
+
+static aout_buffer_t *audio_new_buffer( decoder_t *, int );
+static void audio_del_buffer( decoder_t *, aout_buffer_t * );
-static int transcode_video_ffmpeg_new ( sout_stream_t *, sout_stream_id_t * );
-static void transcode_video_ffmpeg_close ( sout_stream_t *, sout_stream_id_t * );
-static int transcode_video_ffmpeg_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 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 int transcode_video_ffmpeg_getframebuf( struct AVCodecContext *, AVFrame *);
+static void video_del_buffer( vlc_object_t *, picture_t * );
+static picture_t *video_new_buffer_decoder( decoder_t * );
+static void video_del_buffer_decoder( decoder_t *, picture_t * );
+static void video_link_picture_decoder( decoder_t *, picture_t * );
+static void video_unlink_picture_decoder( decoder_t *, picture_t * );
+static picture_t *video_new_buffer_filter( filter_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 int transcode_spu_process( sout_stream_t *, sout_stream_id_t *,
block_t *, block_t ** );
-static subpicture_t *transcode_spu_get( sout_stream_t *, sout_stream_id_t *,
- mtime_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 );
#define PICTURE_RING_SIZE 64
#define SUBPICTURE_RING_SIZE 20
+#define TRANSCODE_FILTERS 10
struct sout_stream_sys_t
{
VLC_COMMON_MEMBERS
- sout_stream_t * p_out;
- sout_stream_id_t * id_video;
- block_t * p_buffers;
+ sout_stream_t *p_out;
+ sout_stream_id_t *id_video;
+ block_t *p_buffers;
vlc_mutex_t lock_out;
vlc_cond_t cond;
picture_t * pp_pics[PICTURE_RING_SIZE];
/* 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;
- mtime_t i_input_dts;
- mtime_t i_input_pts;
- vlc_bool_t b_input_has_b_frames;
+ 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;
- mtime_t i_output_pts;
+ 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;
- subpicture_t *pp_subpics[SUBPICTURE_RING_SIZE];
+ config_chain_t *p_spu_cfg;
+ spu_t *p_spu;
- /* Filters */
- filter_t *p_filter_blend;
+ /* 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_audio_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;
+};
+
/*****************************************************************************
* Open:
*****************************************************************************/
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_stream_sys_t *p_sys;
vlc_value_t val;
- int i;
p_sys = vlc_object_create( p_this, sizeof( sout_stream_sys_t ) );
if( !p_sys->p_out )
{
msg_Err( p_stream, "cannot create chain" );
- free( p_sys );
+ vlc_object_destroy( p_sys );
return VLC_EGENERIC;
}
- p_sys->b_input_has_b_frames = VLC_FALSE;
- p_sys->i_output_pts = 0;
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 */
- var_Get( p_stream, SOUT_CFG_PREFIX "senc", &val );
+ p_sys->p_spu = NULL;
p_sys->psz_senc = NULL;
p_sys->p_spu_cfg = NULL;
+ p_sys->i_scodec = 0;
+
+ var_Get( p_stream, SOUT_CFG_PREFIX "senc", &val );
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 );
var_Get( p_stream, SOUT_CFG_PREFIX "scodec", &val );
- p_sys->i_scodec = 0;
if( val.psz_string && *val.psz_string )
{
char fcc[4] = " ";
if( p_sys->i_scodec )
{
- msg_Dbg( p_stream, "codec spu=%4.4s", (char *)&p_sys->i_acodec );
+ msg_Dbg( p_stream, "codec spu=%4.4s", (char *)&p_sys->i_scodec );
}
var_Get( p_stream, SOUT_CFG_PREFIX "soverlay", &val );
p_sys->b_soverlay = val.b_bool;
- p_sys->p_filter_blend = 0;
- for( i = 0; i < SUBPICTURE_RING_SIZE; i++ )
+ var_Get( p_stream, SOUT_CFG_PREFIX "sfilter", &val );
+ if( val.psz_string && *val.psz_string )
+ {
+ 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", val );
+ spu_Init( p_sys->p_spu );
+ }
+ 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 )
{
- p_sys->pp_subpics[i] = 0;
+ 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_audio_sync = val.b_bool;
- if( p_sys->f_fps > 0 ) p_sys->b_audio_sync = VLC_TRUE;
+ p_sys->b_master_sync = val.b_bool;
+ if( p_sys->f_fps > 0 ) p_sys->b_master_sync = VLC_TRUE;
p_stream->pf_add = Add;
p_stream->pf_del = Del;
p_stream->pf_send = Send;
p_stream->p_sys = p_sys;
- avcodec_init();
- avcodec_register_all();
-
return VLC_SUCCESS;
}
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->psz_senc ) free( p_sys->psz_senc );
- if( p_sys->p_filter_blend )
+ if( p_sys->p_spu ) spu_Destroy( p_sys->p_spu );
+
+ while( p_sys->p_osd_cfg != NULL )
{
- if( p_sys->p_filter_blend->p_module )
- module_Unneed( p_sys->p_filter_blend,
- p_sys->p_filter_blend->p_module );
+ 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 );
- vlc_object_detach( p_sys->p_filter_blend );
- vlc_object_destroy( p_sys->p_filter_blend );
+ p_sys->p_osd_cfg = p_next;
}
+ if( p_sys->psz_osdenc ) free( p_sys->psz_osdenc );
vlc_object_destroy( p_sys );
}
struct sout_stream_id_t
{
vlc_fourcc_t b_transcode;
- es_format_t f_src; /* only if transcoding */
- es_format_t f_dst; /* " " " */
- unsigned int i_inter_pixfmt; /* intermediary format when transcoding */
/* id of the out stream */
void *id;
/* Decoder */
decoder_t *p_decoder;
+ /* Filters */
+ 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;
- vlc_fourcc_t b_enc_inited;
-
- /* ffmpeg part */
- AVCodec *ff_dec;
- AVCodecContext *ff_dec_c;
-
- mtime_t i_dts;
- mtime_t i_length;
-
- int i_buffer;
- int i_buffer_pos;
- uint8_t *p_buffer;
-
- AVFrame *p_ff_pic;
- AVFrame *p_ff_pic_tmp0; /* to do deinterlace */
- AVFrame *p_ff_pic_tmp1; /* to do pix conversion */
- AVFrame *p_ff_pic_tmp2; /* to do resample */
- AVFrame *p_ff_pic_tmp3; /* to do subpicture overlay */
-
- ImgReSampleContext *p_vresample;
/* Sync */
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;
id->p_decoder = NULL;
id->p_encoder = NULL;
- /* Get source format */
- id->f_src = *p_fmt;
+ /* 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;
+
+ /* 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 destination format */
- es_format_Init( &id->f_dst, p_fmt->i_cat, 0 );
- id->f_dst.i_id = id->f_src.i_id;
- id->f_dst.i_group = id->f_src.i_group;
- if( id->f_src.psz_language )
- id->f_dst.psz_language = strdup( id->f_src.psz_language );
+ es_format_Init( &id->p_encoder->fmt_out, p_fmt->i_cat, 0 );
+ id->p_encoder->fmt_out.i_id = p_fmt->i_id;
+ id->p_encoder->fmt_out.i_group = p_fmt->i_group;
+ if( p_fmt->psz_language )
+ id->p_encoder->fmt_out.psz_language = strdup( p_fmt->psz_language );
if( p_fmt->i_cat == AUDIO_ES && (p_sys->i_acodec || p_sys->psz_aenc) )
{
(char*)&p_fmt->i_codec, (char*)&p_sys->i_acodec );
/* Complete destination format */
- id->f_dst.i_codec = p_sys->i_acodec;
- id->f_dst.audio.i_rate = p_sys->i_sample_rate > 0 ?
- p_sys->i_sample_rate : id->f_src.audio.i_rate;
- id->f_dst.audio.i_channels = p_sys->i_channels > 0 ?
- p_sys->i_channels : id->f_src.audio.i_channels;
- id->f_dst.i_bitrate = p_sys->i_abitrate;
- id->f_dst.audio.i_bitspersample = id->f_src.audio.i_bitspersample;
+ 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.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 */
- if( transcode_audio_ffmpeg_new( p_stream, id ) )
+ /* Build decoder -> filter -> encoder chain */
+ if( transcode_audio_new( p_stream, id ) )
{
msg_Err( p_stream, "cannot create audio chain" );
- free( id );
- return NULL;
+ goto error;
}
- /* open output stream */
- id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->f_dst );
+ /* 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 == NULL )
+ if( !id->id )
{
- free( id );
- return NULL;
+ transcode_audio_close( p_stream, id );
+ goto error;
}
date_Init( &id->interpolated_pts, p_fmt->audio.i_rate, 1 );
(char*)&p_fmt->i_codec, (char*)&p_sys->i_vcodec );
/* Complete destination format */
- id->f_dst.i_codec = p_sys->i_vcodec;
- id->f_dst.video.i_width = p_sys->i_width;
- id->f_dst.video.i_height = p_sys->i_height;
- id->f_dst.i_bitrate = p_sys->i_vbitrate;
+ id->p_encoder->fmt_out.i_codec = p_sys->i_vcodec;
+ 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 */
- if( transcode_video_ffmpeg_new( p_stream, id ) )
+ /* Build decoder -> filter -> encoder chain */
+ if( transcode_video_new( p_stream, id ) )
{
msg_Err( p_stream, "cannot create video chain" );
- free( id );
- return NULL;
+ goto error;
}
-#if 0
- /* open output stream */
- id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->f_dst );
-#endif
+
+ /* Stream will be added later on because we don't know
+ * all the characteristics of the decoded stream yet */
id->b_transcode = VLC_TRUE;
- if( id->f_dst.video.i_frame_rate && id->f_dst.video.i_frame_rate_base )
- {
- date_Init( &id->interpolated_pts, id->f_dst.video.i_frame_rate,
- id->f_dst.video.i_frame_rate_base );
- }
- else if( p_sys->b_audio_sync )
+ if( p_sys->f_fps > 0 )
{
- msg_Warn( p_stream, "no video frame rate available, disabling "
- "audio sync" );
- p_sys->b_audio_sync = VLC_FALSE;
+ 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;
}
}
else if( p_fmt->i_cat == SPU_ES && (p_sys->i_scodec || p_sys->psz_senc) )
(char*)&p_sys->i_scodec );
/* Complete destination format */
- id->f_dst.i_codec = p_sys->i_scodec;
+ id->p_encoder->fmt_out.i_codec = p_sys->i_scodec;
/* build decoder -> filter -> encoder */
if( transcode_spu_new( p_stream, id ) )
{
msg_Err( p_stream, "cannot create subtitles chain" );
- free( id );
- return NULL;
+ goto error;
}
/* open output stream */
- id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->f_dst );
+ 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 == NULL )
+ if( !id->id )
{
- free( id );
- return NULL;
+ transcode_spu_close( p_stream, id );
+ goto error;
}
}
else if( p_fmt->i_cat == SPU_ES && p_sys->b_soverlay )
id->b_transcode = VLC_TRUE;
- /* build decoder -> filter -> encoder */
+ /* Build decoder -> filter -> overlaying chain */
if( transcode_spu_new( p_stream, id ) )
{
msg_Err( p_stream, "cannot create subtitles chain" );
- free( id );
- return NULL;
+ goto error;
}
}
else
id->id = p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
id->b_transcode = VLC_FALSE;
- if( id->id == NULL )
+ 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) )
{
- free( id );
- return NULL;
+ if( transcode_osd_new( p_stream, p_sys->id_osd ) )
+ {
+ msg_Err( p_stream, "cannot create osd chain" );
+ goto error;
+ }
+ p_sys->b_es_osd = VLC_TRUE;
}
}
-
return id;
+
+ error:
+ if( id->p_decoder )
+ {
+ vlc_object_detach( id->p_decoder );
+ vlc_object_destroy( id->p_decoder );
+ 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 NULL;
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
{
- sout_stream_sys_t *p_sys = p_stream->p_sys;
+ 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 )
{
- if( id->f_src.i_cat == AUDIO_ES )
- {
- transcode_audio_ffmpeg_close( p_stream, id );
- }
- else if( id->f_src.i_cat == VIDEO_ES )
- {
- transcode_video_ffmpeg_close( p_stream, id );
- }
- else if( id->f_src.i_cat == SPU_ES )
+ switch( id->p_decoder->fmt_in.i_cat )
{
+ case AUDIO_ES:
+ transcode_audio_close( p_stream, id );
+ break;
+ case VIDEO_ES:
+ transcode_video_close( p_stream, id );
+ break;
+ case SPU_ES:
transcode_spu_close( p_stream, id );
+ break;
}
}
if( id->id ) p_sys->p_out->pf_del( p_sys->p_out, id->id );
+
+ if( id->p_decoder )
+ {
+ 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 = NULL;
- if( id->b_transcode )
+ if( !id->b_transcode && id->id )
{
- block_t *p_buffer_out;
-
- /* Be sure to have padding */
- p_buffer = block_Realloc( p_buffer, 0, p_buffer->i_buffer + FF_INPUT_BUFFER_PADDING_SIZE );
- if( p_buffer == NULL )
+ /* Transcode OSD menu pictures. */
+ if( p_sys->b_es_osd )
{
- return VLC_EGENERIC;
+ transcode_osd_process( p_stream, id, p_buffer, &p_out );
}
- p_buffer->i_buffer -= FF_INPUT_BUFFER_PADDING_SIZE;
- memset( &p_buffer->p_buffer[p_buffer->i_buffer], 0, FF_INPUT_BUFFER_PADDING_SIZE );
+ return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer );
+ }
+ else if( !id->b_transcode )
+ {
+ block_Release( p_buffer );
+ return VLC_EGENERIC;
+ }
- if( id->f_src.i_cat == AUDIO_ES )
- {
- transcode_audio_ffmpeg_process( p_stream, id, p_buffer,
- &p_buffer_out );
- block_Release( p_buffer );
- }
- else if( id->f_src.i_cat == VIDEO_ES )
- {
- if( transcode_video_ffmpeg_process( p_stream, id, p_buffer,
- &p_buffer_out ) != VLC_SUCCESS )
- {
- block_Release( p_buffer );
- return VLC_EGENERIC;
- }
- block_Release( p_buffer );
- }
- else if( id->f_src.i_cat == SPU_ES )
- {
- if( transcode_spu_process( p_stream, id, p_buffer,
- &p_buffer_out ) != VLC_SUCCESS )
- {
- return VLC_EGENERIC;
- }
- }
- else
+ switch( id->p_decoder->fmt_in.i_cat )
+ {
+ case AUDIO_ES:
+ transcode_audio_process( p_stream, id, p_buffer, &p_out );
+ break;
+
+ case VIDEO_ES:
+ if( transcode_video_process( p_stream, id, p_buffer, &p_out )
+ != VLC_SUCCESS )
{
- block_Release( p_buffer );
+ return VLC_EGENERIC;
}
+ break;
- if( p_buffer_out )
+ case SPU_ES:
+ if( transcode_spu_process( p_stream, id, p_buffer, &p_out ) !=
+ VLC_SUCCESS )
{
- return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer_out );
+ return VLC_EGENERIC;
}
- return VLC_SUCCESS;
- }
- else if( id->id != NULL )
- {
- return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer );
- }
- else
- {
+ break;
+
+ default:
+ p_out = NULL;
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 );
+ return VLC_SUCCESS;
}
/****************************************************************************
- * ffmpeg decoder reencoder part
+ * decoder reencoder part
****************************************************************************/
-static struct
-{
- vlc_fourcc_t i_fcc;
- int i_ff_codec;
-} fourcc_to_ff_code[] =
-{
- /* audio */
- { VLC_FOURCC( 'm', 'p', 'g', 'a' ), CODEC_ID_MP2 },
- { VLC_FOURCC( 'm', 'p', '3', ' ' ), CODEC_ID_MP3LAME },
- { VLC_FOURCC( 'm', 'p', '4', 'a' ), CODEC_ID_AAC },
- { VLC_FOURCC( 'a', '5', '2', ' ' ), CODEC_ID_AC3 },
- { VLC_FOURCC( 'a', 'c', '3', ' ' ), CODEC_ID_AC3 },
- { VLC_FOURCC( 'w', 'm', 'a', '1' ), CODEC_ID_WMAV1 },
- { VLC_FOURCC( 'w', 'm', 'a', '2' ), CODEC_ID_WMAV2 },
- { VLC_FOURCC( 'v', 'o', 'r', 'b' ), CODEC_ID_VORBIS },
- { VLC_FOURCC( 'a', 'l', 'a', 'w' ), CODEC_ID_PCM_ALAW },
-
- /* video */
- { VLC_FOURCC( 'm', 'p', 'g', 'v' ), CODEC_ID_MPEG1VIDEO },
- { VLC_FOURCC( 'm', 'p', '1', 'v' ), CODEC_ID_MPEG1VIDEO },
-#if LIBAVCODEC_BUILD >= 4676
- { VLC_FOURCC( 'm', 'p', '2', 'v' ), CODEC_ID_MPEG2VIDEO },
-#endif
- { VLC_FOURCC( 'm', 'p', '4', 'v'), CODEC_ID_MPEG4 },
- { VLC_FOURCC( 'D', 'I', 'V', '1' ), CODEC_ID_MSMPEG4V1 },
- { VLC_FOURCC( 'D', 'I', 'V', '2' ), CODEC_ID_MSMPEG4V2 },
- { VLC_FOURCC( 'D', 'I', 'V', '3' ), CODEC_ID_MSMPEG4V3 },
- { VLC_FOURCC( 'H', '2', '6', '3' ), CODEC_ID_H263 },
- { VLC_FOURCC( 'I', '2', '6', '3' ), CODEC_ID_H263I },
- { VLC_FOURCC( 'h', 'u', 'f', 'f' ), CODEC_ID_HUFFYUV },
- { VLC_FOURCC( 'W', 'M', 'V', '1' ), CODEC_ID_WMV1 },
- { VLC_FOURCC( 'W', 'M', 'V', '2' ), CODEC_ID_WMV2 },
- { VLC_FOURCC( 'M', 'J', 'P', 'G' ), CODEC_ID_MJPEG },
- { VLC_FOURCC( 'm', 'j', 'p', 'b' ), CODEC_ID_MJPEGB },
- { VLC_FOURCC( 'd', 'v', 's', 'l' ), CODEC_ID_DVVIDEO },
- { VLC_FOURCC( 'S', 'V', 'Q', '1' ), CODEC_ID_SVQ1 },
-#if LIBAVCODEC_BUILD >= 4666
- { VLC_FOURCC( 'S', 'V', 'Q', '3' ), CODEC_ID_SVQ3 },
- { VLC_FOURCC( 'h', '2', '6', '4' ), CODEC_ID_H264 },
-#endif
-#if LIBAVCODEC_BUILD >= 4719
- { VLC_FOURCC( 'S', 'N', 'O', 'W' ), CODEC_ID_SNOW },
-#endif
-
- /* raw video code, only used for 'encoding' */
- { VLC_FOURCC( 'I', '4', '2', '0' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'I', '4', '2', '2' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'I', '4', '4', '4' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'R', 'V', '1', '5' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'R', 'V', '1', '6' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'R', 'V', '2', '4' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'R', 'V', '3', '2' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'Y', 'U', 'Y', '2' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'Y', 'V', '1', '2' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'I', 'Y', 'U', 'V' ), CODEC_ID_RAWVIDEO },
-
- { VLC_FOURCC( 0, 0, 0, 0 ), 0 }
-};
-
-static inline int get_ff_codec( vlc_fourcc_t i_fcc )
+int audio_BitsPerSample( vlc_fourcc_t i_format )
{
- int i;
-
- for( i = 0; fourcc_to_ff_code[i].i_fcc != 0; i++ )
+ switch( i_format )
{
- if( fourcc_to_ff_code[i].i_fcc == i_fcc )
- {
- return fourcc_to_ff_code[i].i_ff_codec;
- }
+ 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;
+
+ 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;
+
+ case VLC_FOURCC('f','l','6','4'):
+ return 64;
}
return 0;
}
-static inline int get_ff_chroma( vlc_fourcc_t i_chroma )
+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 )
{
- switch( i_chroma )
- {
- case VLC_FOURCC( 'Y', 'V', '1', '2' ):
- case VLC_FOURCC( 'I', 'Y', 'U', 'V' ):
- case VLC_FOURCC( 'I', '4', '2', '0' ):
- return PIX_FMT_YUV420P;
- case VLC_FOURCC( 'I', '4', '2', '2' ):
- return PIX_FMT_YUV422P;
- case VLC_FOURCC( 'I', '4', '4', '4' ):
- return PIX_FMT_YUV444P;
- case VLC_FOURCC( 'R', 'V', '1', '5' ):
- return PIX_FMT_RGB555;
- case VLC_FOURCC( 'R', 'V', '1', '6' ):
- return PIX_FMT_RGB565;
- case VLC_FOURCC( 'R', 'V', '2', '4' ):
- return PIX_FMT_BGR24;
- case VLC_FOURCC( 'R', 'V', '3', '2' ):
- return PIX_FMT_RGBA32;
- case VLC_FOURCC( 'G', 'R', 'E', 'Y' ):
- return PIX_FMT_GRAY8;
- case VLC_FOURCC( 'Y', 'U', 'Y', '2' ):
- return PIX_FMT_YUV422;
- default:
- return 0;
- }
-}
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+ filter_t *p_filter = vlc_object_create( p_stream, VLC_OBJECT_FILTER );
-static inline vlc_fourcc_t get_vlc_chroma( int i_pix_fmt )
-{
- switch( i_pix_fmt )
- {
- case PIX_FMT_YUV420P:
- return VLC_FOURCC('I','4','2','0');
- case PIX_FMT_YUV422P:
- return VLC_FOURCC('I','4','2','2');
- case PIX_FMT_YUV444P:
- return VLC_FOURCC('I','4','4','4');
-
- case PIX_FMT_YUV422:
- return VLC_FOURCC('Y','U','Y','2');
-
- case PIX_FMT_RGB555:
- return VLC_FOURCC('R','V','1','5');
- case PIX_FMT_RGB565:
- return VLC_FOURCC('R','V','1','6');
- case PIX_FMT_RGB24:
- return VLC_FOURCC('R','V','2','4');
- case PIX_FMT_RGBA32:
- return VLC_FOURCC('R','V','3','2');
- case PIX_FMT_GRAY8:
- return VLC_FOURCC('G','R','E','Y');
-
- case PIX_FMT_YUV410P:
- case PIX_FMT_YUV411P:
- case PIX_FMT_BGR24:
- default:
- return 0;
- }
-}
+ vlc_object_attach( p_filter, p_stream );
+ p_filter->pf_audio_buffer_new = (block_t* (*) (filter_t*, int))__block_New;
-static int transcode_audio_ffmpeg_new( sout_stream_t *p_stream,
- sout_stream_id_t *id )
-{
- int i_ff_codec;
+ 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];
- if( id->f_src.i_codec == VLC_FOURCC('s','1','6','l') ||
- id->f_src.i_codec == VLC_FOURCC('s','1','6','b') ||
- id->f_src.i_codec == VLC_FOURCC('s','8',' ',' ') ||
- id->f_src.i_codec == VLC_FOURCC('u','8',' ',' ') )
+ p_filter->p_module = module_Need( p_filter, "audio filter2", psz_name,
+ VLC_TRUE );
+ if( p_filter->p_module )
{
- id->ff_dec = NULL;
-
- id->ff_dec_c = avcodec_alloc_context();
- id->ff_dec_c->sample_rate = id->f_src.audio.i_rate;
- id->ff_dec_c->channels = id->f_src.audio.i_channels;
- id->ff_dec_c->block_align = id->f_src.audio.i_blockalign;
- id->ff_dec_c->bit_rate = id->f_src.i_bitrate;
+ p_filter->fmt_out.audio.i_bitspersample =
+ audio_BitsPerSample( p_filter->fmt_out.i_codec );
+ *p_fmt_in = p_filter->fmt_out;
}
else
{
- /* find decoder */
- i_ff_codec = get_ff_codec( id->f_src.i_codec );
- if( i_ff_codec == 0 )
- {
- msg_Err( p_stream, "cannot find decoder id" );
- return VLC_EGENERIC;
- }
-
- id->ff_dec = avcodec_find_decoder( i_ff_codec );
- if( !id->ff_dec )
- {
- msg_Err( p_stream, "cannot find decoder (avcodec)" );
- return VLC_EGENERIC;
- }
-
- id->ff_dec_c = avcodec_alloc_context();
- id->ff_dec_c->sample_rate = id->f_src.audio.i_rate;
- id->ff_dec_c->channels = id->f_src.audio.i_channels;
- id->ff_dec_c->block_align = id->f_src.audio.i_blockalign;
- id->ff_dec_c->bit_rate = id->f_src.i_bitrate;
-
- id->ff_dec_c->extradata_size = id->f_src.i_extra;
- id->ff_dec_c->extradata = id->f_src.p_extra;
- if( avcodec_open( id->ff_dec_c, id->ff_dec ) )
- {
- msg_Err( p_stream, "cannot open decoder" );
- av_free( id->ff_dec_c );
- return VLC_EGENERIC;
- }
+ vlc_object_detach( p_filter );
+ vlc_object_destroy( p_filter );
+ p_filter = 0;
}
- id->i_buffer = 2 * AVCODEC_MAX_AUDIO_FRAME_SIZE;
- id->i_buffer_pos = 0;
- id->p_buffer = malloc( id->i_buffer );
-
- /* Sanity check for audio channels */
- id->f_dst.audio.i_channels =
- __MIN( id->f_dst.audio.i_channels, id->f_src.audio.i_channels );
+ return p_filter;
+}
- /* find encoder */
- id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
+static int transcode_audio_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_last;
+ int i;
- /* 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;
- id->p_encoder->fmt_in.audio.i_rate = id->f_dst.audio.i_rate;
- id->p_encoder->fmt_in.audio.i_physical_channels =
- id->p_encoder->fmt_in.audio.i_original_channels =
- pi_channels_maps[id->f_dst.audio.i_channels];
- id->p_encoder->fmt_in.audio.i_channels = id->f_dst.audio.i_channels;
- id->p_encoder->fmt_in.audio.i_bitspersample = 16;
+ /*
+ * Open decoder
+ */
- id->p_encoder->fmt_out = id->f_dst;
+ /* 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_audio_cfg; */
- id->p_encoder->p_cfg = p_stream->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 =
+ audio_BitsPerSample( id->p_decoder->fmt_out.i_codec );
+ fmt_last = id->p_decoder->fmt_out;
+ /* Fix AAC SBR changing number of channels and sampling rate */
+ 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
+ */
- /* Attach object to parent so object variables inheritance works */
- vlc_object_attach( id->p_encoder, p_stream );
+ /* Initialization of encoder format structures */
+ es_format_Init( &id->p_encoder->fmt_in, id->p_decoder->fmt_in.i_cat,
+ 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_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_stream->p_sys->psz_aenc, VLC_TRUE );
+ module_Need( id->p_encoder, "encoder", p_sys->psz_aenc, VLC_TRUE );
if( !id->p_encoder->p_module )
{
- vlc_object_detach( id->p_encoder );
- vlc_object_destroy( id->p_encoder );
- msg_Err( p_stream, "cannot open encoder" );
- av_free( id->ff_dec_c );
+ 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 = NULL;
return VLC_EGENERIC;
}
-
- id->b_enc_inited = VLC_FALSE;
-
- id->f_dst = id->p_encoder->fmt_out;
-
- /* Hack for mp3 transcoding support */
- if( id->f_dst.i_codec == VLC_FOURCC( 'm','p','3',' ' ) )
+ 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->f_dst.i_codec = VLC_FOURCC( 'm','p','g','a' );
+ 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;
}
- return VLC_SUCCESS;
-}
-
-static void transcode_audio_ffmpeg_close( sout_stream_t *p_stream,
- sout_stream_id_t *id )
-{
- if( id->ff_dec ) avcodec_close( id->ff_dec_c );
- av_free( id->ff_dec_c );
-
- module_Unneed( id->p_encoder, id->p_encoder->p_module );
-
- vlc_object_detach( id->p_encoder );
- vlc_object_destroy( id->p_encoder );
+ /* 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');
- free( id->p_buffer );
-}
+ id->pp_filter[id->i_filter] =
+ transcode_audio_filter_new( p_stream, id, &fmt_last, &fmt_out, NULL );
-static int transcode_audio_ffmpeg_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;
- aout_buffer_t aout_buf;
- block_t *p_block;
- int i_buffer = in->i_buffer;
- char *p_buffer = in->p_buffer;
- id->i_dts = in->i_dts;
- *out = NULL;
+ if( id->pp_filter[id->i_filter] ) id->i_filter++;
+ }
- while( i_buffer )
+ for( i = 0; i < TRANSCODE_FILTERS; i++ )
{
- id->i_buffer_pos = 0;
-
- /* decode as much data as possible */
- if( id->ff_dec )
+ 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) )
{
- int i_used;
-
- i_used = avcodec_decode_audio( id->ff_dec_c,
- (int16_t*)id->p_buffer, &id->i_buffer_pos,
- p_buffer, i_buffer );
+ id->pp_filter[id->i_filter] =
+ transcode_audio_filter_new( p_stream, id, &fmt_last,
+ &id->p_encoder->fmt_in, NULL );
-#if 0
- msg_Warn( p_stream, "avcodec_decode_audio: %d used on %d",
- i_used, i_buffer );
-#endif
- if( i_used < 0 )
- {
- msg_Warn( p_stream, "error audio decoding");
+ if( id->pp_filter[id->i_filter] )
+ id->i_filter++;
+ else
break;
- }
+ }
+ }
- i_buffer -= i_used;
- p_buffer += i_used;
+ /* 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)",
+ (char *)&fmt_last.i_codec,
+ (char *)&id->p_encoder->fmt_in.i_codec );
+ transcode_audio_close( p_stream, id );
+ return VLC_EGENERIC;
+ }
- if ( id->i_buffer_pos < 0 )
- {
- msg_Warn( p_stream, "weird error audio decoding");
- break;
- }
- }
+ /* 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
- {
- int16_t *sout = (int16_t*)id->p_buffer;
+ break;
+ }
- if( id->f_src.i_codec == VLC_FOURCC( 's', '8', ' ', ' ' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'u', '8', ' ', ' ' ) )
- {
- int8_t *sin = (int8_t*)p_buffer;
- int i_used = __MIN( id->i_buffer/2, i_buffer );
- int i_samples = i_used;
-
- if( id->f_src.i_codec == VLC_FOURCC( 's', '8', ' ', ' ' ) )
- while( i_samples > 0 )
- {
- *sout++ = ( *sin++ ) << 8;
- i_samples--;
- }
- else
- while( i_samples > 0 )
- {
- *sout++ = ( *sin++ - 128 ) << 8;
- i_samples--;
- }
-
- i_buffer -= i_used;
- p_buffer += i_used;
- id->i_buffer_pos = i_used * 2;
- }
- else if( id->f_src.i_codec == VLC_FOURCC( 's', '1', '6', 'l' ) ||
- id->f_src.i_codec == VLC_FOURCC( 's', '1', '6', 'b' ) )
- {
- int16_t *sin = (int16_t*)p_buffer;
- int i_used = __MIN( id->i_buffer, i_buffer );
- int i_samples = i_used / 2;
+ 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 );
+ 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_in.audio.i_physical_channels =
+ id->p_encoder->fmt_in.audio.i_original_channels =
+ fmt_last.audio.i_physical_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 );
- /* first copy */
- memcpy( sout, sin, i_used );
+ transcode_audio_close( p_stream, id );
+ return VLC_EGENERIC;
+#endif
+ }
-#ifdef WORDS_BIGENDIAN
- if( id->f_src.i_codec == VLC_FOURCC( 's', '1', '6', 'l' ) )
+ if( fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate )
+ {
+ 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
- if( id->f_src.i_codec == VLC_FOURCC( 's', '1', '6', 'b' ) )
+ transcode_audio_close( p_stream, id );
+ return VLC_EGENERIC;
#endif
- {
- uint8_t *dat = (uint8_t*)sout;
+ }
- while( i_samples > 0 )
- {
- uint8_t tmp;
- tmp = dat[0];
- dat[0] = dat[1];
- dat[1] = tmp;
+ /* FIXME: Hack for mp3 transcoding support */
+ if( id->p_encoder->fmt_out.i_codec == VLC_FOURCC( 'm','p','3',' ' ) )
+ id->p_encoder->fmt_out.i_codec = VLC_FOURCC( 'm','p','g','a' );
- dat += 2;
+ return VLC_SUCCESS;
+}
- i_samples--;
- }
- }
+static void transcode_audio_close( sout_stream_t *p_stream,
+ sout_stream_id_t *id )
+{
+ int i;
- i_buffer -= i_used;
- p_buffer += i_used;
- id->i_buffer_pos = i_used;
- }
- }
+ /* Close decoder */
+ if( id->p_decoder->p_module )
+ module_Unneed( id->p_decoder, id->p_decoder->p_module );
+ id->p_decoder->p_module = NULL;
- if( id->i_buffer_pos == 0 ) continue;
+ /* Close encoder */
+ if( id->p_encoder->p_module )
+ module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ id->p_encoder->p_module = NULL;
- /* Encode as much data as possible */
- if( !id->b_enc_inited && id->p_encoder->pf_header )
- {
- block_t *p_block_tmp;
+ /* 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] );
+ }
+}
- p_block = id->p_encoder->pf_header( id->p_encoder );
- p_block_tmp = p_block;
- while( p_block_tmp )
+static int transcode_audio_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;
+ 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 );
+ 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 )
{
- p_block_tmp->i_dts = p_block_tmp->i_pts = in->i_dts;
- p_block_tmp = p_block_tmp->p_next;
+ 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;
}
- block_ChainAppend( out, p_block );
-
- id->b_enc_inited = VLC_TRUE;
+ 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_buf->end_date -= p_sys->i_master_drift;
}
- aout_buf.p_buffer = id->p_buffer;
- aout_buf.i_nb_bytes = id->i_buffer_pos;
- aout_buf.i_nb_samples = id->i_buffer_pos/2/id->f_src.audio.i_channels;
- aout_buf.start_date = id->i_dts;
- aout_buf.end_date = id->i_dts;
+ p_audio_block = p_audio_buf->p_sys;
+ p_audio_block->i_buffer = p_audio_buf->i_nb_bytes;
+ p_audio_block->i_dts = p_audio_block->i_pts =
+ p_audio_buf->start_date;
+ p_audio_block->i_length = p_audio_buf->end_date -
+ p_audio_buf->start_date;
+ p_audio_block->i_samples = p_audio_buf->i_nb_samples;
- if( p_sys->b_audio_sync )
+ /* Run filter chain */
+ for( i = 0; i < id->i_filter; i++ )
{
- aout_buf.start_date = date_Get( &id->interpolated_pts ) + 1;
- p_sys->i_master_drift = id->i_dts - aout_buf.start_date;
- date_Increment( &id->interpolated_pts, aout_buf.i_nb_samples );
+ p_audio_block =
+ id->pp_filter[i]->pf_audio_filter( id->pp_filter[i],
+ p_audio_block );
}
- id->i_dts += ( I64C(1000000) * id->i_buffer_pos / 2 /
- id->f_src.audio.i_channels / id->f_src.audio.i_rate );
-
- if( id->p_encoder->fmt_in.audio.i_channels == 1 &&
- id->f_src.audio.i_channels > 1 )
+ /* Run user specified filter chain */
+ for( i = 0; i < id->i_ufilter; i++ )
{
- int16_t *p_sample = (int16_t *)aout_buf.p_buffer;
- int i_src_c = id->f_src.audio.i_channels;
- unsigned int i;
-
- for( i = 0; i < aout_buf.i_nb_samples; i++ )
- {
- int j, c = 0;
-
- for( j = 1; j < i_src_c; j++ )
- {
- c += p_sample[i_src_c * i + j];
- }
- p_sample[i] = c / (i_src_c-1);
- }
- aout_buf.i_nb_bytes = i * 2;
+ p_audio_block =
+ id->pp_ufilter[i]->pf_audio_filter( id->pp_ufilter[i],
+ p_audio_block );
}
- else if( id->p_encoder->fmt_in.audio.i_channels == 2 &&
- id->f_src.audio.i_channels > 2 )
- {
- int i_src_c = id->f_src.audio.i_channels;
- unsigned int i;
-
- static const float mixf_l[4][6] = /* [i_src_c - 3][channel index] */
- {
- { 0.00, 1.00, 0.00, 0.00, 0.00, 0.00 }, /* 3 channels */
- { 0.00, 0.50, 0.50, 0.00, 0.00, 0.00 }, /* 4 channels */
- { 0.00, 0.50, 0.00, 0.50, 0.00, 0.00 }, /* 5 channels */
- { 0.00, 0.34, 0.33, 0.00, 0.33, 0.00 }, /* 6 channels */
- };
- static const float mixf_r[4][6] = /* [i_src_c - 3][channel index] */
- {
- { 0.00, 1.00, 0.00, 0.00, 0.00, 0.00 }, /* 3 channels */
- { 0.00, 0.00, 0.50, 0.50, 0.00, 0.00 }, /* 4 channels */
- { 0.00, 0.00, 0.50, 0.00, 0.50, 0.00 }, /* 5 channels */
- { 0.00, 0.00, 0.33, 0.34, 0.00, 0.33 }, /* 6 channels */
- };
-
-
- for( i = 0; i < aout_buf.i_nb_samples; i++ )
- {
- int16_t *p_src = (int16_t *)aout_buf.p_buffer + i_src_c * i;
- int16_t *p_dst = (int16_t *)aout_buf.p_buffer + 2 * i;
- int j;
- float l = 0.0, r = 0.0;
- for( j = 0; j < i_src_c; j++ )
- {
- l += mixf_l[i_src_c-3][j] * p_src[j];
- r += mixf_r[i_src_c-3][j] * p_src[j];
- }
+ 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_audio_buf->start_date = p_audio_block->i_dts;
+ p_audio_buf->end_date = p_audio_block->i_dts + p_audio_block->i_length;
- p_dst[0] = (int)( l + 0.5 );
- p_dst[1] = (int)( r + 0.5 );
- }
- aout_buf.i_nb_bytes = i * 2 * 2;
- }
- else if( id->f_src.audio.i_channels !=
- id->p_encoder->fmt_in.audio.i_channels )
- {
- unsigned int i;
- int j;
-
- /* This is for liba52 which is what ffmpeg uses to decode ac3 */
- static const int translation[7][6] =
- {{ 0, 0, 0, 0, 0, 0 }, /* 0 channels (rarely used) */
- { 0, 0, 0, 0, 0, 0 }, /* 1 ch */
- { 0, 1, 0, 0, 0, 0 }, /* 2 */
- { 1, 2, 0, 0, 0, 0 }, /* 3 */
- { 1, 3, 2, 0, 0, 0 }, /* 4 */
- { 1, 3, 4, 2, 0, 0 }, /* 5 */
- { 1, 3, 4, 5, 2, 0 }}; /* 6 */
-
- /* dumb downmixing */
- for( i = 0; i < aout_buf.i_nb_samples; i++ )
- {
- uint16_t *p_buffer = (uint16_t *)aout_buf.p_buffer;
- for( j = 0 ; j < id->p_encoder->fmt_in.audio.i_channels; j++ )
- {
- p_buffer[i*id->p_encoder->fmt_in.audio.i_channels+j] =
- p_buffer[i*id->f_src.audio.i_channels+
- translation[id->f_src.audio.i_channels][j]];
- }
- }
- aout_buf.i_nb_bytes = i*id->p_encoder->fmt_in.audio.i_channels * 2;
- }
-
- p_block = id->p_encoder->pf_encode_audio( id->p_encoder, &aout_buf );
+ p_block = id->p_encoder->pf_encode_audio( id->p_encoder, p_audio_buf );
block_ChainAppend( out, p_block );
+ block_Release( p_audio_block );
+ free( p_audio_buf );
}
return VLC_SUCCESS;
}
+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 );
+}
-/*
- * video
- */
-static int transcode_video_ffmpeg_new( sout_stream_t *p_stream,
- sout_stream_id_t *id )
+static aout_buffer_t *audio_new_buffer( decoder_t *p_dec, int i_samples )
{
- sout_stream_sys_t *p_sys = p_stream->p_sys;
- int i_ff_codec;
-
- /* Open decoder */
- if( id->f_src.i_codec == VLC_FOURCC( 'I', '4', '2', '0' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'I', '4', '2', '2' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'I', '4', '4', '4' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'Y', 'V', '1', '2' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'Y', 'U', 'Y', '2' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'I', 'Y', 'U', 'V' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'R', 'V', '1', '5' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'R', 'V', '1', '6' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'R', 'V', '2', '4' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'R', 'V', '3', '2' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'G', 'R', 'E', 'Y' ) )
- {
- id->ff_dec = NULL;
- id->ff_dec_c = avcodec_alloc_context();
- id->ff_dec_c->width = id->f_src.video.i_width;
- id->ff_dec_c->height = id->f_src.video.i_height;
- id->ff_dec_c->pix_fmt = get_ff_chroma( id->f_src.i_codec );
-
-#if LIBAVCODEC_BUILD >= 4687
- if( id->ff_dec_c->width )
- id->ff_dec_c->sample_aspect_ratio =
- av_d2q( id->f_src.video.i_aspect / (double)VOUT_ASPECT_FACTOR *
- id->ff_dec_c->height / id->ff_dec_c->width, 255 );
-#else
- id->ff_dec_c->aspect_ratio =
- id->f_src.video.i_aspect / (float)VOUT_ASPECT_FACTOR;
-#endif
+ aout_buffer_t *p_buffer;
+ block_t *p_block;
+ int i_size;
+
+ if( p_dec->fmt_out.audio.i_bitspersample )
+ {
+ i_size = i_samples * p_dec->fmt_out.audio.i_bitspersample / 8 *
+ p_dec->fmt_out.audio.i_channels;
+ }
+ else if( p_dec->fmt_out.audio.i_bytes_per_frame &&
+ p_dec->fmt_out.audio.i_frame_length )
+ {
+ i_size = i_samples * p_dec->fmt_out.audio.i_bytes_per_frame /
+ p_dec->fmt_out.audio.i_frame_length;
}
else
{
- /* find decoder */
- i_ff_codec = get_ff_codec( id->f_src.i_codec );
- if( i_ff_codec == 0 )
- {
- msg_Err( p_stream, "cannot find decoder" );
- return VLC_EGENERIC;
- }
+ i_size = i_samples * 4 * p_dec->fmt_out.audio.i_channels;
+ }
- id->ff_dec = avcodec_find_decoder( i_ff_codec );
- if( !id->ff_dec )
- {
- msg_Err( p_stream, "cannot find decoder" );
- return VLC_EGENERIC;
- }
+ 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 );
- id->ff_dec_c = avcodec_alloc_context();
- id->ff_dec_c->width = id->f_src.video.i_width;
- id->ff_dec_c->height = id->f_src.video.i_height;
- id->ff_dec_c->bits_per_sample=id->f_src.video.i_bits_per_pixel;
- /* id->ff_dec_c->bit_rate = id->f_src.i_bitrate; */
+ p_buffer->p_buffer = p_block->p_buffer;
+ p_buffer->i_size = p_buffer->i_nb_bytes = p_block->i_buffer;
+ p_buffer->i_nb_samples = i_samples;
+ p_block->i_samples = i_samples;
- if( id->f_src.i_extra > 0 )
- {
- if( i_ff_codec == CODEC_ID_SVQ3 )
- {
- int i_size = id->f_src.i_extra;
- uint8_t *p;
+ return p_buffer;
+}
- id->ff_dec_c->extradata_size = i_size + 12;
- p = id->ff_dec_c->extradata = malloc( i_size + 12 );
+static void audio_del_buffer( decoder_t *p_dec, aout_buffer_t *p_buffer )
+{
+ if( p_buffer && p_buffer->p_sys ) block_Release( p_buffer->p_sys );
+ if( p_buffer ) free( p_buffer );
+}
- memcpy( &p[0], "SVQ3", 4 );
- memset( &p[4], 0, 8 );
- memcpy( &p[12], id->f_src.p_extra, i_size );
+/*
+ * video
+ */
+static int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
+{
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+ int i;
- /* Now remove all atoms before the SMI one */
- if( id->ff_dec_c->extradata_size > 0x5a && strncmp( &p[0x56], "SMI ", 4 ) )
- {
- uint8_t *psz = &p[0x52];
-
- while( psz < &p[id->ff_dec_c->extradata_size - 8] )
- {
- int i_size = GetDWBE( psz );
- if( i_size <= 1 )
- {
- /* FIXME handle 1 as long size */
- break;
- }
- if( !strncmp( &psz[4], "SMI ", 4 ) )
- {
- memmove( &p[0x52], psz, &p[id->ff_dec_c->extradata_size] - psz );
- break;
- }
- psz += i_size;
- }
- }
- }
- else
- {
- id->ff_dec_c->extradata_size= id->f_src.i_extra;
- id->ff_dec_c->extradata = malloc( id->f_src.i_extra + FF_INPUT_BUFFER_PADDING_SIZE );
+ /* 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_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->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) );
+ 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; */
- memcpy( id->ff_dec_c->extradata, id->f_src.p_extra, id->f_src.i_extra );
- memset( (uint8_t*)id->ff_dec_c->extradata + id->f_src.i_extra, 0, FF_INPUT_BUFFER_PADDING_SIZE );
- }
- }
- id->ff_dec_c->workaround_bugs = FF_BUG_AUTODETECT;
- id->ff_dec_c->error_resilience= -1;
- id->ff_dec_c->get_buffer = transcode_video_ffmpeg_getframebuf;
- id->ff_dec_c->opaque = p_sys;
+ id->p_decoder->p_module =
+ module_Need( id->p_decoder, "decoder", "$codec", 0 );
- if( avcodec_open( id->ff_dec_c, id->ff_dec ) < 0 )
- {
- msg_Err( p_stream, "cannot open decoder" );
- av_free( id->ff_dec_c );
- return VLC_EGENERIC;
- }
+ if( !id->p_decoder->p_module )
+ {
+ msg_Err( p_stream, "cannot find decoder" );
+ return VLC_EGENERIC;
}
- /* Open encoder */
- id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
+ /*
+ * Open encoder.
+ * Because some info about the decoded input will only be available
+ * once the first frame is decoded, we actually only test the availability
+ * of the encoder here.
+ */
/* Initialization of encoder format structures */
- es_format_Init( &id->p_encoder->fmt_in,
- id->f_src.i_cat, get_vlc_chroma(id->ff_dec_c->pix_fmt) );
+ es_format_Init( &id->p_encoder->fmt_in, id->p_decoder->fmt_in.i_cat,
+ id->p_decoder->fmt_out.i_codec );
+ id->p_encoder->fmt_in.video.i_chroma = id->p_decoder->fmt_out.i_codec;
/* The dimensions will be set properly later on.
- * Just put sensible values so we can test if there is an encoder. */
+ * Just put sensible values so we can test an encoder is available. */
id->p_encoder->fmt_in.video.i_width =
- id->f_src.video.i_width ? id->f_src.video.i_width : 16;
+ 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_in.video.i_height =
- id->f_src.video.i_height ? id->f_src.video.i_height : 16;
-
- id->p_encoder->fmt_in.video.i_frame_rate = 25; /* FIXME as it break mpeg */
- id->p_encoder->fmt_in.video.i_frame_rate_base= 1;
- if( id->ff_dec )
- {
- id->p_encoder->fmt_in.video.i_frame_rate = id->ff_dec_c->frame_rate;
-#if LIBAVCODEC_BUILD >= 4662
- id->p_encoder->fmt_in.video.i_frame_rate_base =
- id->ff_dec_c->frame_rate_base;
-#endif
-
-#if LIBAVCODEC_BUILD >= 4687
- if( id->ff_dec_c->height )
- id->p_encoder->fmt_in.video.i_aspect = VOUT_ASPECT_FACTOR *
- ( av_q2d(id->ff_dec_c->sample_aspect_ratio) *
- id->ff_dec_c->width / id->ff_dec_c->height );
-#else
- id->p_encoder->fmt_in.video.i_aspect = VOUT_ASPECT_FACTOR *
- id->ff_dec_c->aspect_ratio;
-#endif
- }
-
- /* Override with user settings */
- if( p_sys->f_fps > 0 )
- {
- id->p_encoder->fmt_in.video.i_frame_rate = p_sys->f_fps * 1000;
- id->p_encoder->fmt_in.video.i_frame_rate_base = 1000;
- }
-
- id->f_dst.video.i_frame_rate = id->p_encoder->fmt_in.video.i_frame_rate;
- id->f_dst.video.i_frame_rate_base =
- id->p_encoder->fmt_in.video.i_frame_rate_base;
-
- /* Check whether a particular aspect ratio was requested */
- if( id->f_src.video.i_aspect )
- {
- id->p_encoder->fmt_in.video.i_aspect = id->f_src.video.i_aspect;
- id->f_dst.video.i_aspect = id->f_src.video.i_aspect;
- }
-
- id->p_encoder->fmt_out = id->p_encoder->fmt_in;
- id->p_encoder->fmt_out.i_codec = id->f_dst.i_codec;
- id->p_encoder->fmt_out.i_bitrate = id->f_dst.i_bitrate;
+ 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->i_threads = p_sys->i_threads;
-
- id->p_ff_pic = avcodec_alloc_frame();
- id->p_ff_pic_tmp0 = NULL;
- id->p_ff_pic_tmp1 = NULL;
- id->p_ff_pic_tmp2 = NULL;
- id->p_ff_pic_tmp3 = NULL;
- id->p_vresample = NULL;
-
id->p_encoder->p_cfg = p_sys->p_video_cfg;
- /* Attach object to parent so object variables inheritance works */
- vlc_object_attach( id->p_encoder, p_stream );
-
id->p_encoder->p_module =
module_Need( id->p_encoder, "encoder", p_sys->psz_venc, VLC_TRUE );
-
if( !id->p_encoder->p_module )
{
- vlc_object_detach( id->p_encoder );
- vlc_object_destroy( id->p_encoder );
- av_free( id->ff_dec_c );
- 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 */
+ * 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;
- id->b_enc_inited = VLC_FALSE;
-
- if ( p_sys->i_threads >= 1 )
+ 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 ) )
{
- vlc_object_detach( id->p_encoder );
- vlc_object_destroy( id->p_encoder );
- av_free( id->ff_dec_c );
msg_Err( p_stream, "cannot spawn encoder thread" );
+ module_Unneed( id->p_decoder, id->p_decoder->p_module );
+ id->p_decoder->p_module = 0;
return VLC_EGENERIC;
}
}
return VLC_SUCCESS;
}
-static void transcode_video_ffmpeg_close ( sout_stream_t *p_stream,
- sout_stream_id_t *id )
+static int transcode_video_encoder_open( sout_stream_t *p_stream,
+ sout_stream_id_t *id )
{
- if ( p_stream->p_sys->i_threads >= 1 )
+ 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;
+
+ /* 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 )
{
- vlc_mutex_lock( &p_stream->p_sys->lock_out );
- p_stream->p_sys->b_die = 1;
- vlc_cond_signal( &p_stream->p_sys->cond );
- vlc_mutex_unlock( &p_stream->p_sys->lock_out );
- vlc_thread_join( p_stream->p_sys );
- vlc_mutex_destroy( &p_stream->p_sys->lock_out );
- vlc_cond_destroy( &p_stream->p_sys->cond );
- }
+ /* 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;
- /* Close decoder */
- if( id->ff_dec ) avcodec_close( id->ff_dec_c );
- av_free( id->ff_dec_c );
+ 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;
- /* Close encoder */
- if( id->p_encoder->p_module )
- module_Unneed( id->p_encoder, id->p_encoder->p_module );
- vlc_object_detach( id->p_encoder );
- vlc_object_destroy( id->p_encoder );
+ f_real_scale = (float)( i_new_width ) / (float) i_src_width;
+
+ i_new_height = __MAX( 16, i_src_height * (float)f_real_scale );
- /* Misc cleanup */
- if( id->p_ff_pic)
+ 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 )
{
- free( id->p_ff_pic );
+ /* 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;
}
-
- if( id->p_ff_pic_tmp0 )
+ else if( id->p_encoder->fmt_out.video.i_width <= 0 &&
+ id->p_encoder->fmt_out.video.i_height > 0 )
{
- free( id->p_ff_pic_tmp0->data[0] );
- free( id->p_ff_pic_tmp0 );
+ /* 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 )
+ {
+ if( id->p_decoder->fmt_out.video.i_frame_rate &&
+ id->p_decoder->fmt_out.video.i_frame_rate_base )
+ {
+ id->p_encoder->fmt_out.video.i_frame_rate =
+ id->p_decoder->fmt_out.video.i_frame_rate;
+ id->p_encoder->fmt_out.video.i_frame_rate_base =
+ id->p_decoder->fmt_out.video.i_frame_rate_base;
+ }
+ 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;
+ }
}
- if( id->p_ff_pic_tmp1 )
+
+ id->p_encoder->fmt_in.video.i_frame_rate =
+ id->p_encoder->fmt_out.video.i_frame_rate;
+ id->p_encoder->fmt_in.video.i_frame_rate_base =
+ id->p_encoder->fmt_out.video.i_frame_rate_base;
+
+ date_Init( &id->interpolated_pts,
+ 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 )
{
- free( id->p_ff_pic_tmp1->data[0] );
- free( id->p_ff_pic_tmp1 );
+ id->p_encoder->fmt_out.video.i_aspect = (int)( f_aspect * VOUT_ASPECT_FACTOR + 0.5 );
}
- if( id->p_ff_pic_tmp2 )
+ 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 )
{
- free( id->p_ff_pic_tmp2->data[0] );
- free( id->p_ff_pic_tmp2 );
+ msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_venc );
+ return VLC_EGENERIC;
}
- if( id->p_ff_pic_tmp3 )
+
+ id->p_encoder->fmt_in.video.i_chroma = id->p_encoder->fmt_in.i_codec;
+
+ /* Hack for mp2v/mp1v transcoding support */
+ if( id->p_encoder->fmt_out.i_codec == VLC_FOURCC('m','p','1','v') ||
+ id->p_encoder->fmt_out.i_codec == VLC_FOURCC('m','p','2','v') )
{
- free( id->p_ff_pic_tmp3->data[0] );
- free( id->p_ff_pic_tmp3 );
+ id->p_encoder->fmt_out.i_codec = VLC_FOURCC('m','p','g','v');
}
- if( id->p_vresample )
+
+ id->id = p_stream->p_sys->p_out->pf_add( p_stream->p_sys->p_out,
+ &id->p_encoder->fmt_out );
+ if( !id->id )
{
- img_resample_close( id->p_vresample );
+ msg_Err( p_stream, "cannot add this stream" );
+ return VLC_EGENERIC;
}
+
+ return VLC_SUCCESS;
}
-static int transcode_video_ffmpeg_process( sout_stream_t *p_stream,
- sout_stream_id_t *id, block_t *in, block_t **out )
+static void transcode_video_close( sout_stream_t *p_stream,
+ sout_stream_id_t *id )
{
- sout_stream_sys_t *p_sys = p_stream->p_sys;
- int i_used, b_gotpicture, i_duplicate = 1;
- AVFrame *frame;
- mtime_t i_pts;
-
- int i_data;
- uint8_t *p_data;
+ int i, j;
- *out = NULL;
+ if( p_stream->p_sys->i_threads >= 1 )
+ {
+ vlc_mutex_lock( &p_stream->p_sys->lock_out );
+ 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 );
+ vlc_mutex_destroy( &p_stream->p_sys->lock_out );
+ vlc_cond_destroy( &p_stream->p_sys->cond );
+ }
- i_data = in->i_buffer;
- p_data = in->p_buffer;
+ /* Close decoder */
+ if( id->p_decoder->p_module )
+ module_Unneed( id->p_decoder, id->p_decoder->p_module );
- for( ;; )
+ if( id->p_decoder->p_owner )
{
- block_t *p_block;
- picture_t * p_pic;
- int i_plane;
- subpicture_t *p_subpic = 0;
-
- /* decode frame */
- frame = id->p_ff_pic;
- p_sys->i_input_pts = in->i_pts;
- p_sys->i_input_dts = in->i_dts;
- if( id->ff_dec )
- {
- i_used = avcodec_decode_video( id->ff_dec_c, frame,
- &b_gotpicture,
- p_data, i_data );
- }
- else
+ /* Clean-up pictures ring buffer */
+ for( i = 0; i < PICTURE_RING_SIZE; i++ )
{
- /* raw video */
- avpicture_fill( (AVPicture*)frame, p_data,
- id->ff_dec_c->pix_fmt,
- id->ff_dec_c->width, id->ff_dec_c->height );
- i_used = i_data;
- b_gotpicture = 1;
-
- /* Set PTS */
- frame->pts = p_sys->i_input_pts ? p_sys->i_input_pts :
- AV_NOPTS_VALUE;
-
- frame->pict_type = FF_I_TYPE;
+ if( id->p_decoder->p_owner->pp_pics[i] )
+ video_del_buffer( VLC_OBJECT(id->p_decoder),
+ id->p_decoder->p_owner->pp_pics[i] );
}
+ free( id->p_decoder->p_owner );
+ }
- if( i_used < 0 )
- {
- msg_Warn( p_stream, "error");
- return VLC_EGENERIC;
- }
- i_data -= i_used;
- p_data += i_used;
+ /* Close encoder */
+ if( id->p_encoder->p_module )
+ module_Unneed( id->p_encoder, id->p_encoder->p_module );
- if( !b_gotpicture )
+ /* 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++ )
{
- return VLC_SUCCESS;
+ 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 );
- /* Get the pts of the decoded frame if any, otherwise keep the
- * interpolated one */
- if( frame->pts != AV_NOPTS_VALUE )
+ /* Clean-up pictures ring buffer */
+ for( j = 0; j < PICTURE_RING_SIZE; j++ )
{
- p_sys->i_output_pts = frame->pts;
+ 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] );
}
- i_pts = p_sys->i_output_pts;
+ free( id->pp_ufilter[i]->p_owner );
+ vlc_object_destroy( id->pp_ufilter[i] );
+ id->pp_ufilter[i] = NULL;
+ }
+}
+
+static int transcode_video_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;
+ int i_duplicate = 1, i;
+ picture_t *p_pic, *p_pic2 = NULL;
+ *out = NULL;
+ input_thread_t *p_input = NULL;
+
+ if( p_stream->p_parent->p_parent && p_stream->p_parent->p_parent->
+ i_object_type == VLC_OBJECT_INPUT )
+ p_input = (input_thread_t *)p_stream->p_parent->p_parent;
+
+ while( (p_pic = id->p_decoder->pf_decode_video( id->p_decoder, &in )) )
+ {
+ subpicture_t *p_subpic = NULL;
+ if( p_input )
+ stats_UpdateInteger( p_input, p_input->p->counters.p_decoded_video,
+ 1, NULL );
- /* Sanity check (seems to be needed for some streams ) */
- if( frame->pict_type == FF_B_TYPE )
+ if( p_stream->p_sout->i_out_pace_nocontrol && p_sys->b_hurry_up )
{
- p_sys->b_input_has_b_frames = VLC_TRUE;
+ 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_audio_sync )
+ if( p_sys->b_master_sync )
{
mtime_t i_video_drift;
+ mtime_t i_master_drift = p_sys->i_master_drift;
+ mtime_t i_pts;
i_pts = date_Get( &id->interpolated_pts ) + 1;
- i_video_drift = p_sys->i_output_pts - i_pts;
+ 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;
+ }
+ i_video_drift = p_pic->date - i_pts;
i_duplicate = 1;
- if( i_video_drift < p_sys->i_master_drift - 50000 )
+ /* Set the pts of the frame being encoded */
+ p_pic->date = i_pts;
+
+ if( i_video_drift < (i_master_drift - 50000) )
{
+#if 0
msg_Dbg( p_stream, "dropping frame (%i)",
- (int)(i_video_drift - p_sys->i_master_drift) );
- return VLC_EGENERIC;
+ (int)(i_video_drift - i_master_drift) );
+#endif
+ p_pic->pf_release( p_pic );
+ continue;
}
- else if( i_video_drift > p_sys->i_master_drift + 50000 )
+ else if( i_video_drift > (i_master_drift + 50000) )
{
+#if 0
msg_Dbg( p_stream, "adding frame (%i)",
- (int)(i_video_drift - p_sys->i_master_drift) );
+ (int)(i_video_drift - i_master_drift) );
+#endif
i_duplicate = 2;
}
-
- date_Increment( &id->interpolated_pts, 1 );
}
- if( !id->b_enc_inited )
+ if( !id->p_encoder->p_module )
{
- /* 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->ff_dec_c->width - p_sys->i_crop_left -
- p_sys->i_crop_right;
- int i_height = id->ff_dec_c->height - p_sys->i_crop_top -
- p_sys->i_crop_bottom;
-
- if( id->f_dst.video.i_width <= 0 && id->f_dst.video.i_height <= 0
- && p_sys->f_scale )
- {
- /* Apply the scaling */
- id->f_dst.video.i_width = i_width * p_sys->f_scale;
- id->f_dst.video.i_height = i_height * p_sys->f_scale;
- }
- else if( id->f_dst.video.i_width > 0 &&
- id->f_dst.video.i_height <= 0 )
- {
- id->f_dst.video.i_height =
- id->f_dst.video.i_width / (double)i_width * i_height;
- }
- else if( id->f_dst.video.i_width <= 0 &&
- id->f_dst.video.i_height > 0 )
- {
- id->f_dst.video.i_width =
- id->f_dst.video.i_height / (double)i_height * i_width;
- }
-
- id->p_encoder->fmt_in.video.i_width = id->f_dst.video.i_width;
- id->p_encoder->fmt_in.video.i_height = id->f_dst.video.i_height;
- id->p_encoder->fmt_out = id->f_dst;
-
- id->p_encoder->p_module =
- module_Need( id->p_encoder, "encoder",
- p_sys->psz_venc, VLC_TRUE );
- if( !id->p_encoder->p_module )
- {
- vlc_object_destroy( id->p_encoder );
- msg_Err( p_stream, "cannot find encoder" );
- id->b_transcode = VLC_FALSE;
- return VLC_EGENERIC;
- }
-
- id->f_dst = id->p_encoder->fmt_out;
-
- /* Hack for mp2v/mp1v transcoding support */
- if( id->f_dst.i_codec == VLC_FOURCC( 'm','p','1','v' ) ||
- id->f_dst.i_codec == VLC_FOURCC( 'm','p','2','v' ) )
+ if( transcode_video_encoder_open( p_stream, id ) != VLC_SUCCESS )
{
- id->f_dst.i_codec = VLC_FOURCC( 'm','p','g','v' );
- }
-
- if( !( id->id =
- p_stream->p_sys->p_out->pf_add( p_stream->p_sys->p_out,
- &id->f_dst ) ) )
- {
- msg_Err( p_stream, "cannot add this stream" );
- transcode_video_ffmpeg_close( p_stream, id );
+ p_pic->pf_release( p_pic );
+ transcode_video_close( p_stream, id );
id->b_transcode = VLC_FALSE;
return VLC_EGENERIC;
}
- if( id->p_encoder->pf_header )
+ /* Deinterlace */
+ if( p_stream->p_sys->b_deinterlace )
{
- block_t *p_block_tmp;
+ 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;
- p_block = id->p_encoder->pf_header( id->p_encoder );
- p_block_tmp = p_block;
- while( p_block_tmp )
+ id->i_filter++;
+ }
+ else
{
- p_block_tmp->i_dts = p_block_tmp->i_pts = in->i_dts;
- p_block_tmp = p_block_tmp->p_next;
+ 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] );
}
- block_ChainAppend( out, p_block );
}
- id->i_inter_pixfmt =
- get_ff_chroma( id->p_encoder->fmt_in.i_codec );
-
- id->b_enc_inited = VLC_TRUE;
- }
+ /* 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 ||
- /* deinterlace */
- if( p_stream->p_sys->b_deinterlace )
- {
- if( id->p_ff_pic_tmp0 == NULL )
- {
- int i_size;
- uint8_t *buf;
- id->p_ff_pic_tmp0 = avcodec_alloc_frame();
- i_size = avpicture_get_size( id->ff_dec_c->pix_fmt,
- id->ff_dec_c->width,
- id->ff_dec_c->height );
-
- buf = malloc( i_size );
-
- avpicture_fill( (AVPicture*)id->p_ff_pic_tmp0, buf,
- id->i_inter_pixfmt,
- id->ff_dec_c->width, id->ff_dec_c->height );
- }
+ (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 ||
- avpicture_deinterlace( (AVPicture*)id->p_ff_pic_tmp0,
- (AVPicture*)frame, id->ff_dec_c->pix_fmt,
- id->ff_dec_c->width, id->ff_dec_c->height );
-
-#if LIBAVCODEC_BUILD >= 4685
- id->p_ff_pic_tmp0->interlaced_frame = 0;
-#endif
- id->p_ff_pic_tmp0->repeat_pict = frame->repeat_pict;
- frame = id->p_ff_pic_tmp0;
- }
-
- /* convert pix format */
- if( id->ff_dec_c->pix_fmt != id->i_inter_pixfmt )
- {
- if( id->p_ff_pic_tmp1 == NULL )
+ (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)
{
- int i_size;
- uint8_t *buf;
- id->p_ff_pic_tmp1 = avcodec_alloc_frame();
- i_size = avpicture_get_size( id->i_inter_pixfmt,
- id->ff_dec_c->width,
- id->ff_dec_c->height );
-
- buf = malloc( i_size );
-
- avpicture_fill( (AVPicture*)id->p_ff_pic_tmp1, buf,
- id->i_inter_pixfmt,
- id->ff_dec_c->width, id->ff_dec_c->height );
- }
-
- img_convert( (AVPicture*)id->p_ff_pic_tmp1, id->i_inter_pixfmt,
- (AVPicture*)frame, id->ff_dec_c->pix_fmt,
- id->ff_dec_c->width, id->ff_dec_c->height );
-
- id->p_ff_pic_tmp1->repeat_pict = frame->repeat_pict;
-#if LIBAVCODEC_BUILD >= 4685
- id->p_ff_pic_tmp1->interlaced_frame = frame->interlaced_frame;
- id->p_ff_pic_tmp1->top_field_first = frame->top_field_first;
-#endif
- frame = id->p_ff_pic_tmp1;
- }
+ 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;
- /* convert size and crop */
- if( id->ff_dec_c->width != id->f_dst.video.i_width ||
- id->ff_dec_c->height != id->f_dst.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 )
- {
- if( id->p_ff_pic_tmp2 == NULL )
- {
- int i_size;
- uint8_t *buf;
- id->p_ff_pic_tmp2 = avcodec_alloc_frame();
- i_size = avpicture_get_size( id->i_inter_pixfmt,
- id->f_dst.video.i_width,
- id->f_dst.video.i_height );
-
- buf = malloc( i_size );
-
- avpicture_fill( (AVPicture*)id->p_ff_pic_tmp2, buf,
- id->i_inter_pixfmt,
- id->f_dst.video.i_width,
- id->f_dst.video.i_height );
-
- id->p_vresample =
- img_resample_full_init( id->f_dst.video.i_width,
- id->f_dst.video.i_height,
- id->ff_dec_c->width,
- id->ff_dec_c->height,
- p_stream->p_sys->i_crop_top,
- p_stream->p_sys->i_crop_bottom,
- p_stream->p_sys->i_crop_left,
- p_stream->p_sys->i_crop_right
-#if LIBAVCODEC_BUILD >= 4708
- ,0, 0, 0, 0 );
-#else
- );
-#endif
+ id->i_filter++;
+ }
+ else
+ {
+ msg_Dbg( p_stream, "no video filter found" );
+ vlc_object_detach( id->pp_filter[id->i_filter] );
+ vlc_object_destroy( id->pp_filter[id->i_filter] );
+
+ p_pic->pf_release( p_pic );
+ transcode_video_close( p_stream, id );
+ id->b_transcode = VLC_FALSE;
+ return VLC_EGENERIC;
+ }
}
- img_resample( id->p_vresample, (AVPicture*)id->p_ff_pic_tmp2,
- (AVPicture*)frame );
-
- id->p_ff_pic_tmp2->repeat_pict = frame->repeat_pict;
-#if LIBAVCODEC_BUILD >= 4685
- id->p_ff_pic_tmp2->interlaced_frame = frame->interlaced_frame;
- id->p_ff_pic_tmp2->top_field_first = frame->top_field_first;
-#endif
- frame = id->p_ff_pic_tmp2;
- }
-
- /* Encoding */
- p_pic = malloc(sizeof(picture_t));
- vout_InitPicture( VLC_OBJECT(p_stream), p_pic,
- id->p_encoder->fmt_in.i_codec,
- id->f_dst.video.i_width, id->f_dst.video.i_height,
- id->f_dst.video.i_width * VOUT_ASPECT_FACTOR /
- id->f_dst.video.i_height );
-
- /* Check if we have a subpicture to overlay */
- if( p_sys->p_filter_blend )
- {
- p_subpic = transcode_spu_get( p_stream, id, p_sys->i_output_pts );
-
- if( p_subpic && frame != id->p_ff_pic_tmp0 &&
- frame != id->p_ff_pic_tmp1 && frame != id->p_ff_pic_tmp2 )
+ for( i = 0; (i < p_sys->i_vfilters) && (id->i_ufilter < TRANSCODE_FILTERS); i++ )
{
- if( id->p_ff_pic_tmp3 == NULL )
+ 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 )
{
- uint8_t *buf = malloc( frame->linesize[0] *
- p_pic->p[0].i_lines * 3 );
- id->p_ff_pic_tmp3 = avcodec_alloc_frame();
- *id->p_ff_pic_tmp3 = *frame;
- id->p_ff_pic_tmp3->data[0] = buf;
- id->p_ff_pic_tmp3->data[1] = id->p_ff_pic_tmp3->data[0] +
- frame->linesize[0] * p_pic->p[0].i_lines;
- id->p_ff_pic_tmp3->data[2] = id->p_ff_pic_tmp3->data[1] +
- frame->linesize[1] * p_pic->p[1].i_lines;
+ 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++;
}
-
- for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
+ else
{
- p_stream->p_vlc->pf_memcpy(
- id->p_ff_pic_tmp3->data[i_plane],
- frame->data[i_plane],
- p_pic->p[i_plane].i_lines * frame->linesize[i_plane] );
+ 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;
}
-
- id->p_ff_pic_tmp3->repeat_pict = frame->repeat_pict;
-#if LIBAVCODEC_BUILD >= 4685
- id->p_ff_pic_tmp3->interlaced_frame = frame->interlaced_frame;
- id->p_ff_pic_tmp3->top_field_first = frame->top_field_first;
-#endif
- frame = id->p_ff_pic_tmp3;
}
}
- for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
+ /* Run filter chain */
+ for( i = 0; i < id->i_filter; i++ )
{
- p_pic->p[i_plane].i_pitch = frame->linesize[i_plane];
- if ( p_sys->i_threads >= 1 )
- {
- p_pic->p[i_plane].p_pixels = malloc(p_pic->p[i_plane].i_lines *
- p_pic->p[i_plane].i_pitch);
- p_stream->p_vlc->pf_memcpy( p_pic->p[i_plane].p_pixels,
- frame->data[i_plane], p_pic->p[i_plane].i_lines *
- p_pic->p[i_plane].i_pitch );
- }
- else
- {
- p_pic->p[i_plane].p_pixels = frame->data[i_plane];
- }
+ p_pic = id->pp_filter[i]->pf_video_filter(id->pp_filter[i], p_pic);
}
- /* Set the pts of the frame being encoded */
- p_pic->date = i_pts;
-
- p_pic->i_nb_fields = frame->repeat_pict;
-#if LIBAVCODEC_BUILD >= 4685
- p_pic->b_progressive = !frame->interlaced_frame;
- p_pic->b_top_field_first = frame->top_field_first;
-#endif
+ /*
+ * Encoding
+ */
- /* Interpolate the next PTS
- * (needed by the mpeg video packetizer which can send pts <= 0 ) */
- if( id->ff_dec_c && id->ff_dec_c->frame_rate > 0 )
+ /* Check if we have a subpicture to overlay */
+ if( p_sys->p_spu )
{
- p_sys->i_output_pts += I64C(1000000) * (2 + frame->repeat_pict) *
- id->ff_dec_c->frame_rate_base / (2 * id->ff_dec_c->frame_rate);
+ p_subpic = spu_SortSubpictures( p_sys->p_spu, p_pic->date,
+ VLC_FALSE /* Fixme: check if stream is paused */ );
+ /* TODO: get another pic */
}
/* Overlay subpicture */
if( p_subpic )
{
- int i_width, i_height;
-
- p_sys->p_filter_blend->fmt_out = id->p_encoder->fmt_in;
- p_sys->p_filter_blend->fmt_out.video.i_visible_width =
- p_sys->p_filter_blend->fmt_out.video.i_width;
- p_sys->p_filter_blend->fmt_out.video.i_visible_height =
- p_sys->p_filter_blend->fmt_out.video.i_height;
- p_sys->p_filter_blend->fmt_out.video.i_chroma =
- VLC_FOURCC('I','4','2','0');
+ int i_scale_width, i_scale_height;
+ video_format_t *p_fmt;
- i_width = id->p_encoder->fmt_in.video.i_width;
- i_height = id->p_encoder->fmt_in.video.i_height;
+ 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;
- while( p_subpic != NULL )
+ if( p_pic->i_refcount && !id->i_filter )
{
- subpicture_region_t *p_region = p_subpic->p_region;
-
- while( p_region && p_sys->p_filter_blend &&
- p_sys->p_filter_blend->pf_video_blend )
+ /* 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 )
{
- int i_x_offset = p_region->i_x + p_subpic->i_x;
- int i_y_offset = p_region->i_y + p_subpic->i_y;
-
- if( p_subpic->i_flags & OSD_ALIGN_BOTTOM )
- {
- i_y_offset = i_height - p_region->fmt.i_height -
- p_subpic->i_y;
- }
- else if ( !(p_subpic->i_flags & OSD_ALIGN_TOP) )
- {
- i_y_offset = i_height / 2 - p_region->fmt.i_height / 2;
- }
-
- if( p_subpic->i_flags & OSD_ALIGN_RIGHT )
- {
- i_x_offset = i_width - p_region->fmt.i_width -
- p_subpic->i_x;
- }
- else if ( !(p_subpic->i_flags & OSD_ALIGN_LEFT) )
- {
- i_x_offset = i_width / 2 - p_region->fmt.i_width / 2;
- }
-
- if( p_subpic->b_absolute )
- {
- i_x_offset = p_region->i_x + p_subpic->i_x;
- i_y_offset = p_region->i_y + p_subpic->i_y;
- }
-
- p_sys->p_filter_blend->fmt_in.video = p_region->fmt;
-
- p_sys->p_filter_blend->pf_video_blend(
- p_sys->p_filter_blend, p_pic, p_pic,
- &p_region->picture, i_x_offset, i_y_offset );
-
- p_region = p_region->p_next;
+ vout_CopyPicture( p_stream, p_tmp, p_pic );
+ p_pic->pf_release( p_pic );
+ p_pic = p_tmp;
}
-
- p_subpic = p_subpic->p_next;
}
+
+ if( id->i_filter )
+ p_fmt = &id->pp_filter[id->i_filter -1]->fmt_out.video;
+ else
+ p_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;
+
+ spu_RenderSubpictures( p_sys->p_spu, p_fmt, p_pic, p_pic, p_subpic,
+ 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_audio_sync && i_duplicate > 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->i_threads >= 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
{
- i_pts = date_Get( &id->interpolated_pts ) + 1;
- date_Increment( &id->interpolated_pts, 1 );
+ block_t *p_block;
p_pic->date = i_pts;
- p_block = id->p_encoder->pf_encode_video( id->p_encoder, p_pic );
+ p_block = id->p_encoder->pf_encode_video(id->p_encoder, p_pic);
block_ChainAppend( out, p_block );
}
-
- free( p_pic );
}
- if( i_data <= 0 )
+ if( p_sys->i_threads == 0 )
{
- return VLC_SUCCESS;
+ 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;
}
-static int EncoderThread( sout_stream_sys_t * p_sys )
+static int EncoderThread( sout_stream_sys_t *p_sys )
{
- sout_stream_id_t * id = p_sys->id_video;
- picture_t * p_pic;
- int i_plane;
+ sout_stream_id_t *id = p_sys->id_video;
+ picture_t *p_pic;
- while ( !p_sys->b_die && !p_sys->b_error )
+ while( !p_sys->b_die && !p_sys->b_error )
{
block_t *p_block;
vlc_mutex_lock( &p_sys->lock_out );
- while ( p_sys->i_last_pic == p_sys->i_first_pic )
+ 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( p_sys->b_die || p_sys->b_error ) break;
}
- if ( p_sys->b_die || p_sys->b_error )
+ if( p_sys->b_die || p_sys->b_error )
{
vlc_mutex_unlock( &p_sys->lock_out );
break;
p_block = id->p_encoder->pf_encode_video( id->p_encoder, p_pic );
vlc_mutex_lock( &p_sys->lock_out );
block_ChainAppend( &p_sys->p_buffers, p_block );
- vlc_mutex_unlock( &p_sys->lock_out );
- for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
- {
- free( p_pic->p[i_plane].p_pixels );
- }
- free( p_pic );
+ vlc_mutex_unlock( &p_sys->lock_out );
+ p_pic->pf_release( p_pic );
}
- while ( p_sys->i_last_pic != p_sys->i_first_pic )
+ while( p_sys->i_last_pic != p_sys->i_first_pic )
{
p_pic = p_sys->pp_pics[p_sys->i_first_pic++];
p_sys->i_first_pic %= PICTURE_RING_SIZE;
-
- for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
- {
- free( p_pic->p[i_plane].p_pixels );
- }
- free( p_pic );
+ p_pic->pf_release( p_pic );
}
-
block_ChainRelease( p_sys->p_buffers );
return 0;
}
-/*****************************************************************************
- * transcode_video_ffmpeg_getframebuf:
- *
- * Callback used by ffmpeg to get a frame buffer.
- * We use it to get the right PTS for each decoded picture.
- *****************************************************************************/
-static int transcode_video_ffmpeg_getframebuf(struct AVCodecContext *p_context,
- AVFrame *p_frame)
+struct picture_sys_t
+{
+ vlc_object_t *p_owner;
+};
+
+static void video_release_buffer( picture_t *p_pic )
+{
+ if( p_pic && !p_pic->i_refcount && p_pic->pf_release && p_pic->p_sys )
+ {
+ video_del_buffer_decoder( (decoder_t *)p_pic->p_sys->p_owner, p_pic );
+ }
+ 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,
+ sout_stream_sys_t *p_sys )
{
- sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_context->opaque;
+ decoder_t *p_dec = (decoder_t *)p_this;
+ picture_t *p_pic;
+ int i;
+
+ /* 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;
+ }
- /* Set PTS */
- if( p_sys->i_input_pts )
+ if( i == PICTURE_RING_SIZE && p_sys->i_threads >= 1 )
{
- p_frame->pts = p_sys->i_input_pts;
+ 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;
+ }
}
- else if( p_sys->i_input_dts )
+
+ if( i == PICTURE_RING_SIZE )
{
- /* Some demuxers/packetizers only set the dts so let's try to find a
- * useful timestamp from this */
- if( !p_context->has_b_frames || !p_sys->b_input_has_b_frames ||
- !p_frame->reference || !p_sys->i_output_pts )
+ msg_Err( p_this, "decoder/filter is leaking pictures, "
+ "resetting its ring buffer" );
+
+ for( i = 0; i < PICTURE_RING_SIZE; i++ )
{
- p_frame->pts = p_sys->i_input_dts +
- /* Hack: ffmpeg encoding doesn't like frames with identical pts */
- (p_sys->i_output_pts ? 0 : 50000);
+ pp_ring[i]->pf_release( pp_ring[i] );
}
- else p_frame->pts = AV_NOPTS_VALUE;
+
+ i = 0;
}
- else p_frame->pts = AV_NOPTS_VALUE;
- if( p_sys->i_output_pts ) /* make sure 1st frame has a pts > 0 */
+ p_pic = malloc( sizeof(picture_t) );
+ 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 )
{
- p_sys->i_input_pts = 0;
- p_sys->i_input_dts = 0;
+ free( p_pic );
+ return 0;
}
- return avcodec_default_get_buffer( p_context, p_frame );
+ p_pic->pf_release = video_release_buffer;
+ p_pic->p_sys = malloc( sizeof(picture_sys_t) );
+ p_pic->p_sys->p_owner = p_this;
+ 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->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->p_sys );
+}
+
+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 );
+}
+
+static void video_del_buffer_decoder( decoder_t *p_decoder, picture_t *p_pic )
+{
+ p_pic->i_refcount = 0;
+ p_pic->i_status = DESTROYED_PICTURE;
+}
+
+static void video_del_buffer_filter( filter_t *p_filter, picture_t *p_pic )
+{
+ p_pic->i_refcount = 0;
+ p_pic->i_status = DESTROYED_PICTURE;
+}
+
+static void video_link_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
+{
+ p_pic->i_refcount++;
+}
+
+static void video_unlink_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
+{
+ video_release_buffer( p_pic );
}
/*
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- /* Open decoder */
- id->p_decoder = vlc_object_create( p_stream, VLC_OBJECT_DECODER );
+ /*
+ * Open decoder
+ */
- /* Initialization of decoder format structures */
- id->p_decoder->fmt_in = id->f_src;
+ /* Initialization of decoder structures */
id->p_decoder->pf_spu_buffer_new = spu_new_buffer;
id->p_decoder->pf_spu_buffer_del = spu_del_buffer;
- //id->p_decoder->p_cfg = p_sys->p_spu_cfg;
-
- /* Attach object to parent so object variables inheritance works */
- vlc_object_attach( id->p_decoder, p_stream );
+ 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", VLC_TRUE );
+ module_Need( id->p_decoder, "decoder", "$codec", 0 );
if( !id->p_decoder->p_module )
{
- vlc_object_detach( id->p_decoder );
- vlc_object_destroy( id->p_decoder );
msg_Err( p_stream, "cannot find decoder" );
return VLC_EGENERIC;
}
if( !p_sys->b_soverlay )
{
/* Open encoder */
- id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
-
/* Initialization of encoder format structures */
- es_format_Init( &id->p_encoder->fmt_in,
- id->f_src.i_cat, id->f_src.i_codec );
-
- id->p_encoder->fmt_out = id->f_dst;
+ es_format_Init( &id->p_encoder->fmt_in, id->p_decoder->fmt_in.i_cat,
+ id->p_decoder->fmt_in.i_codec );
id->p_encoder->p_cfg = p_sys->p_spu_cfg;
- /* Attach object to parent so object variables inheritance works */
- vlc_object_attach( id->p_encoder, p_stream );
-
id->p_encoder->p_module =
module_Need( id->p_encoder, "encoder", p_sys->psz_senc, VLC_TRUE );
if( !id->p_encoder->p_module )
{
module_Unneed( id->p_decoder, id->p_decoder->p_module );
- vlc_object_detach( id->p_decoder );
- vlc_object_destroy( id->p_decoder );
-
- vlc_object_detach( id->p_encoder );
- vlc_object_destroy( id->p_encoder );
- msg_Err( p_stream, "cannot find encoder" );
+ msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_senc );
return VLC_EGENERIC;
}
-
- id->f_dst = id->p_encoder->fmt_out;
}
- else
+
+ if( !p_sys->p_spu )
{
- p_sys->p_filter_blend =
- vlc_object_create( p_stream, sizeof(filter_t) );
- vlc_object_attach( p_sys->p_filter_blend, p_stream );
- p_sys->p_filter_blend->fmt_out.video.i_chroma =
- VLC_FOURCC('I','4','2','0');
- p_sys->p_filter_blend->fmt_in.video.i_chroma =
- VLC_FOURCC('Y','U','V','A');
- p_sys->p_filter_blend->p_module =
- module_Need( p_sys->p_filter_blend, "video blending", 0, 0 );
+ p_sys->p_spu = spu_Create( p_stream );
+ spu_Init( p_sys->p_spu );
}
return VLC_SUCCESS;
static void transcode_spu_close( sout_stream_t *p_stream, sout_stream_id_t *id)
{
- sout_stream_sys_t *p_sys = p_stream->p_sys;
- int i;
-
/* Close decoder */
if( id->p_decoder->p_module )
module_Unneed( id->p_decoder, id->p_decoder->p_module );
- vlc_object_detach( id->p_decoder );
- vlc_object_destroy( id->p_decoder );
/* Close encoder */
- if( id->p_encoder )
- {
- if( id->p_encoder->p_module )
- module_Unneed( id->p_encoder, id->p_encoder->p_module );
- vlc_object_detach( id->p_encoder );
- vlc_object_destroy( id->p_encoder );
- }
-
- /* Free subpictures */
- for( i = 0; i < SUBPICTURE_RING_SIZE; i++ )
- {
- if( !p_sys->pp_subpics[i] ) continue;
-
- spu_del_buffer( id->p_decoder, p_sys->pp_subpics[i] );
- p_sys->pp_subpics[i] = NULL;
- }
+ if( 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 && p_sys->b_soverlay )
- {
- int i;
+ if( !p_subpic ) return VLC_EGENERIC;
- /* Find a free slot in our supictures ring buffer */
- for( i = 0; i < SUBPICTURE_RING_SIZE; i++ )
- {
- if( !p_sys->pp_subpics[i] )
- {
- p_sys->pp_subpics[i] = p_subpic;
- break;
- }
- }
- if( i == SUBPICTURE_RING_SIZE )
- {
- spu_del_buffer( id->p_decoder, p_subpic );
- }
+ 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;
}
- if( p_subpic && !p_sys->b_soverlay )
+ if( p_sys->b_soverlay )
+ {
+ spu_DisplaySubpicture( p_sys->p_spu, p_subpic );
+ }
+ else
{
block_t *p_block;
return VLC_EGENERIC;
}
-static subpicture_t *transcode_spu_get( sout_stream_t *p_stream,
- sout_stream_id_t *id,
- mtime_t display_date )
+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 );
+}
+
+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 );
+}
+
+/*
+ * 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;
- subpicture_t *p_subpic = 0;
- subpicture_t *p_ephemer = 0;
- subpicture_t **pp_subpic = &p_subpic;
- int i;
+ 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;
- /* Find current subpictures and remove old ones */
- for( i = 0; i < SUBPICTURE_RING_SIZE; i++ )
+ /* Create encoder object */
+ id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
+ if( !id->p_encoder )
{
- if( !p_sys->pp_subpics[i] ) continue;
+ msg_Err( p_stream, "out of memory" );
+ goto error;
+ }
+ vlc_object_attach( id->p_encoder, p_stream );
+ id->p_encoder->p_module = NULL;
- if( !p_sys->pp_subpics[i]->b_ephemer &&
- p_sys->pp_subpics[i]->i_stop < display_date )
- {
- spu_del_buffer( id->p_decoder, p_sys->pp_subpics[i] );
- p_sys->pp_subpics[i] = NULL;
- continue;
- }
+ /* 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 );
- if( p_sys->pp_subpics[i]->i_start > display_date ) continue;
+ 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( p_sys->pp_subpics[i]->b_ephemer && !p_ephemer )
+ if( !id->p_encoder->p_module )
{
- p_ephemer = p_sys->pp_subpics[i];
+ msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_osdenc );
+ goto error;
}
- else if( p_sys->pp_subpics[i]->b_ephemer )
- {
- if( p_ephemer->i_start < p_sys->pp_subpics[i]->i_start )
- {
- subpicture_t tmp;
- tmp = *p_ephemer;
- *p_ephemer = *p_sys->pp_subpics[i];
- *p_sys->pp_subpics[i] = tmp;
- }
- spu_del_buffer( id->p_decoder, p_sys->pp_subpics[i] );
- p_sys->pp_subpics[i] = NULL;
- continue;
- }
+ /* 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;
- /* Add subpicture to the list */
- *pp_subpic = p_sys->pp_subpics[i];
- pp_subpic = &p_sys->pp_subpics[i]->p_next;
+ 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" );
}
- return p_subpic;
+ 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 subpicture_t *spu_new_buffer( decoder_t *p_dec )
+static void transcode_osd_close( sout_stream_t *p_stream, sout_stream_id_t *id)
{
- subpicture_t *p_subpic = (subpicture_t *)malloc(sizeof(subpicture_t));
- memset( p_subpic, 0, sizeof(subpicture_t) );
- p_subpic->b_absolute = VLC_TRUE;
+ 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 );
- p_subpic->pf_create_region = __spu_CreateRegion;
- p_subpic->pf_destroy_region = __spu_DestroyRegion;
+ if( id->id ) p_sys->p_out->pf_del( p_sys->p_out, id->id );
- return p_subpic;
+ 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 void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_subpic )
+static int transcode_osd_process( sout_stream_t *p_stream,
+ sout_stream_id_t *id,
+ block_t *in, block_t **out )
{
- while( p_subpic->p_region )
+ 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
{
- subpicture_region_t *p_region = p_subpic->p_region;
- p_subpic->p_region = p_region->p_next;
- p_subpic->pf_destroy_region( VLC_OBJECT(p_dec), p_region );
+ 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" );
+ }
}
- free( p_subpic );
+ 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