* transcode.c: transcoding stream output module
*****************************************************************************
* Copyright (C) 2003-2004 VideoLAN
- * $Id: transcode.c,v 1.82 2004/03/03 20:39:52 gbazin Exp $
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
- * Gildas Bazin <gbazin@netcourrier.com>
+ * Gildas Bazin <gbazin@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*****************************************************************************/
#include <stdlib.h>
#include <string.h>
+#include <math.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
+/*****************************************************************************
+ * 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." )
+#define VCODEC_TEXT N_("Destination video codec")
+#define VCODEC_LONGTEXT N_( \
+ "Allows you to specify the destination video codec used for the " \
+ "streaming output." )
+#define VB_TEXT N_("Video bitrate")
+#define VB_LONGTEXT N_( \
+ "Allows you to specify the video bitrate used for the streaming " \
+ "output." )
+#define SCALE_TEXT N_("Video scaling")
+#define SCALE_LONGTEXT N_( \
+ "Allows you to scale the video before encoding." )
+#define FPS_TEXT N_("Video frame-rate")
+#define FPS_LONGTEXT N_( \
+ "Allows you to specify an output frame rate for the video." )
+#define DEINTERLACE_TEXT N_("Deinterlace video")
+#define DEINTERLACE_LONGTEXT N_( \
+ "Allows you to deinterlace the video before encoding." )
+#define DEINTERLACE_MODULE_TEXT N_("Deinterlace module")
+#define DEINTERLACE_MODULE_LONGTEXT N_( \
+ "Specifies the deinterlace module to use." )
+#define WIDTH_TEXT N_("Video width")
+#define WIDTH_LONGTEXT N_( \
+ "Allows you to specify the output video width." )
+#define HEIGHT_TEXT N_("Video height")
+#define HEIGHT_LONGTEXT N_( \
+ "Allows you to specify the output video height." )
+#define VFILTER_TEXT N_("Video filter")
+#define VFILTER_LONGTEXT N_( \
+ "Allows you to specify video filters used after the video " \
+ "transcoding and subpictures overlaying." )
+
+#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")
+#define CROPLEFT_LONGTEXT N_( \
+ "Allows you to specify the left coordinate for the video cropping." )
+#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")
+#define CROPRIGHT_LONGTEXT N_( \
+ "Allows you to specify the right coordinate for the video cropping." )
+
+#define AENC_TEXT N_("Audio encoder")
+#define AENC_LONGTEXT N_( \
+ "Allows you to specify the audio encoder to use 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." )
+#define AB_TEXT N_("Audio bitrate")
+#define AB_LONGTEXT N_( \
+ "Allows you to specify the audio bitrate used for the streaming " \
+ "output." )
+#define ARATE_TEXT N_("Audio sample rate")
+#define ARATE_LONGTEXT N_( \
+ "Allows you to specify the audio sample rate used for the streaming " \
+ "output." )
+#define ACHANS_TEXT N_("Audio channels")
+#define ACHANS_LONGTEXT N_( \
+ "Allows you to specify the number of audio channels used for the " \
+ "streaming output." )
+
+#define SENC_TEXT N_("Subtitles encoder")
+#define SENC_LONGTEXT N_( \
+ "Allows you to specify the subtitles encoder to use and its associated " \
+ "options." )
+#define SCODEC_TEXT N_("Destination subtitles codec")
+#define SCODEC_LONGTEXT N_( \
+ "Allows you to specify the destination subtitles codec used for the " \
+ "streaming output." )
+#define SFILTER_TEXT N_("Subpictures filter")
+#define SFILTER_LONGTEXT N_( \
+ "Allows you to specify subpictures filters used during the video " \
+ "transcoding. The subpictures produced by the filters will be overlayed " \
+ "directly onto the video." )
+
+#define THREADS_TEXT N_("Number of threads")
+#define THREADS_LONGTEXT N_( \
+ "Allows you to specify the 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_( "Allows you to specify if the transcoder " \
+ "should drop frames if your CPU can't keep up with the encoding rate." )
+
+static char *ppsz_deinterlace_type[] =
+{
+ "deinterlace", "ffmpeg-deinterlace"
+};
-#if LIBAVCODEC_BUILD < 4704
-# define AV_NOPTS_VALUE 0
-#endif
+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,
+ VCODEC_LONGTEXT, VLC_FALSE );
+ add_integer( SOUT_CFG_PREFIX "vb", 800 * 1000, NULL, VB_TEXT,
+ VB_LONGTEXT, VLC_FALSE );
+ add_float( SOUT_CFG_PREFIX "scale", 1, NULL, SCALE_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_module_list_cat( SOUT_CFG_PREFIX "vfilter", SUBCAT_VIDEO_VFILTER,
+ NULL, NULL,
+ VFILTER_TEXT, VFILTER_LONGTEXT, VLC_FALSE );
+
+ add_integer( SOUT_CFG_PREFIX "croptop", 0, NULL, CROPTOP_TEXT,
+ CROPTOP_LONGTEXT, VLC_TRUE );
+ add_integer( SOUT_CFG_PREFIX "cropleft", 0, NULL, CROPLEFT_TEXT,
+ CROPLEFT_LONGTEXT, VLC_TRUE );
+ add_integer( SOUT_CFG_PREFIX "cropbottom", 0, NULL, CROPBOTTOM_TEXT,
+ CROPBOTTOM_LONGTEXT, VLC_TRUE );
+ add_integer( SOUT_CFG_PREFIX "cropright", 0, NULL, CROPRIGHT_TEXT,
+ CROPRIGHT_LONGTEXT, VLC_TRUE );
+
+ 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,
+ ACODEC_LONGTEXT, VLC_FALSE );
+ add_integer( SOUT_CFG_PREFIX "ab", 64000, NULL, AB_TEXT,
+ AB_LONGTEXT, VLC_FALSE );
+ add_integer( SOUT_CFG_PREFIX "channels", 0, NULL, ACHANS_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 );
+
+ 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_("Miscellaneous"), NULL );
+ add_integer( SOUT_CFG_PREFIX "threads", 0, NULL, THREADS_TEXT,
+ THREADS_LONGTEXT, VLC_TRUE );
+ add_bool( SOUT_CFG_PREFIX "high-priority", 0, NULL, HP_TEXT, HP_LONGTEXT,
+ VLC_TRUE );
+
+vlc_module_end();
+
+static const char *ppsz_sout_options[] = {
+ "venc", "vcodec", "vb", "croptop", "cropbottom", "cropleft", "cropright",
+ "scale", "fps", "width", "height", "vfilter", "deinterlace",
+ "deinterlace-module", "threads", "hurry-up", "aenc", "acodec", "ab",
+ "samplerate", "channels", "senc", "scodec", "soverlay", "sfilter",
+ "audio-sync", "high-priority", NULL
+};
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
-static int Open ( vlc_object_t * );
-static void Close ( vlc_object_t * );
-
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_t * );
-static int Send( sout_stream_t *, sout_stream_id_t *, sout_buffer_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 *, sout_buffer_t *, sout_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 *, sout_buffer_t *, sout_buffer_t ** );
-
-static int transcode_video_ffmpeg_getframebuf( struct AVCodecContext *, AVFrame *);
+static int Send( sout_stream_t *, sout_stream_id_t *, block_t* );
+
+static int transcode_audio_new ( sout_stream_t *, sout_stream_id_t * );
+static void transcode_audio_close ( sout_stream_t *, sout_stream_id_t * );
+static 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_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 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 int EncoderThread( struct sout_stream_sys_t * p_sys );
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
};
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-vlc_module_begin();
- set_description( _("Transcode stream output") );
- set_capability( "sout stream", 50 );
- add_shortcut( "transcode" );
- set_callbacks( Open, Close );
-vlc_module_end();
-
#define PICTURE_RING_SIZE 64
+#define SUBPICTURE_RING_SIZE 20
struct sout_stream_sys_t
{
VLC_COMMON_MEMBERS
- sout_stream_t * p_out;
- sout_stream_id_t * id_video;
- sout_buffer_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];
int i_first_pic, i_last_pic;
+ /* Audio */
vlc_fourcc_t i_acodec; /* codec audio (0 if not transcode) */
+ char *psz_aenc;
+ sout_cfg_t *p_audio_cfg;
int i_sample_rate;
int i_channels;
int i_abitrate;
- vlc_fourcc_t i_vcodec; /* " video " " " " */
+ /* Video */
+ vlc_fourcc_t i_vcodec; /* codec video (0 if not transcode) */
+ char *psz_venc;
+ sout_cfg_t *p_video_cfg;
int i_vbitrate;
- int i_vtolerance;
double f_scale;
+ double f_fps;
int i_width;
int i_height;
- int i_b_frames;
- int i_key_int;
- int i_qmin;
- int i_qmax;
- vlc_bool_t i_hq;
vlc_bool_t b_deinterlace;
- vlc_bool_t b_interlace;
- vlc_bool_t b_strict_rc;
- vlc_bool_t b_pre_me;
- vlc_bool_t b_hurry_up;
- int i_rc_buffer_size;
- float f_rc_buffer_aggressivity;
- float f_i_quant_factor;
- int i_noise_reduction;
- vlc_bool_t b_mpeg4_matrix;
+ char *psz_deinterlace;
+ sout_cfg_t *p_deinterlace_cfg;
int i_threads;
- vlc_bool_t b_trellis;
+ vlc_bool_t b_high_priority;
+ vlc_bool_t b_hurry_up;
+ char *psz_vfilters[10];
+ sout_cfg_t *p_vfilters_cfg[10];
+ int i_vfilters;
int i_crop_top;
int i_crop_bottom;
int i_crop_right;
int i_crop_left;
- mtime_t i_input_pts;
- mtime_t i_output_pts;
+ /* 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;
+ spu_t *p_spu;
+
+ /* 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;
};
/*****************************************************************************
{
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_stream_sys_t *p_sys;
- char *codec;
+ vlc_value_t val;
p_sys = vlc_object_create( p_this, sizeof( sout_stream_sys_t ) );
- p_sys->p_out = sout_stream_new( p_stream->p_sout, p_stream->psz_next );
-
- p_sys->f_scale = 1;
- p_sys->i_vtolerance = -1;
- p_sys->i_key_int = -1;
- p_sys->i_qmin = 2;
- p_sys->i_qmax = 31;
- p_sys->f_i_quant_factor = 0.0;
-#if LIBAVCODEC_BUILD >= 4673
- p_sys->i_hq = FF_MB_DECISION_SIMPLE;
-#else
- p_sys->i_hq = VLC_FALSE;
-#endif
- p_sys->i_rc_buffer_size = 224*1024*8 * 3/2;
- p_sys->f_rc_buffer_aggressivity = 0.1;
- p_sys->i_threads = 0;
- p_sys->b_trellis = 0;
- if( ( codec = sout_cfg_find_value( p_stream->p_cfg, "acodec" ) ) )
+ p_sys->p_out = sout_StreamNew( p_stream->p_sout, p_stream->psz_next );
+ if( !p_sys->p_out )
{
- char fcc[4] = " ";
- char *val;
+ msg_Err( p_stream, "cannot create chain" );
+ vlc_object_destroy( p_sys );
+ return VLC_EGENERIC;
+ }
+
+ p_sys->i_master_drift = 0;
- memcpy( fcc, codec, __MIN( strlen( codec ), 4 ) );
+ sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
+ p_stream->p_cfg );
+ /* Audio transcoding parameters */
+ var_Get( p_stream, SOUT_CFG_PREFIX "aenc", &val );
+ p_sys->psz_aenc = NULL;
+ p_sys->p_audio_cfg = NULL;
+ 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 );
+ if( psz_next ) free( psz_next );
+ }
+ if( val.psz_string ) free( val.psz_string );
+
+ var_Get( p_stream, SOUT_CFG_PREFIX "acodec", &val );
+ p_sys->i_acodec = 0;
+ if( val.psz_string && *val.psz_string )
+ {
+ char fcc[4] = " ";
+ memcpy( fcc, val.psz_string, __MIN( strlen( val.psz_string ), 4 ) );
p_sys->i_acodec = VLC_FOURCC( fcc[0], fcc[1], fcc[2], fcc[3] );
+ }
+ if( val.psz_string ) free( val.psz_string );
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "samplerate" ) ) )
- {
- p_sys->i_sample_rate = atoi( val );
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "channels" ) ) )
- {
- p_sys->i_channels = atoi( val );
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "ab" ) ) )
- {
- p_sys->i_abitrate = atoi( val );
- if( p_sys->i_abitrate < 4000 )
- {
- p_sys->i_abitrate *= 1000;
- }
- }
+ var_Get( p_stream, SOUT_CFG_PREFIX "ab", &val );
+ p_sys->i_abitrate = val.i_int;
+ if( p_sys->i_abitrate < 4000 ) p_sys->i_abitrate *= 1000;
+
+ var_Get( p_stream, SOUT_CFG_PREFIX "samplerate", &val );
+ p_sys->i_sample_rate = val.i_int;
- msg_Dbg( p_stream, "codec audio=%4.4s %dHz %d channels %dKb/s", fcc,
- p_sys->i_sample_rate, p_sys->i_channels,
- p_sys->i_abitrate / 1000 );
+ var_Get( p_stream, SOUT_CFG_PREFIX "channels", &val );
+ p_sys->i_channels = val.i_int;
+
+ if( p_sys->i_acodec )
+ {
+ 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 );
}
- if( ( codec = sout_cfg_find_value( p_stream->p_cfg, "vcodec" ) ) )
+ /* Video transcoding parameters */
+ var_Get( p_stream, SOUT_CFG_PREFIX "venc", &val );
+ p_sys->psz_venc = NULL;
+ p_sys->p_video_cfg = NULL;
+ if( val.psz_string && *val.psz_string )
+ {
+ char *psz_next;
+ psz_next = sout_CfgCreate( &p_sys->psz_venc, &p_sys->p_video_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 "vcodec", &val );
+ p_sys->i_vcodec = 0;
+ if( val.psz_string && *val.psz_string )
{
char fcc[4] = " ";
- char *val;
+ memcpy( fcc, val.psz_string, __MIN( strlen( val.psz_string ), 4 ) );
+ p_sys->i_vcodec = VLC_FOURCC( fcc[0], fcc[1], fcc[2], fcc[3] );
+ }
+ if( val.psz_string ) free( val.psz_string );
- memcpy( fcc, codec, __MIN( strlen( codec ), 4 ) );
+ var_Get( p_stream, SOUT_CFG_PREFIX "vb", &val );
+ p_sys->i_vbitrate = val.i_int;
+ if( p_sys->i_vbitrate < 16000 ) p_sys->i_vbitrate *= 1000;
- p_sys->i_vcodec = VLC_FOURCC( fcc[0], fcc[1], fcc[2], fcc[3] );
+ var_Get( p_stream, SOUT_CFG_PREFIX "scale", &val );
+ p_sys->f_scale = val.f_float;
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "scale" ) ) )
- {
- p_sys->f_scale = atof( val );
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "width" ) ) )
- {
- p_sys->i_width = atoi( val );
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "height" ) ) )
- {
- p_sys->i_height = atoi( val );
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "vb" ) ) )
- {
- p_sys->i_vbitrate = atoi( val );
- if( p_sys->i_vbitrate < 16000 )
- {
- p_sys->i_vbitrate *= 1000;
- }
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "vt" ) ) )
- {
- p_sys->i_vtolerance = atoi( val );
- }
- if( sout_cfg_find( p_stream->p_cfg, "deinterlace" ) )
- {
- p_sys->b_deinterlace = VLC_TRUE;
- }
- if( sout_cfg_find( p_stream->p_cfg, "interlace" ) )
- {
- p_sys->b_interlace = VLC_TRUE;
- }
- if( sout_cfg_find( p_stream->p_cfg, "strict_rc" ) )
- {
- p_sys->b_strict_rc = VLC_TRUE;
- }
- if( sout_cfg_find( p_stream->p_cfg, "pre_me" ) )
- {
- p_sys->b_pre_me = VLC_TRUE;
- }
- if( sout_cfg_find( p_stream->p_cfg, "hurry_up" ) )
- {
- p_sys->b_hurry_up = VLC_TRUE;
- /* hurry up mode needs noise reduction, even small */
- p_sys->i_noise_reduction = 1;
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "rc_buffer_size" ) ) )
- {
- p_sys->i_rc_buffer_size = atoi( val );
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "rc_buffer_aggressivity" ) ) )
- {
- p_sys->f_rc_buffer_aggressivity = atof( val );
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "i_quant_factor" ) ) )
- {
- p_sys->f_i_quant_factor = atof( val );
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "noise_reduction" ) ) )
- {
- p_sys->i_noise_reduction = atoi( val );
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "mpeg4_matrix" ) ) )
- {
- p_sys->b_mpeg4_matrix = VLC_TRUE;
- }
- /* crop */
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "croptop" ) ) )
- {
- p_sys->i_crop_top = atoi( val );
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "cropbottom" ) ) )
- {
- p_sys->i_crop_bottom = atoi( val );
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "cropleft" ) ) )
- {
- p_sys->i_crop_left = atoi( val );
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "cropright" ) ) )
- {
- p_sys->i_crop_right = atoi( val );
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "keyint" ) ) )
- {
- p_sys->i_key_int = atoi( val );
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "bframes" ) ) )
- {
- p_sys->i_b_frames = atoi( val );
- }
-#if LIBAVCODEC_BUILD >= 4673
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "hq" ) ) )
- {
- if( !strcmp( val, "rd" ) )
- {
- p_sys->i_hq = FF_MB_DECISION_RD;
- }
- else if( !strcmp( val, "bits" ) )
- {
- p_sys->i_hq = FF_MB_DECISION_BITS;
- }
- else if( !strcmp( val, "simple" ) )
- {
- p_sys->i_hq = FF_MB_DECISION_SIMPLE;
- }
- else
- {
- p_sys->i_hq = FF_MB_DECISION_RD;
- }
- }
-#else
- if( sout_cfg_find( p_stream->p_cfg, "hq" ) )
- {
- p_sys->i_hq = VLC_TRUE;
- }
-#endif
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "qmin" ) ) )
- {
- p_sys->i_qmin = atoi( val );
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "qmax" ) ) )
- {
- p_sys->i_qmax = atoi( val );
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "threads" ) ) )
- {
- p_sys->i_threads = atoi( val );
- }
- if( sout_cfg_find( p_stream->p_cfg, "trellis" ) )
+ 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 "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->b_trellis = VLC_TRUE;
+ psz_parser = sout_CfgCreate(
+ &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 );
+ 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 = sout_CfgCreate( &p_sys->psz_deinterlace,
+ &p_sys->p_deinterlace_cfg,
+ val.psz_string );
+ if( psz_next ) free( psz_next );
+ }
+ if( val.psz_string ) free( val.psz_string );
+
+ var_Get( p_stream, SOUT_CFG_PREFIX "croptop", &val );
+ p_sys->i_crop_top = val.i_int;
+ var_Get( p_stream, SOUT_CFG_PREFIX "cropbottom", &val );
+ p_sys->i_crop_bottom = val.i_int;
+ var_Get( p_stream, SOUT_CFG_PREFIX "cropleft", &val );
+ p_sys->i_crop_left = val.i_int;
+ var_Get( p_stream, SOUT_CFG_PREFIX "cropright", &val );
+ p_sys->i_crop_right = val.i_int;
+
+ var_Get( p_stream, SOUT_CFG_PREFIX "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 )
+ {
msg_Dbg( p_stream, "codec video=%4.4s %dx%d scaling: %f %dkb/s",
- fcc, p_sys->i_width, p_sys->i_height, p_sys->f_scale,
- p_sys->i_vbitrate / 1000 );
+ (char *)&p_sys->i_vcodec, p_sys->i_width, p_sys->i_height,
+ p_sys->f_scale, p_sys->i_vbitrate / 1000 );
}
- if( !p_sys->p_out )
+ /* Subpictures transcoding parameters */
+ p_sys->p_spu = 0;
+ 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 )
{
- msg_Err( p_stream, "cannot create chain" );
- free( p_sys );
- return VLC_EGENERIC;
+ char *psz_next;
+ psz_next = sout_CfgCreate( &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 );
+ if( val.psz_string && *val.psz_string )
+ {
+ char fcc[4] = " ";
+ memcpy( fcc, val.psz_string, __MIN( strlen( val.psz_string ), 4 ) );
+ p_sys->i_scodec = VLC_FOURCC( fcc[0], fcc[1], fcc[2], fcc[3] );
+ }
+ if( val.psz_string ) free( val.psz_string );
+
+ if( p_sys->i_scodec )
+ {
+ 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;
+
+ 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 );
+
+ var_Get( p_stream, SOUT_CFG_PREFIX "audio-sync", &val );
+ p_sys->b_master_sync = val.b_bool;
+ if( p_sys->f_fps > 0 ) p_sys->b_master_sync = VLC_TRUE;
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();
-
- /* ffmpeg needs some padding at the end of each buffer */
- p_stream->p_sout->i_padding += FF_INPUT_BUFFER_PADDING_SIZE;
-
return VLC_SUCCESS;
}
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_stream_sys_t *p_sys = p_stream->p_sys;
- sout_stream_delete( p_sys->p_out );
+ sout_StreamDelete( p_sys->p_out );
+
+ while( p_sys->p_audio_cfg != NULL )
+ {
+ sout_cfg_t *p_next = p_sys->p_audio_cfg->p_next;
+
+ if( p_sys->p_audio_cfg->psz_name )
+ free( p_sys->p_audio_cfg->psz_name );
+ if( p_sys->p_audio_cfg->psz_value )
+ free( p_sys->p_audio_cfg->psz_value );
+ free( p_sys->p_audio_cfg );
+
+ p_sys->p_audio_cfg = p_next;
+ }
+ if( p_sys->psz_aenc ) free( p_sys->psz_aenc );
+
+ while( p_sys->p_video_cfg != NULL )
+ {
+ sout_cfg_t *p_next = p_sys->p_video_cfg->p_next;
+
+ if( p_sys->p_video_cfg->psz_name )
+ free( p_sys->p_video_cfg->psz_name );
+ if( p_sys->p_video_cfg->psz_value )
+ free( p_sys->p_video_cfg->psz_value );
+ free( p_sys->p_video_cfg );
+
+ p_sys->p_video_cfg = p_next;
+ }
+ if( p_sys->psz_venc ) free( p_sys->psz_venc );
+
+ while( p_sys->p_deinterlace_cfg != NULL )
+ {
+ sout_cfg_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;
+
+ if( p_sys->p_spu_cfg->psz_name )
+ free( p_sys->p_spu_cfg->psz_name );
+ if( p_sys->p_spu_cfg->psz_value )
+ free( p_sys->p_spu_cfg->psz_value );
+ free( p_sys->p_spu_cfg );
+
+ p_sys->p_spu_cfg = p_next;
+ }
+ if( p_sys->psz_senc ) free( p_sys->psz_senc );
+
+ if( p_sys->p_spu ) spu_Destroy( p_sys->p_spu );
+
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;
- /* Encoder */
- encoder_t *p_encoder;
- vlc_fourcc_t b_enc_inited;
-
- /* ffmpeg part */
- AVCodec *ff_dec;
- AVCodecContext *ff_dec_c;
+ /* Decoder */
+ decoder_t *p_decoder;
- mtime_t i_dts;
- mtime_t i_length;
+ /* Filters */
+ filter_t *pp_filter[10];
+ int i_filter;
+ filter_t *pp_vfilter[10];
+ int i_vfilter;
- 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 */
+ /* Encoder */
+ encoder_t *p_encoder;
- ImgReSampleContext *p_vresample;
+ /* Sync */
+ date_t interpolated_pts;
};
-static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
+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;
- sout_stream_id_t *id;
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+ sout_stream_id_t *id;
id = malloc( sizeof( sout_stream_id_t ) );
- id->i_dts = 0;
+ memset( id, 0, sizeof(sout_stream_id_t) );
+
id->id = NULL;
+ id->p_decoder = NULL;
id->p_encoder = NULL;
- if( p_fmt->i_cat == AUDIO_ES && p_sys->i_acodec != 0 )
+ /* 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->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) )
{
msg_Dbg( p_stream,
"creating audio transcoding from fcc=`%4.4s' to fcc=`%4.4s'",
- (char*)&p_fmt->i_codec,
- (char*)&p_sys->i_acodec );
-
- /* src format */
- memcpy( &id->f_src, p_fmt, sizeof( es_format_t ) );
-
- /* create dst format */
- es_format_Init( &id->f_dst, AUDIO_ES, p_sys->i_acodec );
- 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 );
- 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 > 0 ? p_sys->i_abitrate : 64000;
- id->f_dst.audio.i_blockalign = 0;
- id->f_dst.i_extra = 0;
- id->f_dst.p_extra = NULL;
+ (char*)&p_fmt->i_codec, (char*)&p_sys->i_acodec );
+
+ /* Complete destination format */
+ id->p_encoder->fmt_out.i_codec = p_sys->i_acodec;
+ id->p_encoder->fmt_out.audio.i_rate = p_sys->i_sample_rate > 0 ?
+ p_sys->i_sample_rate : (int)p_fmt->audio.i_rate;
+ 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 )
- {
- free( id );
- return NULL;
- }
+ if( !id->id ) goto error;
+
+ date_Init( &id->interpolated_pts, p_fmt->audio.i_rate, 1 );
}
- else if( p_fmt->i_cat == VIDEO_ES && p_sys->i_vcodec != 0 )
+ else if( p_fmt->i_cat == VIDEO_ES &&
+ (p_sys->i_vcodec != 0 || p_sys->psz_venc) )
{
msg_Dbg( p_stream,
"creating video transcoding from fcc=`%4.4s' to fcc=`%4.4s'",
- (char*)&p_fmt->i_codec,
- (char*)&p_sys->i_vcodec );
-
- memcpy( &id->f_src, p_fmt, sizeof( es_format_t ) );
-
- /* create dst format */
- es_format_Init( &id->f_dst, VIDEO_ES, p_sys->i_vcodec );
- 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 );
- 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 > 0 ? p_sys->i_vbitrate : 800*1000;
- id->f_dst.i_extra = 0;
- id->f_dst.p_extra = NULL;
+ (char*)&p_fmt->i_codec, (char*)&p_sys->i_vcodec );
- /* build decoder -> filter -> encoder */
- if( transcode_video_ffmpeg_new( p_stream, id ) )
+ /* Complete destination format */
+ id->p_encoder->fmt_out.i_codec = p_sys->i_vcodec;
+ id->p_encoder->fmt_out.video.i_width = p_sys->i_width;
+ id->p_encoder->fmt_out.video.i_height = p_sys->i_height;
+ id->p_encoder->fmt_out.i_bitrate = p_sys->i_vbitrate;
+
+ /* 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
+
+ /* 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( p_sys->f_fps > 0 )
+ {
+ id->p_encoder->fmt_out.video.i_frame_rate =
+ (p_sys->f_fps * 1001) + 0.5;
+ id->p_encoder->fmt_out.video.i_frame_rate_base = 1001;
+ }
+ }
+ else if( p_fmt->i_cat == SPU_ES && (p_sys->i_scodec || p_sys->psz_senc) )
+ {
+ msg_Dbg( p_stream, "creating subtitles transcoding from fcc=`%4.4s' "
+ "to fcc=`%4.4s'", (char*)&p_fmt->i_codec,
+ (char*)&p_sys->i_scodec );
+
+ /* Complete destination format */
+ 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" );
+ goto error;
+ }
+
/* open output stream */
- id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->f_dst );
-#endif
+ 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 if( p_fmt->i_cat == SPU_ES && p_sys->b_soverlay )
+ {
+ msg_Dbg( p_stream, "subtitles (fcc=`%4.4s') overlaying",
+ (char*)&p_fmt->i_codec );
+
+ id->b_transcode = VLC_TRUE;
+
+ /* Build decoder -> filter -> overlaying chain */
+ if( transcode_spu_new( p_stream, id ) )
+ {
+ msg_Err( p_stream, "cannot create subtitles chain" );
+ goto error;
+ }
}
else
{
- msg_Dbg( p_stream, "not transcoding a stream (fcc=`%4.4s')", (char*)&p_fmt->i_codec );
+ msg_Dbg( p_stream, "not transcoding a stream (fcc=`%4.4s')",
+ (char*)&p_fmt->i_codec );
id->id = p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
id->b_transcode = VLC_FALSE;
- if( id->id == NULL )
- {
- free( id );
- return NULL;
- }
+ if( !id->id ) goto error;
}
return id;
+
+ error:
+ if( id->p_decoder )
+ {
+ vlc_object_detach( id->p_decoder );
+ vlc_object_destroy( id->p_decoder );
+ }
+
+ if( id->p_encoder )
+ {
+ vlc_object_detach( id->p_encoder );
+ vlc_object_destroy( id->p_encoder );
+ }
+
+ free( id );
+ return NULL;
}
-static int Del ( sout_stream_t *p_stream, sout_stream_id_t *id )
+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( id->b_transcode )
{
- if( id->f_src.i_cat == AUDIO_ES )
+ switch( id->p_decoder->fmt_in.i_cat )
{
- transcode_audio_ffmpeg_close( p_stream, id );
- }
- else if( id->f_src.i_cat == VIDEO_ES )
- {
- transcode_video_ffmpeg_close( p_stream, id );
+ 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 );
+ }
+
+ if( id->p_encoder )
+ {
+ vlc_object_detach( id->p_encoder );
+ vlc_object_destroy( id->p_encoder );
+ }
+
free( id );
return VLC_SUCCESS;
}
static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
- sout_buffer_t *p_buffer )
+ block_t *p_buffer )
{
- sout_stream_sys_t *p_sys = p_stream->p_sys;
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+ block_t *p_out;
- if( id->b_transcode )
+ if( !id->b_transcode && id->id )
{
- sout_buffer_t *p_buffer_out;
- if( id->f_src.i_cat == AUDIO_ES )
+ if( p_sys->b_master_sync && p_sys->i_master_drift )
{
- transcode_audio_ffmpeg_process( p_stream, id, p_buffer,
- &p_buffer_out );
- }
- else if( id->f_src.i_cat == VIDEO_ES )
- {
- if( transcode_video_ffmpeg_process( p_stream, id, p_buffer,
- &p_buffer_out ) != VLC_SUCCESS )
+ if( p_buffer->i_dts > 0 )
{
- sout_BufferDelete( p_stream->p_sout, p_buffer );
- return VLC_EGENERIC;
+ p_buffer->i_dts -= p_sys->i_master_drift;
+ if( p_buffer->i_dts < 0 )
+ {
+ block_Release( p_buffer );
+ return VLC_EGENERIC;
+ }
+ }
+ if( p_buffer->i_pts > 0 )
+ {
+ p_buffer->i_pts -= p_sys->i_master_drift;
+ if( p_buffer->i_pts < 0 )
+ {
+ block_Release( p_buffer );
+ return VLC_EGENERIC;
+ }
}
}
- sout_BufferDelete( p_stream->p_sout, p_buffer );
- if( p_buffer_out )
- {
- return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer_out );
- }
- return VLC_SUCCESS;
- }
- else if( id->id != NULL )
- {
return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer );
}
- else
+ else if( !id->b_transcode )
{
- sout_BufferDelete( p_stream->p_sout, p_buffer );
+ block_Release( p_buffer );
return VLC_EGENERIC;
}
-}
-
-/****************************************************************************
- * ffmpeg decoder reencocdr 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 },
-#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 }
-};
+ switch( id->p_decoder->fmt_in.i_cat )
+ {
+ case AUDIO_ES:
+ transcode_audio_process( p_stream, id, p_buffer, &p_out );
+ break;
-static inline int get_ff_codec( vlc_fourcc_t i_fcc )
-{
- int i;
+ case VIDEO_ES:
+ if( transcode_video_process( p_stream, id, p_buffer, &p_out )
+ != VLC_SUCCESS )
+ {
+ return VLC_EGENERIC;
+ }
+ break;
- for( i = 0; fourcc_to_ff_code[i].i_fcc != 0; i++ )
- {
- if( fourcc_to_ff_code[i].i_fcc == i_fcc )
+ case SPU_ES:
+ if( transcode_spu_process( p_stream, id, p_buffer, &p_out ) !=
+ VLC_SUCCESS )
{
- return fourcc_to_ff_code[i].i_ff_codec;
+ return VLC_EGENERIC;
}
+ break;
+
+ default:
+ block_Release( p_buffer );
+ break;
}
- return 0;
+ if( p_out ) return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_out );
+ return VLC_SUCCESS;
}
-static inline int get_ff_chroma( vlc_fourcc_t i_chroma )
+/****************************************************************************
+ * decoder reencoder part
+ ****************************************************************************/
+int audio_BitsPerSample( vlc_fourcc_t i_format )
{
- 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;
+ switch( i_format )
+ {
+ case VLC_FOURCC('u','8',' ',' '):
+ case VLC_FOURCC('s','8',' ',' '):
+ return 8;
+
+ case VLC_FOURCC('u','1','6','l'):
+ case VLC_FOURCC('s','1','6','l'):
+ case VLC_FOURCC('u','1','6','b'):
+ case VLC_FOURCC('s','1','6','b'):
+ return 16;
+
+ case VLC_FOURCC('u','2','4','l'):
+ case VLC_FOURCC('s','2','4','l'):
+ case VLC_FOURCC('u','2','4','b'):
+ case VLC_FOURCC('s','2','4','b'):
+ return 24;
+
+ 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;
}
-}
-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;
- }
+ return 0;
}
-static int transcode_audio_ffmpeg_new( sout_stream_t *p_stream,
- sout_stream_id_t *id )
+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 )
{
- int i_ff_codec;
+ filter_t *p_filter = vlc_object_create( p_stream, VLC_OBJECT_FILTER );
- 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',' ',' ') )
- {
- id->ff_dec = NULL;
+ vlc_object_attach( p_filter, p_stream );
+ p_filter->pf_audio_buffer_new = __block_New;
+
+ p_filter->fmt_in = *p_fmt_in;
+ p_filter->fmt_out = *p_fmt_out;
- 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->p_module = module_Need( p_filter, "audio filter2", 0, 0 );
+ if( p_filter->p_module )
+ {
+ p_filter->fmt_out.audio.i_bitspersample =
+ audio_BitsPerSample( p_filter->fmt_out.i_codec );
+ *p_fmt_in = p_filter->fmt_out;
}
else
{
- /* 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;
- }
+ vlc_object_detach( p_filter );
+ vlc_object_destroy( p_filter );
+ p_filter = 0;
+ }
- 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;
+ return p_filter;
+}
- 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" );
- return VLC_EGENERIC;
- }
+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_pass = 6;
+
+ /*
+ * Open decoder
+ */
+
+ /* Initialization of decoder structures */
+ id->p_decoder->fmt_out = id->p_decoder->fmt_in;
+ id->p_decoder->fmt_out.i_extra = 0;
+ id->p_decoder->fmt_out.p_extra = 0;
+ id->p_decoder->pf_decode_audio = 0;
+ id->p_decoder->pf_aout_buffer_new = audio_new_buffer;
+ id->p_decoder->pf_aout_buffer_del = audio_del_buffer;
+ //id->p_decoder->p_cfg = p_sys->p_video_cfg;
+
+ id->p_decoder->p_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 decoders so we don't have to do this */
+ fmt_last.audio.i_rate = id->p_decoder->fmt_in.audio.i_rate;
- 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 );
+ /*
+ * Open encoder
+ */
- /* find 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->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, 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_rate = id->p_encoder->fmt_out.audio.i_rate;
id->p_encoder->fmt_in.audio.i_physical_channels =
- id->p_encoder->fmt_in.audio.i_original_channels =
- 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_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->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->p_cfg = p_stream->p_sys->p_audio_cfg;
id->p_encoder->p_module =
- module_Need( id->p_encoder, "encoder", NULL, 0 );
+ module_Need( id->p_encoder, "encoder", p_sys->psz_aenc, VLC_TRUE );
if( !id->p_encoder->p_module )
{
- vlc_object_destroy( id->p_encoder );
- msg_Err( p_stream, "cannot open encoder" );
+ msg_Err( p_stream, "cannot find encoder" );
+ module_Unneed( id->p_decoder, id->p_decoder->p_module );
+ id->p_decoder->p_module = 0;
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 );
- id->b_enc_inited = VLC_FALSE;
-
- id->f_dst.i_extra = id->p_encoder->fmt_out.i_extra;
- id->f_dst.p_extra = id->p_encoder->fmt_out.p_extra;
-
- /* Hack for mp3 transcoding support */
- if( id->f_dst.i_codec == VLC_FOURCC( 'm','p','3',' ' ) )
+ /* 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 )
{
- id->f_dst.i_codec = VLC_FOURCC( 'm','p','g','a' );
- }
+ /* 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');
- return VLC_SUCCESS;
-}
+ id->pp_filter[id->i_filter] =
+ transcode_audio_filter_new( p_stream, id, &fmt_last, &fmt_out );
-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 );
- free( id->ff_dec_c );
+ if( id->pp_filter[id->i_filter] ) id->i_filter++;
}
- module_Unneed( id->p_encoder, id->p_encoder->p_module );
- vlc_object_destroy( id->p_encoder );
-
- free( id->p_buffer );
-}
-
-static int transcode_audio_ffmpeg_process( sout_stream_t *p_stream,
- sout_stream_id_t *id,
- sout_buffer_t *in,
- sout_buffer_t **out )
-{
- aout_buffer_t aout_buf;
- block_t *p_block;
- int i_buffer = in->i_size;
- char *p_buffer = in->p_buffer;
- id->i_dts = in->i_dts;
- *out = NULL;
-
- while( i_buffer )
+ while( i_pass-- )
{
- 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;
+ id->pp_filter[id->i_filter] =
+ transcode_audio_filter_new( p_stream, id, &fmt_last,
+ &id->p_encoder->fmt_in );
- i_used = avcodec_decode_audio( id->ff_dec_c,
- (int16_t*)id->p_buffer, &id->i_buffer_pos,
- p_buffer, i_buffer );
-
-#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");
- break;
- }
-
- i_buffer -= i_used;
- p_buffer += i_used;
-
- if ( id->i_buffer_pos < 0 )
- {
- msg_Warn( p_stream, "weird error audio decoding");
- break;
- }
+ if( id->pp_filter[id->i_filter] ) id->i_filter++;
+ else break;
}
- else
- {
- int16_t *sout = (int16_t*)id->p_buffer;
-
- 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;
+ }
- /* first copy */
- memcpy( sout, sin, 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;
+ }
-#ifdef WORDS_BIGENDIAN
- if( id->f_src.i_codec == VLC_FOURCC( 's', '1', '6', 'l' ) )
+ if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels )
+ {
+ msg_Err( p_stream, "no audio filter found for mixing from"
+ " %i to %i channels", fmt_last.audio.i_channels,
+ id->p_encoder->fmt_in.audio.i_channels );
+#if 0
+ /* FIXME : this might work, but only if the encoder is restarted */
+ 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;
#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;
+ 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
+ transcode_audio_close( p_stream, id );
+ return VLC_EGENERIC;
+#endif
+ }
- dat += 2;
+ /* 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' );
- i_samples--;
- }
- }
+ return VLC_SUCCESS;
+}
- i_buffer -= i_used;
- p_buffer += i_used;
- id->i_buffer_pos = i_used;
- }
- }
+static void transcode_audio_close( sout_stream_t *p_stream,
+ sout_stream_id_t *id )
+{
+ int i;
- if( id->i_buffer_pos == 0 ) continue;
+ /* Close decoder */
+ if( id->p_decoder->p_module )
+ module_Unneed( id->p_decoder, id->p_decoder->p_module );
+ id->p_decoder->p_module = 0;
- /* Encode as much data as possible */
- if( !id->b_enc_inited && id->p_encoder->pf_header )
- {
- p_block = id->p_encoder->pf_header( id->p_encoder );
- while( p_block )
- {
- sout_buffer_t *p_out;
- block_t *p_prev_block = p_block;
+ /* Close encoder */
+ if( id->p_encoder->p_module )
+ module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ id->p_encoder->p_module = 0;
- p_out = sout_BufferNew( p_stream->p_sout, p_block->i_buffer );
- memcpy( p_out->p_buffer, p_block->p_buffer, p_block->i_buffer);
- p_out->i_dts = p_out->i_pts = in->i_dts;
- p_out->i_length = 0;
- sout_BufferChain( out, p_out );
+ /* 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] );
+ }
+}
- p_block = p_block->p_next;
- block_Release( p_prev_block );
- }
+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;
- id->b_enc_inited = VLC_TRUE;
+ while( (p_audio_buf = id->p_decoder->pf_decode_audio( id->p_decoder,
+ &in )) )
+ {
+ if( p_sys->b_master_sync )
+ {
+ mtime_t i_dts = date_Get( &id->interpolated_pts ) + 1;
+ p_sys->i_master_drift = p_audio_buf->start_date - i_dts;
+ date_Increment( &id->interpolated_pts, p_audio_buf->i_nb_samples );
+ p_audio_buf->start_date -= p_sys->i_master_drift;
+ p_audio_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;
-
- id->i_dts += ( I64C(1000000) * id->i_buffer_pos / 2 /
- id->f_src.audio.i_channels / id->f_src.audio.i_rate );
+ 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( id->f_src.audio.i_channels !=
- id->p_encoder->fmt_in.audio.i_channels )
+ /* Run filter chain */
+ for( i = 0; i < id->i_filter; i++ )
{
- 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_audio_block =
+ id->pp_filter[i]->pf_audio_filter( id->pp_filter[i],
+ p_audio_block );
}
- p_block = id->p_encoder->pf_encode_audio( id->p_encoder, &aout_buf );
- while( p_block )
- {
- sout_buffer_t *p_out;
- block_t *p_prev_block = p_block;
-
- p_out = sout_BufferNew( p_stream->p_sout, p_block->i_buffer );
- memcpy( p_out->p_buffer, p_block->p_buffer, p_block->i_buffer);
- p_out->i_dts = p_block->i_dts;
- p_out->i_pts = p_block->i_pts;
- p_out->i_length = p_block->i_length;
- sout_BufferChain( out, p_out );
-
- p_block = p_block->p_next;
- block_Release( p_prev_block );
- }
+ p_audio_buf->p_buffer = p_audio_block->p_buffer;
+ p_audio_buf->i_nb_bytes = p_audio_block->i_buffer;
+ p_audio_buf->i_nb_samples = p_audio_block->i_samples;
+ p_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_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;
+ aout_buffer_t *p_buffer;
+ block_t *p_block;
+ int i_size;
- 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
+ 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->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->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;
- 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;
-
- if( avcodec_open( id->ff_dec_c, id->ff_dec ) < 0 )
- {
- msg_Err( p_stream, "cannot open decoder" );
- return VLC_EGENERIC;
- }
+ 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( i_ff_codec == CODEC_ID_MPEG4 && id->ff_dec_c->extradata_size > 0 )
- {
- int b_gotpicture;
- AVFrame frame;
- uint8_t *p_vol = malloc( id->ff_dec_c->extradata_size +
- FF_INPUT_BUFFER_PADDING_SIZE );
-
- memcpy( p_vol, id->ff_dec_c->extradata,
- id->ff_dec_c->extradata_size );
- memset( p_vol + id->ff_dec_c->extradata_size, 0,
- FF_INPUT_BUFFER_PADDING_SIZE );
-
- avcodec_decode_video( id->ff_dec_c, &frame, &b_gotpicture,
- id->ff_dec_c->extradata,
- id->ff_dec_c->extradata_size );
- free( p_vol );
- }
+ return p_buffer;
+}
+
+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 );
+}
+
+/*
+ * 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;
+
+ /*
+ * 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;
+
+ 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;
}
- /* 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. */
- id->p_encoder->fmt_in.video.i_width = 16;
- id->p_encoder->fmt_in.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
- }
+ * Just put sensible values so we can test an encoder is available. */
+ id->p_encoder->fmt_in.video.i_width =
+ id->p_encoder->fmt_out.video.i_width ?
+ id->p_encoder->fmt_out.video.i_width :
+ id->p_decoder->fmt_in.video.i_width ?
+ id->p_decoder->fmt_in.video.i_width : 16;
+ id->p_encoder->fmt_in.video.i_height =
+ id->p_encoder->fmt_out.video.i_height ?
+ id->p_encoder->fmt_out.video.i_height :
+ id->p_decoder->fmt_in.video.i_height ?
+ id->p_decoder->fmt_in.video.i_height : 16;
+ id->p_encoder->fmt_in.video.i_frame_rate = 25;
+ id->p_encoder->fmt_in.video.i_frame_rate_base = 1;
- /* 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->i_vtolerance = p_sys->i_vtolerance;
- id->p_encoder->i_key_int = p_sys->i_key_int;
- id->p_encoder->i_b_frames = p_sys->i_b_frames;
- id->p_encoder->i_qmin = p_sys->i_qmin;
- id->p_encoder->i_qmax = p_sys->i_qmax;
- id->p_encoder->i_hq = p_sys->i_hq;
- id->p_encoder->b_strict_rc = p_sys->b_strict_rc;
- id->p_encoder->b_pre_me = p_sys->b_pre_me;
- id->p_encoder->b_hurry_up = p_sys->b_hurry_up;
- id->p_encoder->b_interlace = p_sys->b_interlace;
- id->p_encoder->i_rc_buffer_size = p_sys->i_rc_buffer_size;
- id->p_encoder->f_rc_buffer_aggressivity = p_sys->f_rc_buffer_aggressivity;
- id->p_encoder->f_i_quant_factor = p_sys->f_i_quant_factor;
- id->p_encoder->i_noise_reduction = p_sys->i_noise_reduction;
- id->p_encoder->b_mpeg4_matrix = p_sys->b_mpeg4_matrix;
id->p_encoder->i_threads = p_sys->i_threads;
- id->p_encoder->b_trellis = p_sys->b_trellis;
-
- 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_vresample = NULL;
+ id->p_encoder->p_cfg = p_sys->p_video_cfg;
id->p_encoder->p_module =
- module_Need( id->p_encoder, "encoder", NULL, 0 );
-
+ 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" );
+ 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 );
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_destroy( id->p_encoder );
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;
}
}
+ date_Set( &id->interpolated_pts, 0 );
+
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;
+
+ /* Hack because of the copy packetizer which can fail to detect the
+ * proper size (which forces us to wait until the 1st frame
+ * is decoded) */
+ int i_width = id->p_decoder->fmt_out.video.i_width -
+ p_sys->i_crop_left - p_sys->i_crop_right;
+ int i_height = id->p_decoder->fmt_out.video.i_height -
+ p_sys->i_crop_top - p_sys->i_crop_bottom;
+
+ 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 );
+ /* Apply the scaling */
+ id->p_encoder->fmt_out.video.i_width = i_width * p_sys->f_scale;
+ id->p_encoder->fmt_out.video.i_height = i_height * p_sys->f_scale;
}
-
- /* Close decoder */
- if( id->ff_dec )
+ else if( id->p_encoder->fmt_out.video.i_width > 0 &&
+ id->p_encoder->fmt_out.video.i_height <= 0 )
+ {
+ id->p_encoder->fmt_out.video.i_height =
+ id->p_encoder->fmt_out.video.i_width / (double)i_width * i_height;
+ }
+ else if( id->p_encoder->fmt_out.video.i_width <= 0 &&
+ id->p_encoder->fmt_out.video.i_height > 0 )
{
- avcodec_close( id->ff_dec_c );
- free( id->ff_dec_c );
+ id->p_encoder->fmt_out.video.i_width =
+ id->p_encoder->fmt_out.video.i_height / (double)i_height * i_width;
}
- /* Close encoder */
- if( id->p_encoder->p_module )
- module_Unneed( id->p_encoder, id->p_encoder->p_module );
- vlc_object_destroy( id->p_encoder );
+ /* Make sure the size is at least a multiple of 2 */
+ id->p_encoder->fmt_out.video.i_width =
+ (id->p_encoder->fmt_out.video.i_width + 1) >> 1 << 1;
+ id->p_encoder->fmt_out.video.i_height =
+ (id->p_encoder->fmt_out.video.i_height + 1) >> 1 << 1;
- /* Misc cleanup */
- if( id->p_ff_pic)
+ id->p_encoder->fmt_in.video.i_width =
+ id->p_encoder->fmt_out.video.i_width;
+ id->p_encoder->fmt_in.video.i_height =
+ id->p_encoder->fmt_out.video.i_height;
+
+ if( !id->p_encoder->fmt_out.video.i_frame_rate ||
+ !id->p_encoder->fmt_out.video.i_frame_rate_base )
{
- free( id->p_ff_pic );
+ 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_tmp0 )
+ 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_tmp0->data[0] );
- free( id->p_ff_pic_tmp0 );
+ id->p_encoder->fmt_out.video.i_aspect =
+ id->p_decoder->fmt_out.video.i_aspect;
}
- if( id->p_ff_pic_tmp1)
+ id->p_encoder->fmt_in.video.i_aspect =
+ id->p_encoder->fmt_out.video.i_aspect;
+
+ 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_tmp1->data[0] );
- free( id->p_ff_pic_tmp1 );
+ msg_Err( p_stream, "cannot find encoder" );
+ return VLC_EGENERIC;
}
- if( id->p_ff_pic_tmp2)
+
+ 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_tmp2->data[0] );
- free( id->p_ff_pic_tmp2 );
+ 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, sout_buffer_t *in, sout_buffer_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;
- int b_gotpicture;
- AVFrame *frame;
+ int i, j;
- int i_data;
- uint8_t *p_data;
+ if( p_stream->p_sys->i_threads >= 1 )
+ {
+ vlc_mutex_lock( &p_stream->p_sys->lock_out );
+ p_stream->p_sys->b_die = 1;
+ vlc_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 );
+ }
- *out = NULL;
+ /* Close decoder */
+ if( id->p_decoder->p_module )
+ module_Unneed( id->p_decoder, id->p_decoder->p_module );
- i_data = in->i_size;
- p_data = in->p_buffer;
-
- for( ;; )
+ if( id->p_decoder->p_owner )
{
- block_t *p_block;
- picture_t * p_pic;
- int i_plane;
-
- /* decode frame */
- frame = id->p_ff_pic;
- p_sys->i_input_pts = in->i_pts;
- 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;
+ 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 );
+
+ /* 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 );
- if( !b_gotpicture )
+ /* 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 );
- /* Get the pts of the decoded frame if any, otherwise keep the
- * interpolated one */
- if( frame->pts != AV_NOPTS_VALUE )
+ vlc_object_destroy( id->pp_filter[i] );
+ }
+ for( i = 0; i < id->i_vfilter; i++ )
+ {
+ vlc_object_detach( id->pp_vfilter[i] );
+ if( id->pp_vfilter[i]->p_module )
+ module_Unneed( id->pp_vfilter[i], id->pp_vfilter[i]->p_module );
+
+ /* Clean-up pictures ring buffer */
+ for( j = 0; j < PICTURE_RING_SIZE; j++ )
{
- p_sys->i_output_pts = frame->pts;
+ if( id->pp_vfilter[i]->p_owner->pp_pics[j] )
+ video_del_buffer( VLC_OBJECT(id->pp_vfilter[i]),
+ id->pp_vfilter[i]->p_owner->pp_pics[j] );
}
+ free( id->pp_vfilter[i]->p_owner );
+
+ vlc_object_destroy( id->pp_vfilter[i] );
+ }
+}
+
+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;
+ *out = NULL;
+
+ while( (p_pic = id->p_decoder->pf_decode_video( id->p_decoder, &in )) )
+ {
+ subpicture_t *p_subpic = 0;
- if( !id->b_enc_inited )
+ if( p_stream->p_sout->i_out_pace_nocontrol && p_sys->b_hurry_up )
{
- /* 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 )
+ mtime_t current_date = mdate();
+ if( current_date + 50000 > p_pic->date )
{
- id->f_dst.video.i_height =
- id->f_dst.video.i_width / (double)i_width * i_height;
+ msg_Dbg( p_stream, "late picture skipped ("I64Fd")",
+ current_date + 50000 - p_pic->date );
+ p_pic->pf_release( p_pic );
+ continue;
}
- else if( id->f_dst.video.i_width <= 0 &&
- id->f_dst.video.i_height > 0 )
+ }
+
+ 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;
+
+ if( !i_master_drift )
{
- id->f_dst.video.i_width =
- id->f_dst.video.i_height / (double)i_height * i_width;
+ /* No audio track ? */
+ p_sys->i_master_drift = i_master_drift = p_pic->date;
}
- id->p_encoder->fmt_in.video.i_width =
- id->p_encoder->fmt_out.video.i_width =
- id->f_dst.video.i_width;
- id->p_encoder->fmt_in.video.i_height =
- id->p_encoder->fmt_out.video.i_height =
- id->f_dst.video.i_height;
+ i_pts = date_Get( &id->interpolated_pts ) + 1;
+ i_video_drift = p_pic->date - i_pts;
+ i_duplicate = 1;
- id->p_encoder->fmt_out.i_extra = 0;
- id->p_encoder->fmt_out.p_extra = NULL;
+ /* Set the pts of the frame being encoded */
+ p_pic->date = i_pts;
- id->p_encoder->p_module =
- module_Need( id->p_encoder, "encoder", NULL, 0 );
- if( !id->p_encoder->p_module )
+ if( i_video_drift < i_master_drift - 50000 )
{
- vlc_object_destroy( id->p_encoder );
- msg_Err( p_stream, "cannot find encoder" );
- id->b_transcode = VLC_FALSE;
- return VLC_EGENERIC;
+#if 0
+ msg_Dbg( p_stream, "dropping frame (%i)",
+ (int)(i_video_drift - i_master_drift) );
+#endif
+ p_pic->pf_release( p_pic );
+ continue;
}
-
- id->f_dst.i_extra = id->p_encoder->fmt_out.i_extra;
- id->f_dst.p_extra = id->p_encoder->fmt_out.p_extra;
-
- /* 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' ) )
+ else if( i_video_drift > i_master_drift + 50000 )
{
- id->f_dst.i_codec = VLC_FOURCC( 'm','p','g','v' );
+#if 0
+ msg_Dbg( p_stream, "adding frame (%i)",
+ (int)(i_video_drift - i_master_drift) );
+#endif
+ i_duplicate = 2;
}
+ }
- if( !( id->id =
- p_stream->p_sys->p_out->pf_add( p_stream->p_sys->p_out,
- &id->f_dst ) ) )
+ if( !id->p_encoder->p_module )
+ {
+ if( transcode_video_encoder_open( p_stream, id ) != VLC_SUCCESS )
{
- 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 )
{
- p_block = id->p_encoder->pf_header( id->p_encoder );
- while( p_block )
+ 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, 0 );
+ if( id->pp_filter[id->i_filter]->p_module )
+ {
+ id->pp_filter[id->i_filter]->p_owner =
+ malloc( sizeof(filter_owner_sys_t) );
+ for( i = 0; i < PICTURE_RING_SIZE; i++ )
+ id->pp_filter[id->i_filter]->p_owner->pp_pics[i] = 0;
+ id->pp_filter[id->i_filter]->p_owner->p_sys = p_sys;
+
+ id->i_filter++;
+ }
+ else
{
- sout_buffer_t *p_out;
- block_t *p_prev_block = p_block;
-
- p_out = sout_BufferNew( p_stream->p_sout,
- p_block->i_buffer );
- memcpy( p_out->p_buffer, p_block->p_buffer,
- p_block->i_buffer);
- p_out->i_dts = p_out->i_pts = in->i_dts;
- p_out->i_length = 0;
- sout_BufferChain( out, p_out );
-
- p_block = p_block->p_next;
- block_Release( p_prev_block );
+ 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] );
}
}
- id->i_inter_pixfmt =
- get_ff_chroma( id->p_encoder->fmt_in.i_codec );
-
- id->b_enc_inited = VLC_TRUE;
- }
-
- /* deinterlace */
- if( p_stream->p_sys->b_deinterlace )
- {
- if( id->p_ff_pic_tmp0 == NULL )
+ /* Check if we need a filter for chroma conversion or resizing */
+ if( id->p_decoder->fmt_out.video.i_chroma !=
+ id->p_encoder->fmt_in.video.i_chroma ||
+ id->p_decoder->fmt_out.video.i_width !=
+ id->p_encoder->fmt_out.video.i_width ||
+ id->p_decoder->fmt_out.video.i_height !=
+ id->p_encoder->fmt_out.video.i_height ||
+ p_sys->i_crop_top > 0 || p_sys->i_crop_bottom > 0 ||
+ p_sys->i_crop_left > 0 || p_sys->i_crop_right > 0 )
{
- int 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 );
+ 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]->p_module =
+ module_Need( id->pp_filter[id->i_filter],
+ "video filter2", 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;
- avpicture_fill( (AVPicture*)id->p_ff_pic_tmp0, buf,
- id->i_inter_pixfmt,
- id->ff_dec_c->width, id->ff_dec_c->height );
+ 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;
+ }
}
- 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 );
+ for( i = 0; i < p_sys->i_vfilters; i++ )
+ {
+ id->pp_vfilter[id->i_vfilter] =
+ vlc_object_create( p_stream, VLC_OBJECT_FILTER );
+ vlc_object_attach( id->pp_vfilter[id->i_vfilter], p_stream );
+
+ id->pp_vfilter[id->i_vfilter]->pf_vout_buffer_new =
+ video_new_buffer_filter;
+ id->pp_vfilter[id->i_vfilter]->pf_vout_buffer_del =
+ video_del_buffer_filter;
+
+ id->pp_vfilter[id->i_vfilter]->fmt_in = id->p_encoder->fmt_in;
+ id->pp_vfilter[id->i_vfilter]->fmt_out = id->p_encoder->fmt_in;
+ id->pp_vfilter[id->i_vfilter]->p_cfg = p_sys->p_vfilters_cfg[i];
+ id->pp_vfilter[id->i_vfilter]->p_module =
+ module_Need( id->pp_vfilter[id->i_vfilter],
+ "video filter2", p_sys->psz_vfilters[i], 0 );
+ if( id->pp_vfilter[id->i_vfilter]->p_module )
+ {
+ id->pp_vfilter[id->i_vfilter]->p_owner =
+ malloc( sizeof(filter_owner_sys_t) );
+ for( i = 0; i < PICTURE_RING_SIZE; i++ )
+ id->pp_vfilter[id->i_vfilter]->p_owner->pp_pics[i] = 0;
+ id->pp_vfilter[id->i_vfilter]->p_owner->p_sys = p_sys;
-#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;
+ id->i_vfilter++;
+ }
+ else
+ {
+ msg_Dbg( p_stream, "no video filter found" );
+ vlc_object_detach( id->pp_vfilter[id->i_vfilter] );
+ vlc_object_destroy( id->pp_vfilter[id->i_vfilter] );
+ }
+ }
}
- /* convert pix format */
- if( id->ff_dec_c->pix_fmt != id->i_inter_pixfmt )
+ /* Run filter chain */
+ for( i = 0; i < id->i_filter; i++ )
{
- if( id->p_ff_pic_tmp1 == NULL )
- {
- 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 );
- }
+ p_pic = id->pp_filter[i]->pf_video_filter(id->pp_filter[i], p_pic);
+ }
- 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 );
+ /*
+ * Encoding
+ */
- 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;
+ /* Check if we have a subpicture to overlay */
+ if( p_sys->p_spu )
+ {
+ p_subpic = spu_SortSubpictures( p_sys->p_spu, p_pic->date );
+ /* TODO: get another pic */
}
- /* 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 )
+ /* Overlay subpicture */
+ if( p_subpic )
{
- 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 );
- }
+ int i_scale_width, i_scale_height;
+ video_format_t *p_fmt;
- img_resample( id->p_vresample, (AVPicture*)id->p_ff_pic_tmp2,
- (AVPicture*)frame );
+ 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;
- 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 );
-
- for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
- {
- p_pic->p[i_plane].i_pitch = frame->linesize[i_plane];
- if ( p_sys->i_threads >= 1 )
+ if( p_pic->i_refcount && !id->i_filter )
{
- 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 );
+ /* We can't modify the picture, we need to duplicate it */
+ picture_t *p_tmp = video_new_buffer_decoder( id->p_decoder );
+ if( p_tmp )
+ {
+ vout_CopyPicture( p_stream, p_tmp, p_pic );
+ p_pic->pf_release( p_pic );
+ p_pic = p_tmp;
+ }
}
+
+ if( id->i_filter )
+ p_fmt = &id->pp_filter[id->i_filter -1]->fmt_out.video;
else
- {
- p_pic->p[i_plane].p_pixels = frame->data[i_plane];
- }
- }
+ p_fmt = &id->p_decoder->fmt_out.video;
- /* Set the pts of the frame being encoded */
- p_pic->date = p_sys->i_output_pts;
+ /* 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;
- 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
+ spu_RenderSubpictures( p_sys->p_spu, p_fmt, p_pic, p_pic, p_subpic,
+ i_scale_width, i_scale_height );
+ }
- /* 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 )
+ /* Run vfilter chain */
+ for( i = 0; i < id->i_vfilter; i++ )
{
- 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_pic = id->pp_vfilter[i]->pf_video_filter(id->pp_vfilter[i], p_pic);
}
- if ( p_sys->i_threads >= 1 )
+ if( p_sys->i_threads >= 1 )
{
vlc_mutex_lock( &p_sys->lock_out );
p_sys->pp_pics[p_sys->i_last_pic++] = p_pic;
{
block_t *p_block;
p_block = id->p_encoder->pf_encode_video( id->p_encoder, p_pic );
- while( p_block )
+ block_ChainAppend( out, p_block );
+
+ if( p_sys->b_master_sync )
+ date_Increment( &id->interpolated_pts, 1 );
+
+ if( p_sys->b_master_sync && i_duplicate > 1 )
{
- sout_buffer_t *p_out;
- block_t *p_prev_block = p_block;
-
- p_out = sout_BufferNew( p_stream->p_sout, p_block->i_buffer );
- memcpy( p_out->p_buffer, p_block->p_buffer, p_block->i_buffer);
- p_out->i_dts = p_block->i_dts;
- p_out->i_pts = p_block->i_pts;
- p_out->i_length = p_block->i_length;
- p_out->i_flags =
- (p_block->i_flags << SOUT_BUFFER_FLAGS_BLOCK_SHIFT)
- & SOUT_BUFFER_FLAGS_BLOCK_MASK;
- sout_BufferChain( out, p_out );
-
- p_block = p_block->p_next;
- block_Release( p_prev_block );
+ mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
+ date_Increment( &id->interpolated_pts, 1 );
+ p_pic->date = i_pts;
+ p_block = id->p_encoder->pf_encode_video(id->p_encoder, p_pic);
+ block_ChainAppend( out, p_block );
}
- free( p_pic );
- }
- if( i_data <= 0 )
- {
- return VLC_SUCCESS;
+ p_pic->pf_release( p_pic );
}
}
return VLC_SUCCESS;
}
-static int EncoderThread( sout_stream_sys_t * p_sys )
+static int EncoderThread( sout_stream_sys_t *p_sys )
{
- sout_stream_t * p_stream = p_sys->p_out;
- sout_stream_id_t * id = p_sys->id_video;
- picture_t * p_pic;
- int i_plane;
- sout_buffer_t * p_buffer;
+ 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 );
- while( p_block )
+ block_ChainAppend( &p_sys->p_buffers, p_block );
+
+ if( p_sys->b_master_sync )
+ date_Increment( &id->interpolated_pts, 1 );
+
+#if 0
+ if( p_sys->b_master_sync && i_duplicate > 1 )
{
- sout_buffer_t *p_out;
- block_t *p_prev_block = p_block;
-
- p_out = sout_BufferNew( p_stream->p_sout, p_block->i_buffer );
- memcpy( p_out->p_buffer, p_block->p_buffer, p_block->i_buffer);
- p_out->i_dts = p_block->i_dts;
- p_out->i_pts = p_block->i_pts;
- p_out->i_length = p_block->i_length;
- p_out->i_flags =
- (p_block->i_flags << SOUT_BUFFER_FLAGS_BLOCK_SHIFT)
- & SOUT_BUFFER_FLAGS_BLOCK_MASK;
- sout_BufferChain( &p_sys->p_buffers, p_out );
-
- p_block = p_block->p_next;
- block_Release( p_prev_block );
+ mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
+ date_Increment( &id->interpolated_pts, 1 );
+ p_pic->date = i_pts;
+ p_block = id->p_encoder->pf_encode_video(id->p_encoder, p_pic);
+ block_ChainAppend( &p_sys->p_buffers, p_block );
}
+#endif
vlc_mutex_unlock( &p_sys->lock_out );
- 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 );
}
- 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++ )
+ p_pic->pf_release( p_pic );
+ }
+
+ block_ChainRelease( p_sys->p_buffers );
+
+ return 0;
+}
+
+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 )
+{
+ 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;
+ }
+
+ if( i == PICTURE_RING_SIZE && p_sys->i_threads >= 1 )
+ {
+ int i_first_pic = p_sys->i_first_pic;
+
+ if( p_sys->i_first_pic != p_sys->i_last_pic )
+ {
+ /* Encoder still has stuff to encode, wait to clear-up the list */
+ while( p_sys->i_first_pic == i_first_pic )
+ msleep( 100000 );
+ }
+
+ /* Find an empty space in the picture ring buffer */
+ for( i = 0; i < PICTURE_RING_SIZE; i++ )
+ {
+ if( pp_ring[i] != 0 && pp_ring[i]->i_status == DESTROYED_PICTURE )
+ {
+ pp_ring[i]->i_status = RESERVED_PICTURE;
+ return pp_ring[i];
+ }
+ }
+ for( i = 0; i < PICTURE_RING_SIZE; i++ )
+ {
+ if( pp_ring[i] == 0 ) break;
+ }
+ }
+
+ if( i == PICTURE_RING_SIZE )
+ {
+ msg_Err( p_this, "decoder/filter is leaking pictures, "
+ "resetting its ring buffer" );
+
+ for( i = 0; i < PICTURE_RING_SIZE; i++ )
{
- free( p_pic->p[i_plane].p_pixels );
+ pp_ring[i]->pf_release( pp_ring[i] );
}
+
+ i = 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 )
+ {
free( p_pic );
+ return 0;
+ }
+
+ 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 );
+}
+
+/*
+ * SPU
+ */
+static subpicture_t *spu_new_buffer( decoder_t * );
+static void spu_del_buffer( decoder_t *, subpicture_t * );
+
+static int transcode_spu_new( sout_stream_t *p_stream, sout_stream_id_t *id )
+{
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+
+ /*
+ * Open decoder
+ */
+
+ /* 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_owner = (decoder_owner_sys_t *)p_stream;
+ //id->p_decoder->p_cfg = p_sys->p_spu_cfg;
+
+ id->p_decoder->p_module =
+ module_Need( id->p_decoder, "decoder", "$codec", 0 );
+
+ if( !id->p_decoder->p_module )
+ {
+ msg_Err( p_stream, "cannot find decoder" );
+ return VLC_EGENERIC;
+ }
+
+ if( !p_sys->b_soverlay )
+ {
+ /*
+ * Open encoder
+ */
+
+ /* Initialization of encoder format structures */
+ es_format_Init( &id->p_encoder->fmt_in, id->p_decoder->fmt_in.i_cat,
+ id->p_decoder->fmt_in.i_codec );
+
+ id->p_encoder->p_cfg = p_sys->p_spu_cfg;
+
+ id->p_encoder->p_module =
+ module_Need( id->p_encoder, "encoder", p_sys->psz_senc, VLC_TRUE );
+
+ if( !id->p_encoder->p_module )
+ {
+ module_Unneed( id->p_decoder, id->p_decoder->p_module );
+ msg_Err( p_stream, "cannot find encoder" );
+ return VLC_EGENERIC;
+ }
}
- p_buffer = p_sys->p_buffers;
- while ( p_buffer != NULL )
+ if( !p_sys->p_spu )
{
- sout_buffer_t * p_next = p_buffer->p_next;
- sout_BufferDelete( p_stream->p_sout, p_buffer );
- p_buffer = p_next;
+ p_sys->p_spu = spu_Create( p_stream );
+ spu_Init( p_sys->p_spu );
}
- return 0;
+ return VLC_SUCCESS;
}
-/*****************************************************************************
- * 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)
+static void transcode_spu_close( sout_stream_t *p_stream, sout_stream_id_t *id)
+{
+ /* Close decoder */
+ if( id->p_decoder->p_module )
+ module_Unneed( id->p_decoder, id->p_decoder->p_module );
+
+ /* Close encoder */
+ 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,
+ sout_stream_id_t *id,
+ block_t *in, block_t **out )
{
- sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_context->opaque;
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+ subpicture_t *p_subpic;
+ *out = NULL;
+
+ p_subpic = id->p_decoder->pf_decode_sub( id->p_decoder, &in );
+ if( !p_subpic ) return VLC_EGENERIC;
+
+ 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_sys->b_soverlay )
+ {
+ spu_DisplaySubpicture( p_sys->p_spu, p_subpic );
+ }
+ else
+ {
+ block_t *p_block;
+
+ p_block = id->p_encoder->pf_encode_sub( id->p_encoder, p_subpic );
+ spu_del_buffer( id->p_decoder, p_subpic );
+
+ if( p_block )
+ {
+ block_ChainAppend( out, p_block );
+ return VLC_SUCCESS;
+ }
+ }
+
+ return VLC_EGENERIC;
+}
- /* Set PTS */
- p_frame->pts = p_sys->i_input_pts ? p_sys->i_input_pts : AV_NOPTS_VALUE;
+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 );
+}
- return avcodec_default_get_buffer( p_context, p_frame );
+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 );
}
projects / vlc / blobdiff