/*****************************************************************************
* transcode.c: transcoding stream output module
*****************************************************************************
- * Copyright (C) 2003-2004 VideoLAN
+ * Copyright (C) 2003-2004 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
+ * Jean-Paul Saman <jpsaman #_at_# m2x dot nl>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*****************************************************************************/
#include <stdlib.h>
#include <string.h>
+#include <math.h>
#include <vlc/vlc.h>
#include <vlc/input.h>
#include <vlc/vout.h>
#include <vlc/decoder.h>
#include "vlc_filter.h"
-#include "osd.h"
+#include "vlc_osd.h"
-/* ffmpeg header */
-#ifdef HAVE_FFMPEG_AVCODEC_H
-# include <ffmpeg/avcodec.h>
-#else
-# include <avcodec.h>
-#endif
-
-#if LIBAVCODEC_BUILD < 4704
-# define AV_NOPTS_VALUE 0
-#endif
+#define MASTER_SYNC_MAX_DRIFT 100000
/*****************************************************************************
* Module descriptor
#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 MAXWIDTH_TEXT N_("Maximum video width")
+#define MAXWIDTH_LONGTEXT N_( \
+ "Allows you to specify a maximum output video width." )
+#define MAXHEIGHT_TEXT N_("Maximum video height")
+#define MAXHEIGHT_LONGTEXT N_( \
+ "Allows you to specify a maximum 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_( \
#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 OSD_TEXT N_("OSD menu")
+#define OSD_LONGTEXT N_(\
+ "Enable streaming of the On Screen Display. It uses the osdmenu subfilter." )
+
#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"
+};
+
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
#define SOUT_CFG_PREFIX "sout-transcode-"
vlc_module_begin();
-#if defined(MODULE_NAME_is_stream_out_transcodealtivec) \
- || (defined(CAN_COMPILE_ALTIVEC) && !defined(NO_ALTIVEC_IN_FFMPEG))
- set_description( _("AltiVec transcode stream output") );
- add_requirement( ALTIVEC );
- set_capability( "sout stream", 51 );
-#else
+ set_shortname( _("Transcode"));
set_description( _("Transcode stream output") );
set_capability( "sout stream", 50 );
-#endif
add_shortcut( "transcode" );
set_callbacks( Open, Close );
-
+ set_category( CAT_SOUT );
+ set_subcategory( SUBCAT_SOUT_STREAM );
+ set_section( N_("Video"), NULL );
add_string( SOUT_CFG_PREFIX "venc", NULL, NULL, VENC_TEXT,
VENC_LONGTEXT, VLC_FALSE );
add_string( SOUT_CFG_PREFIX "vcodec", NULL, NULL, VCODEC_TEXT,
SCALE_LONGTEXT, VLC_FALSE );
add_float( SOUT_CFG_PREFIX "fps", 0, NULL, FPS_TEXT,
FPS_LONGTEXT, VLC_FALSE );
+ add_bool( SOUT_CFG_PREFIX "hurry-up", VLC_TRUE, NULL, HURRYUP_TEXT,
+ HURRYUP_LONGTEXT, VLC_FALSE );
add_bool( SOUT_CFG_PREFIX "deinterlace", 0, NULL, DEINTERLACE_TEXT,
DEINTERLACE_LONGTEXT, VLC_FALSE );
+ add_string( SOUT_CFG_PREFIX "deinterlace-module", "deinterlace", NULL,
+ DEINTERLACE_MODULE_TEXT, DEINTERLACE_MODULE_LONGTEXT,
+ VLC_FALSE );
+ change_string_list( ppsz_deinterlace_type, 0, 0 );
add_integer( SOUT_CFG_PREFIX "width", 0, NULL, WIDTH_TEXT,
WIDTH_LONGTEXT, VLC_TRUE );
add_integer( SOUT_CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT,
HEIGHT_LONGTEXT, VLC_TRUE );
+ add_integer( SOUT_CFG_PREFIX "maxwidth", 0, NULL, MAXWIDTH_TEXT,
+ MAXWIDTH_LONGTEXT, VLC_TRUE );
+ add_integer( SOUT_CFG_PREFIX "maxheight", 0, NULL, MAXHEIGHT_TEXT,
+ MAXHEIGHT_LONGTEXT, VLC_TRUE );
+ add_module_list_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 "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,
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_("On Screen Display"), NULL );
+ add_bool( SOUT_CFG_PREFIX "osd", 0, NULL, OSD_TEXT,
+ OSD_LONGTEXT, VLC_FALSE );
+
+ set_section( N_("Miscellaneous"), NULL );
add_integer( SOUT_CFG_PREFIX "threads", 0, NULL, THREADS_TEXT,
THREADS_LONGTEXT, VLC_TRUE );
+ add_bool( SOUT_CFG_PREFIX "high-priority", 0, NULL, HP_TEXT, HP_LONGTEXT,
+ VLC_TRUE );
- add_bool( SOUT_CFG_PREFIX "audio-sync", 0, NULL, ASYNC_TEXT,
- ASYNC_LONGTEXT, VLC_FALSE );
vlc_module_end();
static const char *ppsz_sout_options[] = {
"venc", "vcodec", "vb", "croptop", "cropbottom", "cropleft", "cropright",
- "scale", "fps", "width", "height", "deinterlace", "threads",
- "aenc", "acodec", "ab", "samplerate", "channels",
- "senc", "scodec", "soverlay",
- "audio-sync", NULL
+ "scale", "fps", "width", "height", "vfilter", "deinterlace",
+ "deinterlace-module", "threads", "hurry-up", "aenc", "acodec", "ab",
+ "samplerate", "channels", "senc", "scodec", "soverlay", "sfilter",
+ "osd", "audio-sync", "high-priority", "maxwidth", "maxheight", NULL
};
/*****************************************************************************
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 picture_t *video_new_buffer( decoder_t * );
-static void video_del_buffer( decoder_t *, picture_t * );
-static void video_link_picture( decoder_t *, picture_t * );
-static void video_unlink_picture( decoder_t *, picture_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 subpicture_t *transcode_spu_get( sout_stream_t *, sout_stream_id_t *,
- mtime_t );
+static int transcode_osd_new ( sout_stream_t *, sout_stream_id_t * );
+static void transcode_osd_close ( sout_stream_t *, sout_stream_id_t * );
+static int transcode_osd_process( sout_stream_t *, sout_stream_id_t *,
+ block_t *, block_t ** );
+
static int EncoderThread( struct sout_stream_sys_t * p_sys );
static int pi_channels_maps[6] =
int i_vbitrate;
double f_scale;
double f_fps;
- int i_width;
- int i_height;
+ unsigned int i_width, i_maxwidth;
+ unsigned int i_height, i_maxheight;
vlc_bool_t b_deinterlace;
+ char *psz_deinterlace;
+ sout_cfg_t *p_deinterlace_cfg;
int i_threads;
+ vlc_bool_t b_high_priority;
+ vlc_bool_t b_hurry_up;
+ char *psz_vfilters[10];
+ sout_cfg_t *p_vfilters_cfg[10];
+ int i_vfilters;
int i_crop_top;
int i_crop_bottom;
char *psz_senc;
vlc_bool_t b_soverlay;
sout_cfg_t *p_spu_cfg;
- subpicture_t *pp_subpics[SUBPICTURE_RING_SIZE];
-
- /* Filters */
- filter_t *p_filter_blend;
-
+ spu_t *p_spu;
+
+ /* OSD Menu */
+ sout_stream_id_t *id_osd; /* extension for streaming OSD menus */
+ vlc_fourcc_t i_osdcodec; /* codec osd menu (0 if not transcode) */
+ char *psz_osdenc;
+ sout_cfg_t *p_osd_cfg;
+ vlc_bool_t b_es_osd; /* VLC_TRUE when osd es is registered */
+ vlc_bool_t b_sout_osd;
+
/* Sync */
- vlc_bool_t b_audio_sync;
+ vlc_bool_t b_master_sync;
mtime_t i_master_drift;
};
+struct decoder_owner_sys_t
+{
+ picture_t *pp_pics[PICTURE_RING_SIZE];
+ sout_stream_sys_t *p_sys;
+};
+struct filter_owner_sys_t
+{
+ picture_t *pp_pics[PICTURE_RING_SIZE];
+ sout_stream_sys_t *p_sys;
+};
+
/*****************************************************************************
* Open:
*****************************************************************************/
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_stream_sys_t *p_sys;
vlc_value_t val;
- int i;
p_sys = vlc_object_create( p_this, sizeof( sout_stream_sys_t ) );
if( !p_sys->p_out )
{
msg_Err( p_stream, "cannot create chain" );
- free( p_sys );
+ vlc_object_destroy( p_sys );
return VLC_EGENERIC;
}
if( p_sys->i_acodec )
{
+ if( (strncmp( (char *)&p_sys->i_acodec, "mp3", 3) == 0) &&
+ (p_sys->i_channels > 2) )
+ {
+ msg_Warn( p_stream, "%d channels invalid for mp3, forcing to 2",
+ p_sys->i_channels );
+ p_sys->i_channels = 2;
+ }
msg_Dbg( p_stream, "codec audio=%4.4s %dHz %d channels %dKb/s",
(char *)&p_sys->i_acodec, p_sys->i_sample_rate,
p_sys->i_channels, p_sys->i_abitrate / 1000 );
var_Get( p_stream, SOUT_CFG_PREFIX "fps", &val );
p_sys->f_fps = val.f_float;
+ var_Get( p_stream, SOUT_CFG_PREFIX "hurry-up", &val );
+ p_sys->b_hurry_up = val.b_bool;
+
var_Get( p_stream, SOUT_CFG_PREFIX "width", &val );
p_sys->i_width = val.i_int;
var_Get( p_stream, SOUT_CFG_PREFIX "height", &val );
p_sys->i_height = val.i_int;
+ var_Get( p_stream, SOUT_CFG_PREFIX "maxwidth", &val );
+ p_sys->i_maxwidth = val.i_int;
+
+ var_Get( p_stream, SOUT_CFG_PREFIX "maxheight", &val );
+ p_sys->i_maxheight = val.i_int;
+
+ var_Get( p_stream, SOUT_CFG_PREFIX "vfilter", &val );
+ p_sys->i_vfilters = 0;
+ if( val.psz_string && *val.psz_string )
+ {
+ char *psz_parser = val.psz_string;
+
+ while( psz_parser != NULL && *psz_parser != '\0' )
+ {
+ 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 );
var_Get( p_stream, SOUT_CFG_PREFIX "threads", &val );
p_sys->i_threads = val.i_int;
+ var_Get( p_stream, SOUT_CFG_PREFIX "high-priority", &val );
+ p_sys->b_high_priority = val.b_bool;
if( p_sys->i_vcodec )
{
}
/* Subpictures transcoding parameters */
- var_Get( p_stream, SOUT_CFG_PREFIX "senc", &val );
+ p_sys->p_spu = NULL;
p_sys->psz_senc = NULL;
p_sys->p_spu_cfg = NULL;
+ p_sys->i_scodec = 0;
+
+ var_Get( p_stream, SOUT_CFG_PREFIX "senc", &val );
if( val.psz_string && *val.psz_string )
{
char *psz_next;
if( val.psz_string ) free( val.psz_string );
var_Get( p_stream, SOUT_CFG_PREFIX "scodec", &val );
- p_sys->i_scodec = 0;
if( val.psz_string && *val.psz_string )
{
char fcc[4] = " ";
if( p_sys->i_scodec )
{
- msg_Dbg( p_stream, "codec spu=%4.4s", (char *)&p_sys->i_acodec );
+ msg_Dbg( p_stream, "codec spu=%4.4s", (char *)&p_sys->i_scodec );
}
var_Get( p_stream, SOUT_CFG_PREFIX "soverlay", &val );
p_sys->b_soverlay = val.b_bool;
- p_sys->p_filter_blend = 0;
- for( i = 0; i < SUBPICTURE_RING_SIZE; i++ )
+ var_Get( p_stream, SOUT_CFG_PREFIX "sfilter", &val );
+ if( val.psz_string && *val.psz_string )
+ {
+ p_sys->p_spu = spu_Create( p_stream );
+ var_Create( p_sys->p_spu, "sub-filter", VLC_VAR_STRING );
+ var_Set( p_sys->p_spu, "sub-filter", val );
+ spu_Init( p_sys->p_spu );
+ }
+ if( val.psz_string ) free( val.psz_string );
+
+ /* OSD menu transcoding parameters */
+ p_sys->psz_osdenc = NULL;
+ p_sys->p_osd_cfg = NULL;
+ p_sys->i_osdcodec = 0;
+ p_sys->b_es_osd = VLC_FALSE;
+
+ var_Get( p_stream, SOUT_CFG_PREFIX "osd", &val );
+ p_sys->b_sout_osd = val.b_bool;
+ if( p_sys->b_sout_osd )
{
- p_sys->pp_subpics[i] = 0;
+ vlc_value_t osd_val;
+ char *psz_next;
+
+ psz_next = sout_CfgCreate( &p_sys->psz_osdenc,
+ &p_sys->p_osd_cfg, strdup( "dvbsub") );
+ if( psz_next ) free( psz_next );
+
+ p_sys->i_osdcodec = VLC_FOURCC('Y','U','V','P' );
+
+ msg_Dbg( p_stream, "codec osd=%4.4s", (char *)&p_sys->i_osdcodec );
+
+ if( !p_sys->p_spu )
+ {
+ osd_val.psz_string = strdup("osdmenu");
+ p_sys->p_spu = spu_Create( p_stream );
+ var_Create( p_sys->p_spu, "sub-filter", VLC_VAR_STRING );
+ var_Set( p_sys->p_spu, "sub-filter", osd_val );
+ spu_Init( p_sys->p_spu );
+ if( osd_val.psz_string ) free( osd_val.psz_string );
+ }
+ else
+ {
+ osd_val.psz_string = strdup("osdmenu");
+ var_Set( p_sys->p_spu, "sub-filter", osd_val );
+ if( osd_val.psz_string ) free( osd_val.psz_string );
+ }
}
+ /* Audio settings */
var_Get( p_stream, SOUT_CFG_PREFIX "audio-sync", &val );
- p_sys->b_audio_sync = val.b_bool;
- if( p_sys->f_fps > 0 ) p_sys->b_audio_sync = VLC_TRUE;
+ p_sys->b_master_sync = val.b_bool;
+ if( p_sys->f_fps > 0 ) p_sys->b_master_sync = VLC_TRUE;
p_stream->pf_add = Add;
p_stream->pf_del = Del;
p_stream->pf_send = Send;
p_stream->p_sys = p_sys;
- avcodec_init();
- avcodec_register_all();
-
return VLC_SUCCESS;
}
}
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->psz_senc ) free( p_sys->psz_senc );
- if( p_sys->p_filter_blend )
+ if( p_sys->p_spu ) spu_Destroy( p_sys->p_spu );
+
+ while( p_sys->p_osd_cfg != NULL )
{
- if( p_sys->p_filter_blend->p_module )
- module_Unneed( p_sys->p_filter_blend,
- p_sys->p_filter_blend->p_module );
+ sout_cfg_t *p_next = p_sys->p_osd_cfg->p_next;
- vlc_object_detach( p_sys->p_filter_blend );
- vlc_object_destroy( p_sys->p_filter_blend );
+ if( p_sys->p_osd_cfg->psz_name )
+ free( p_sys->p_osd_cfg->psz_name );
+ if( p_sys->p_osd_cfg->psz_value )
+ free( p_sys->p_osd_cfg->psz_value );
+ free( p_sys->p_osd_cfg );
+
+ p_sys->p_osd_cfg = p_next;
}
+ if( p_sys->psz_osdenc ) free( p_sys->psz_osdenc );
vlc_object_destroy( p_sys );
}
{
vlc_fourcc_t b_transcode;
- unsigned int i_inter_pixfmt; /* intermediary format when transcoding */
-
/* id of the out stream */
void *id;
/* Filters */
filter_t *pp_filter[10];
int i_filter;
+ filter_t *pp_vfilter[10];
+ int i_vfilter;
/* Encoder */
encoder_t *p_encoder;
- /* ffmpeg part */
- AVCodec *ff_dec;
- AVCodecContext *ff_dec_c;
-
- mtime_t i_dts;
- mtime_t i_length;
-
- int i_buffer;
- int i_buffer_pos;
- uint8_t *p_buffer;
-
- AVFrame *p_ff_pic;
- AVFrame *p_ff_pic_tmp0; /* to do deinterlace */
- AVFrame *p_ff_pic_tmp1; /* to do pix conversion */
- AVFrame *p_ff_pic_tmp2; /* to do resample */
- AVFrame *p_ff_pic_tmp3; /* to do subpicture overlay */
-
- ImgReSampleContext *p_vresample;
-
/* Sync */
date_t interpolated_pts;
- mtime_t i_initial_pts;
};
-
static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
vlc_object_attach( id->p_decoder, p_stream );
id->p_decoder->p_module = NULL;
id->p_decoder->fmt_in = *p_fmt;
- id->p_decoder->fmt_out = *p_fmt;
- id->p_decoder->fmt_out.i_extra = 0;
- id->p_decoder->fmt_out.p_extra = 0;
id->p_decoder->b_pace_control = VLC_TRUE;
/* Create encoder object */
id->p_encoder->fmt_out.i_codec = p_sys->i_acodec;
id->p_encoder->fmt_out.audio.i_rate = p_sys->i_sample_rate > 0 ?
p_sys->i_sample_rate : (int)p_fmt->audio.i_rate;
- id->p_encoder->fmt_out.audio.i_channels = p_sys->i_channels > 0 ?
- p_sys->i_channels : p_fmt->audio.i_channels;
id->p_encoder->fmt_out.i_bitrate = p_sys->i_abitrate;
id->p_encoder->fmt_out.audio.i_bitspersample =
p_fmt->audio.i_bitspersample;
+ id->p_encoder->fmt_out.audio.i_channels = p_sys->i_channels > 0 ?
+ p_sys->i_channels : p_fmt->audio.i_channels;
+ /* Sanity check for audio channels */
+ id->p_encoder->fmt_out.audio.i_channels =
+ __MIN( id->p_encoder->fmt_out.audio.i_channels,
+ id->p_decoder->fmt_in.audio.i_channels );
+ id->p_encoder->fmt_out.audio.i_original_channels =
+ id->p_decoder->fmt_in.audio.i_physical_channels;
+ if( id->p_decoder->fmt_in.audio.i_channels ==
+ id->p_encoder->fmt_out.audio.i_channels )
+ {
+ id->p_encoder->fmt_out.audio.i_physical_channels =
+ id->p_decoder->fmt_in.audio.i_physical_channels;
+ }
+ else
+ {
+ id->p_encoder->fmt_out.audio.i_physical_channels =
+ pi_channels_maps[id->p_encoder->fmt_out.audio.i_channels];
+ }
/* Build decoder -> filter -> encoder chain */
if( transcode_audio_new( p_stream, id ) )
if( p_sys->f_fps > 0 )
{
- id->p_encoder->fmt_out.video.i_frame_rate = p_sys->f_fps * 1000;
- id->p_encoder->fmt_out.video.i_frame_rate_base = 1000;
+ 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) )
if( !id->id ) goto error;
}
+ if( p_sys->b_sout_osd )
+ {
+ /* Create a fake OSD menu elementary stream */
+ if( !p_sys->b_es_osd && (p_sys->i_osdcodec != 0 || p_sys->psz_osdenc) )
+ {
+ if( transcode_osd_new( p_stream, p_sys->id_osd ) )
+ {
+ msg_Err( p_stream, "cannot create osd chain" );
+ goto error;
+ }
+ p_sys->b_es_osd = VLC_TRUE;
+ }
+ }
return id;
error:
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
+ if( p_sys->b_es_osd )
+ transcode_osd_close( p_stream, p_sys->id_osd );
+
if( id->b_transcode )
{
switch( id->p_decoder->fmt_in.i_cat )
block_t *p_buffer )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- block_t *p_out;
+ block_t *p_out = NULL;
if( !id->b_transcode && id->id )
{
+ /* Transcode OSD menu pictures. */
+ if( p_sys->b_es_osd )
+ {
+ transcode_osd_process( p_stream, id, p_buffer, &p_out );
+ }
return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer );
}
else if( !id->b_transcode )
{
case AUDIO_ES:
transcode_audio_process( p_stream, id, p_buffer, &p_out );
- block_Release( p_buffer );
break;
case VIDEO_ES:
break;
default:
+ p_out = NULL;
block_Release( p_buffer );
break;
}
}
/****************************************************************************
- * ffmpeg decoder reencoder part
+ * decoder reencoder part
****************************************************************************/
-static struct
+int audio_BitsPerSample( vlc_fourcc_t i_format )
{
- vlc_fourcc_t i_fcc;
- int i_ff_codec;
+ 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;
+ }
-} 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 },
-
- { VLC_FOURCC( 0, 0, 0, 0 ), 0 }
-};
+ return 0;
+}
-static inline int get_ff_codec( vlc_fourcc_t i_fcc )
+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;
+ filter_t *p_filter = vlc_object_create( p_stream, VLC_OBJECT_FILTER );
+
+ vlc_object_attach( p_filter, p_stream );
+ p_filter->pf_audio_buffer_new = (block_t* (*) (filter_t*, int))__block_New;
- for( i = 0; fourcc_to_ff_code[i].i_fcc != 0; i++ )
+ p_filter->fmt_in = *p_fmt_in;
+ p_filter->fmt_out = *p_fmt_out;
+
+ p_filter->p_module = module_Need( p_filter, "audio filter2", 0, 0 );
+ if( p_filter->p_module )
{
- if( fourcc_to_ff_code[i].i_fcc == i_fcc )
- {
- return fourcc_to_ff_code[i].i_ff_codec;
- }
+ p_filter->fmt_out.audio.i_bitspersample =
+ audio_BitsPerSample( p_filter->fmt_out.i_codec );
+ *p_fmt_in = p_filter->fmt_out;
+ }
+ else
+ {
+ vlc_object_detach( p_filter );
+ vlc_object_destroy( p_filter );
+ p_filter = 0;
}
- return 0;
+ return p_filter;
}
static int transcode_audio_new( sout_stream_t *p_stream,
sout_stream_id_t *id )
{
- int i_ff_codec;
-
- if( id->p_decoder->fmt_in.i_codec == VLC_FOURCC('s','1','6','l') ||
- id->p_decoder->fmt_in.i_codec == VLC_FOURCC('s','1','6','b') ||
- id->p_decoder->fmt_in.i_codec == VLC_FOURCC('s','8',' ',' ') ||
- id->p_decoder->fmt_in.i_codec == VLC_FOURCC('u','8',' ',' ') )
- {
- id->ff_dec = NULL;
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+ es_format_t fmt_last;
+ int i_pass = 6;
- id->ff_dec_c = avcodec_alloc_context();
- id->ff_dec_c->sample_rate = id->p_decoder->fmt_in.audio.i_rate;
- id->ff_dec_c->channels = id->p_decoder->fmt_in.audio.i_channels;
- id->ff_dec_c->block_align = id->p_decoder->fmt_in.audio.i_blockalign;
- id->ff_dec_c->bit_rate = id->p_decoder->fmt_in.i_bitrate;
- }
- else
- {
- /* find decoder */
- i_ff_codec = get_ff_codec( id->p_decoder->fmt_in.i_codec );
- if( i_ff_codec == 0 )
- {
- msg_Err( p_stream, "cannot find decoder id" );
- return VLC_EGENERIC;
- }
+ /*
+ * Open decoder
+ */
- id->ff_dec = avcodec_find_decoder( i_ff_codec );
- if( !id->ff_dec )
- {
- msg_Err( p_stream, "cannot find decoder (avcodec)" );
- return VLC_EGENERIC;
- }
+ /* Initialization of decoder structures */
+ id->p_decoder->fmt_out = id->p_decoder->fmt_in;
+ id->p_decoder->fmt_out.i_extra = 0;
+ id->p_decoder->fmt_out.p_extra = 0;
+ id->p_decoder->pf_decode_audio = 0;
+ id->p_decoder->pf_aout_buffer_new = audio_new_buffer;
+ id->p_decoder->pf_aout_buffer_del = audio_del_buffer;
+ /* id->p_decoder->p_cfg = p_sys->p_audio_cfg; */
- id->ff_dec_c = avcodec_alloc_context();
- id->ff_dec_c->sample_rate = id->p_decoder->fmt_in.audio.i_rate;
- id->ff_dec_c->channels = id->p_decoder->fmt_in.audio.i_channels;
- id->ff_dec_c->block_align = id->p_decoder->fmt_in.audio.i_blockalign;
- id->ff_dec_c->bit_rate = id->p_decoder->fmt_in.i_bitrate;
+ id->p_decoder->p_module =
+ module_Need( id->p_decoder, "decoder", "$codec", 0 );
- id->ff_dec_c->extradata_size = id->p_decoder->fmt_in.i_extra;
- id->ff_dec_c->extradata = id->p_decoder->fmt_in.p_extra;
- if( avcodec_open( id->ff_dec_c, id->ff_dec ) )
- {
- msg_Err( p_stream, "cannot open decoder" );
- av_free( id->ff_dec_c );
- return VLC_EGENERIC;
- }
+ 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 );
+ /*
+ * Open encoder
+ */
- /* 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 );
+ /* 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->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->p_encoder->fmt_out.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 = 16;
+ id->p_encoder->fmt_in.audio.i_bitspersample =
+ audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
id->p_encoder->p_cfg = p_stream->p_sys->p_audio_cfg;
id->p_encoder->p_module =
- module_Need( id->p_encoder, "encoder",
- p_stream->p_sys->psz_aenc, VLC_TRUE );
+ module_Need( id->p_encoder, "encoder", p_sys->psz_aenc, VLC_TRUE );
if( !id->p_encoder->p_module )
{
- vlc_object_detach( id->p_encoder );
- vlc_object_destroy( id->p_encoder );
- msg_Err( p_stream, "cannot open encoder" );
- av_free( id->ff_dec_c );
+ msg_Err( p_stream, "cannot find encoder" );
+ 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 );
+
+ /* Load conversion filters */
+ if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ||
+ fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate )
+ {
+ /* We'll have to go through fl32 first */
+ es_format_t fmt_out = id->p_encoder->fmt_in;
+ fmt_out.i_codec = fmt_out.audio.i_format = VLC_FOURCC('f','l','3','2');
+
+ id->pp_filter[id->i_filter] =
+ transcode_audio_filter_new( p_stream, id, &fmt_last, &fmt_out );
+
+ if( id->pp_filter[id->i_filter] ) id->i_filter++;
+ }
+
+ while( i_pass-- )
+ {
+ if( fmt_last.audio.i_channels !=
+ id->p_encoder->fmt_in.audio.i_channels ||
+ fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate ||
+ fmt_last.i_codec != id->p_encoder->fmt_in.i_codec )
+ {
+ id->pp_filter[id->i_filter] =
+ transcode_audio_filter_new( p_stream, id, &fmt_last,
+ &id->p_encoder->fmt_in );
+
+ if( id->pp_filter[id->i_filter] ) id->i_filter++;
+ else break;
+ }
+ }
+
+ /* Final checks to see if conversions were successful */
+ if( fmt_last.i_codec != id->p_encoder->fmt_in.i_codec )
+ {
+ msg_Err( p_stream, "no audio filter found (%4.4s->%4.4s)",
+ (char *)&fmt_last.i_codec,
+ (char *)&id->p_encoder->fmt_in.i_codec );
+ transcode_audio_close( p_stream, id );
+ return VLC_EGENERIC;
+ }
+
+ if( 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
+ transcode_audio_close( p_stream, id );
+ return VLC_EGENERIC;
+#endif
+ }
+
+ if( fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate )
+ {
+ msg_Err( p_stream, "no audio filter found for resampling from"
+ " %iHz to %iHz", fmt_last.audio.i_rate,
+ id->p_encoder->fmt_in.audio.i_rate );
+#if 0
+ /* FIXME : this might work, but only if the encoder is restarted */
+ id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;
+ id->p_encoder->fmt_out.audio.i_rate = fmt_last.audio.i_rate;
+#else
+ transcode_audio_close( p_stream, id );
return VLC_EGENERIC;
+#endif
}
/* FIXME: Hack for mp3 transcoding support */
static void transcode_audio_close( sout_stream_t *p_stream,
sout_stream_id_t *id )
{
- if( id->ff_dec ) avcodec_close( id->ff_dec_c );
- av_free( id->ff_dec_c );
+ int i;
- module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ /* Close decoder */
+ if( id->p_decoder->p_module )
+ module_Unneed( id->p_decoder, id->p_decoder->p_module );
+ id->p_decoder->p_module = 0;
- vlc_object_detach( id->p_encoder );
- vlc_object_destroy( id->p_encoder );
+ /* Close encoder */
+ if( id->p_encoder->p_module )
+ module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ id->p_encoder->p_module = 0;
- free( id->p_buffer );
+ /* 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] );
+ }
}
static int transcode_audio_process( sout_stream_t *p_stream,
block_t *in, block_t **out )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- aout_buffer_t aout_buf;
- block_t *p_block;
- int i_buffer = in->i_buffer;
- char *p_buffer = in->p_buffer;
- id->i_dts = in->i_dts;
+ aout_buffer_t *p_audio_buf;
+ block_t *p_block, *p_audio_block;
+ int i;
*out = NULL;
- while( i_buffer )
+ while( (p_audio_buf = id->p_decoder->pf_decode_audio( id->p_decoder,
+ &in )) )
{
- id->i_buffer_pos = 0;
-
- /* decode as much data as possible */
- if( id->ff_dec )
+ if( p_sys->b_master_sync )
{
- int i_used;
-
- i_used = avcodec_decode_audio( id->ff_dec_c,
- (int16_t*)id->p_buffer, &id->i_buffer_pos,
- p_buffer, i_buffer );
-
-#if 0
- msg_Warn( p_stream, "avcodec_decode_audio: %d used on %d",
- i_used, i_buffer );
-#endif
- if( i_used < 0 )
+ mtime_t i_dts = date_Get( &id->interpolated_pts ) + 1;
+ if ( p_audio_buf->start_date - i_dts > MASTER_SYNC_MAX_DRIFT
+ || p_audio_buf->start_date - i_dts < -MASTER_SYNC_MAX_DRIFT )
{
- msg_Warn( p_stream, "error audio decoding");
- break;
+ msg_Dbg( p_stream, "drift is too high, resetting master sync" );
+ date_Set( &id->interpolated_pts, p_audio_buf->start_date );
+ i_dts = p_audio_buf->start_date + 1;
}
+ p_sys->i_master_drift = p_audio_buf->start_date - i_dts;
+ date_Increment( &id->interpolated_pts, p_audio_buf->i_nb_samples );
+ p_audio_buf->start_date -= p_sys->i_master_drift;
+ p_audio_buf->end_date -= p_sys->i_master_drift;
+ }
- i_buffer -= i_used;
- p_buffer += i_used;
+ 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->i_buffer_pos < 0 )
- {
- msg_Warn( p_stream, "weird error audio decoding");
- break;
- }
- }
- else
+ /* Run filter chain */
+ for( i = 0; i < id->i_filter; i++ )
{
- int16_t *sout = (int16_t*)id->p_buffer;
- vlc_fourcc_t i_codec = id->p_decoder->fmt_in.i_codec;
-
- if( i_codec == VLC_FOURCC('s','8',' ',' ') ||
- 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( 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( i_codec == VLC_FOURCC('s','1','6','l') ||
- 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;
+ p_audio_block =
+ id->pp_filter[i]->pf_audio_filter( id->pp_filter[i],
+ p_audio_block );
+ }
- /* first copy */
- memcpy( sout, sin, i_used );
+ 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;
-#ifdef WORDS_BIGENDIAN
- if( i_codec == VLC_FOURCC('s','1','6','l') )
-#else
- if( i_codec == VLC_FOURCC('s','1','6','b') )
-#endif
- {
- uint8_t *dat = (uint8_t*)sout;
+ 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 );
+ }
- while( i_samples > 0 )
- {
- uint8_t tmp;
- tmp = dat[0];
- dat[0] = dat[1];
- dat[1] = tmp;
+ return VLC_SUCCESS;
+}
- dat += 2;
+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 );
+}
- i_samples--;
- }
- }
+static aout_buffer_t *audio_new_buffer( decoder_t *p_dec, int i_samples )
+{
+ aout_buffer_t *p_buffer;
+ block_t *p_block;
+ int i_size;
- i_buffer -= i_used;
- p_buffer += i_used;
- id->i_buffer_pos = i_used;
- }
- }
+ 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
+ {
+ i_size = i_samples * 4 * p_dec->fmt_out.audio.i_channels;
+ }
- if( id->i_buffer_pos == 0 ) continue;
+ 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 );
- 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->p_decoder->fmt_in.audio.i_channels;
- aout_buf.start_date = id->i_dts;
- aout_buf.end_date = id->i_dts;
+ 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( p_sys->b_audio_sync )
- {
- aout_buf.start_date = date_Get( &id->interpolated_pts ) + 1;
- p_sys->i_master_drift = id->i_dts - aout_buf.start_date;
- date_Increment( &id->interpolated_pts, aout_buf.i_nb_samples );
- }
+ return p_buffer;
+}
- id->i_dts += ( I64C(1000000) * id->i_buffer_pos / 2 /
- id->p_decoder->fmt_in.audio.i_channels /
- id->p_decoder->fmt_in.audio.i_rate );
+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 );
+}
- if( id->p_encoder->fmt_in.audio.i_channels == 1 &&
- id->p_decoder->fmt_in.audio.i_channels > 1 )
- {
- int16_t *p_sample = (int16_t *)aout_buf.p_buffer;
- int i_src_c = id->p_decoder->fmt_in.audio.i_channels;
- unsigned int i;
-
- for( i = 0; i < aout_buf.i_nb_samples; i++ )
- {
- int j, c = 0;
-
- for( j = 1; j < i_src_c; j++ )
- {
- c += p_sample[i_src_c * i + j];
- }
- p_sample[i] = c / (i_src_c-1);
- }
- aout_buf.i_nb_bytes = i * 2;
- }
- else if( id->p_encoder->fmt_in.audio.i_channels == 2 &&
- id->p_decoder->fmt_in.audio.i_channels > 2 )
- {
- int i_src_c = id->p_decoder->fmt_in.audio.i_channels;
- unsigned int i;
-
- static const float mixf_l[4][6] =/* [i_src_c - 3][channel index] */
- {
- { 0.00, 1.00, 0.00, 0.00, 0.00, 0.00 }, /* 3 channels */
- { 0.00, 0.50, 0.50, 0.00, 0.00, 0.00 }, /* 4 channels */
- { 0.00, 0.50, 0.00, 0.50, 0.00, 0.00 }, /* 5 channels */
- { 0.00, 0.34, 0.33, 0.00, 0.33, 0.00 }, /* 6 channels */
- };
- static const float mixf_r[4][6] =/* [i_src_c - 3][channel index] */
- {
- { 0.00, 1.00, 0.00, 0.00, 0.00, 0.00 }, /* 3 channels */
- { 0.00, 0.00, 0.50, 0.50, 0.00, 0.00 }, /* 4 channels */
- { 0.00, 0.00, 0.50, 0.00, 0.50, 0.00 }, /* 5 channels */
- { 0.00, 0.00, 0.33, 0.34, 0.00, 0.33 }, /* 6 channels */
- };
-
-
- for( i = 0; i < aout_buf.i_nb_samples; i++ )
- {
- int16_t *p_src = (int16_t *)aout_buf.p_buffer + i_src_c * i;
- int16_t *p_dst = (int16_t *)aout_buf.p_buffer + 2 * i;
-
- int j;
- float l = 0.0, r = 0.0;
- for( j = 0; j < i_src_c; j++ )
- {
- l += mixf_l[i_src_c-3][j] * p_src[j];
- r += mixf_r[i_src_c-3][j] * p_src[j];
- }
-
- p_dst[0] = (int)( l + 0.5 );
- p_dst[1] = (int)( r + 0.5 );
- }
- aout_buf.i_nb_bytes = i * 2 * 2;
- }
- else if( id->p_decoder->fmt_in.audio.i_channels !=
- id->p_encoder->fmt_in.audio.i_channels )
- {
- unsigned int i;
- int j;
-
- /* This is for liba52 which is what ffmpeg uses to decode ac3 */
- static const int translation[7][6] =
- {{ 0, 0, 0, 0, 0, 0 }, /* 0 channels (rarely used) */
- { 0, 0, 0, 0, 0, 0 }, /* 1 ch */
- { 0, 1, 0, 0, 0, 0 }, /* 2 */
- { 1, 2, 0, 0, 0, 0 }, /* 3 */
- { 1, 3, 2, 0, 0, 0 }, /* 4 */
- { 1, 3, 4, 2, 0, 0 }, /* 5 */
- { 1, 3, 4, 5, 2, 0 }}; /* 6 */
-
- /* dumb downmixing */
- for( i = 0; i < aout_buf.i_nb_samples; i++ )
- {
- uint16_t *p_buffer = (uint16_t *)aout_buf.p_buffer;
- for( j = 0 ; j < id->p_encoder->fmt_in.audio.i_channels; j++ )
- {
- p_buffer[i*id->p_encoder->fmt_in.audio.i_channels+j] =
- p_buffer[i*id->p_decoder->fmt_in.audio.i_channels +
- translation[id->p_decoder->fmt_in.audio.i_channels][j]];
- }
- }
- aout_buf.i_nb_bytes = i*id->p_encoder->fmt_in.audio.i_channels * 2;
- }
-
- p_block = id->p_encoder->pf_encode_audio( id->p_encoder, &aout_buf );
- block_ChainAppend( out, p_block );
- }
-
- return VLC_SUCCESS;
-}
-
-
-/*
- * 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;
+/*
+ * 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;
- id->p_decoder->pf_vout_buffer_del = video_del_buffer;
- id->p_decoder->pf_picture_link = video_link_picture;
- id->p_decoder->pf_picture_unlink = video_unlink_picture;
- //id->p_decoder->p_cfg = p_sys->p_video_cfg;
+ 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( p_sys->i_threads >= 1 )
{
+ int i_priority = p_sys->b_high_priority ? VLC_THREAD_PRIORITY_OUTPUT :
+ VLC_THREAD_PRIORITY_VIDEO;
p_sys->id_video = id;
vlc_mutex_init( p_stream, &p_sys->lock_out );
vlc_cond_init( p_stream, &p_sys->cond );
p_sys->i_last_pic = 0;
p_sys->p_buffers = NULL;
p_sys->b_die = p_sys->b_error = 0;
- if( vlc_thread_create( p_sys, "encoder", EncoderThread,
- VLC_THREAD_PRIORITY_VIDEO, VLC_FALSE ) )
+ if( vlc_thread_create( p_sys, "encoder", EncoderThread, i_priority,
+ VLC_FALSE ) )
{
msg_Err( p_stream, "cannot spawn encoder thread" );
module_Unneed( id->p_decoder, id->p_decoder->p_module );
id->p_encoder->fmt_out.video.i_height / (double)i_height * i_width;
}
+ if( p_sys->i_maxwidth
+ && id->p_encoder->fmt_out.video.i_width > p_sys->i_maxwidth )
+ id->p_encoder->fmt_out.video.i_width = p_sys->i_maxwidth;
+ if( p_sys->i_maxheight
+ && id->p_encoder->fmt_out.video.i_height > p_sys->i_maxheight )
+ id->p_encoder->fmt_out.video.i_height = p_sys->i_maxheight;
+
+ /* Make sure the size is at least a multiple of 2 */
+ id->p_encoder->fmt_out.video.i_width =
+ (id->p_encoder->fmt_out.video.i_width + 1) >> 1 << 1;
+ id->p_encoder->fmt_out.video.i_height =
+ (id->p_encoder->fmt_out.video.i_height + 1) >> 1 << 1;
+
id->p_encoder->fmt_in.video.i_width =
id->p_encoder->fmt_out.video.i_width;
id->p_encoder->fmt_in.video.i_height =
static void transcode_video_close( sout_stream_t *p_stream,
sout_stream_id_t *id )
{
- int i;
+ int i, j;
if( p_stream->p_sys->i_threads >= 1 )
{
if( id->p_decoder->p_module )
module_Unneed( id->p_decoder, id->p_decoder->p_module );
+ if( id->p_decoder->p_owner )
+ {
+ /* Clean-up pictures ring buffer */
+ for( i = 0; i < PICTURE_RING_SIZE; i++ )
+ {
+ 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 );
+ }
+
/* Close encoder */
if( id->p_encoder->p_module )
module_Unneed( id->p_encoder, id->p_encoder->p_module );
vlc_object_detach( id->pp_filter[i] );
if( id->pp_filter[i]->p_module )
module_Unneed( id->pp_filter[i], id->pp_filter[i]->p_module );
+
+ /* Clean-up pictures ring buffer */
+ for( j = 0; j < PICTURE_RING_SIZE; j++ )
+ {
+ if( id->pp_filter[i]->p_owner->pp_pics[j] )
+ video_del_buffer( VLC_OBJECT(id->pp_filter[i]),
+ id->pp_filter[i]->p_owner->pp_pics[j] );
+ }
+ free( id->pp_filter[i]->p_owner );
+
vlc_object_destroy( id->pp_filter[i] );
}
+ 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++ )
+ {
+ 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_sys_t *p_sys = p_stream->p_sys;
int i_duplicate = 1, i;
- picture_t *p_pic;
+ picture_t *p_pic, *p_pic2 = NULL;
*out = NULL;
while( (p_pic = id->p_decoder->pf_decode_video( id->p_decoder, &in )) )
{
subpicture_t *p_subpic = 0;
- if( p_sys->b_audio_sync )
+ if( p_stream->p_sout->i_out_pace_nocontrol && p_sys->b_hurry_up )
+ {
+ mtime_t current_date = mdate();
+ if( current_date + 50000 > p_pic->date )
+ {
+ msg_Dbg( p_stream, "late picture skipped ("I64Fd")",
+ current_date + 50000 - p_pic->date );
+ p_pic->pf_release( p_pic );
+ continue;
+ }
+ }
+
+ if( p_sys->b_master_sync )
{
mtime_t i_video_drift;
mtime_t i_master_drift = p_sys->i_master_drift;
mtime_t i_pts;
- if( !id->i_initial_pts ) id->i_initial_pts = p_pic->date;
-
- if( !i_master_drift )
+ i_pts = date_Get( &id->interpolated_pts ) + 1;
+ if ( p_pic->date - i_pts > MASTER_SYNC_MAX_DRIFT
+ || p_pic->date - i_pts < -MASTER_SYNC_MAX_DRIFT )
{
- /* No audio track ? */
- i_master_drift = id->i_initial_pts;
+ msg_Dbg( p_stream, "drift is too high, resetting master sync" );
+ date_Set( &id->interpolated_pts, p_pic->date );
+ i_pts = p_pic->date + 1;
}
-
- i_pts = date_Get( &id->interpolated_pts ) + 1;
i_video_drift = p_pic->date - i_pts;
i_duplicate = 1;
if( i_video_drift < i_master_drift - 50000 )
{
+#if 0
msg_Dbg( p_stream, "dropping frame (%i)",
(int)(i_video_drift - i_master_drift) );
- return VLC_EGENERIC;
+#endif
+ p_pic->pf_release( p_pic );
+ continue;
}
else if( i_video_drift > i_master_drift + 50000 )
{
+#if 0
msg_Dbg( p_stream, "adding frame (%i)",
(int)(i_video_drift - i_master_drift) );
+#endif
i_duplicate = 2;
}
-
- date_Increment( &id->interpolated_pts, 1 );
}
if( !id->p_encoder->p_module )
{
if( transcode_video_encoder_open( p_stream, id ) != VLC_SUCCESS )
{
+ p_pic->pf_release( p_pic );
transcode_video_close( p_stream, id );
id->b_transcode = VLC_FALSE;
+ return VLC_EGENERIC;
+ }
+
+ /* Deinterlace */
+ if( p_stream->p_sys->b_deinterlace )
+ {
+ id->pp_filter[id->i_filter] =
+ vlc_object_create( p_stream, VLC_OBJECT_FILTER );
+ vlc_object_attach( id->pp_filter[id->i_filter], p_stream );
+
+ id->pp_filter[id->i_filter]->pf_vout_buffer_new =
+ video_new_buffer_filter;
+ id->pp_filter[id->i_filter]->pf_vout_buffer_del =
+ video_del_buffer_filter;
+
+ id->pp_filter[id->i_filter]->fmt_in = id->p_decoder->fmt_out;
+ id->pp_filter[id->i_filter]->fmt_out = id->p_decoder->fmt_out;
+ id->pp_filter[id->i_filter]->p_cfg = p_sys->p_deinterlace_cfg;
+ id->pp_filter[id->i_filter]->p_module =
+ module_Need( id->pp_filter[id->i_filter],
+ "video filter2", p_sys->psz_deinterlace, 0 );
+ if( id->pp_filter[id->i_filter]->p_module )
+ {
+ id->pp_filter[id->i_filter]->p_owner =
+ malloc( sizeof(filter_owner_sys_t) );
+ for( i = 0; i < PICTURE_RING_SIZE; i++ )
+ id->pp_filter[id->i_filter]->p_owner->pp_pics[i] = 0;
+ id->pp_filter[id->i_filter]->p_owner->p_sys = p_sys;
+
+ id->i_filter++;
+ }
+ else
+ {
+ msg_Dbg( p_stream, "no video filter found" );
+ vlc_object_detach( id->pp_filter[id->i_filter] );
+ vlc_object_destroy( id->pp_filter[id->i_filter] );
+ }
}
/* Check if we need a filter for chroma conversion or resizing */
p_sys->i_crop_top > 0 || p_sys->i_crop_bottom > 0 ||
p_sys->i_crop_left > 0 || p_sys->i_crop_right > 0 )
{
- id->pp_filter[0] =
+ id->pp_filter[id->i_filter] =
vlc_object_create( p_stream, VLC_OBJECT_FILTER );
- vlc_object_attach( id->pp_filter[0], p_stream );
-
- id->pp_filter[0]->pf_vout_buffer_new = video_new_buffer;
- id->pp_filter[0]->pf_vout_buffer_del = video_del_buffer;
+ 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;
- id->pp_filter[0]->fmt_in = id->p_decoder->fmt_out;
- id->pp_filter[0]->fmt_out = id->p_encoder->fmt_in;
- id->pp_filter[0]->p_module =
- module_Need( id->pp_filter[0], "video filter2", 0, 0 );
- if( id->pp_filter[0]->p_module ) id->i_filter++;
+ id->i_filter++;
+ }
else
{
msg_Dbg( p_stream, "no video filter found" );
- vlc_object_detach( id->pp_filter[0] );
- vlc_object_destroy( id->pp_filter[0] );
+ 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;
}
}
- }
- /* Deinterlace */
- if( p_stream->p_sys->b_deinterlace )
- {
+ 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;
+
+ 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] );
+ }
+ }
}
/* Run filter chain */
*/
/* Check if we have a subpicture to overlay */
- if( p_sys->p_filter_blend )
+ if( p_sys->p_spu )
{
- p_subpic = transcode_spu_get( p_stream, id, p_pic->date );
+ p_subpic = spu_SortSubpictures( p_sys->p_spu, p_pic->date );
/* TODO: get another pic */
}
/* Overlay subpicture */
if( p_subpic )
{
- int i_width, i_height;
+ int i_scale_width, i_scale_height;
+ video_format_t *p_fmt;
- p_sys->p_filter_blend->fmt_out = id->p_encoder->fmt_in;
- p_sys->p_filter_blend->fmt_out.video.i_visible_width =
- p_sys->p_filter_blend->fmt_out.video.i_width;
- p_sys->p_filter_blend->fmt_out.video.i_visible_height =
- p_sys->p_filter_blend->fmt_out.video.i_height;
- p_sys->p_filter_blend->fmt_out.video.i_chroma =
- VLC_FOURCC('I','4','2','0');
+ 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;
- i_width = id->p_encoder->fmt_in.video.i_width;
- i_height = id->p_encoder->fmt_in.video.i_height;
-
- while( p_subpic != NULL )
+ if( p_pic->i_refcount && !id->i_filter )
{
- subpicture_region_t *p_region = p_subpic->p_region;
-
- while( p_region && p_sys->p_filter_blend &&
- p_sys->p_filter_blend->pf_video_blend )
+ /* We can't modify the picture, we need to duplicate it */
+ picture_t *p_tmp = video_new_buffer_decoder( id->p_decoder );
+ if( p_tmp )
{
- int i_x_offset = p_region->i_x + p_subpic->i_x;
- int i_y_offset = p_region->i_y + p_subpic->i_y;
-
- if( p_subpic->i_flags & OSD_ALIGN_BOTTOM )
- {
- i_y_offset = i_height - p_region->fmt.i_height -
- p_subpic->i_y;
- }
- else if ( !(p_subpic->i_flags & OSD_ALIGN_TOP) )
- {
- i_y_offset = i_height / 2 - p_region->fmt.i_height / 2;
- }
-
- if( p_subpic->i_flags & OSD_ALIGN_RIGHT )
- {
- i_x_offset = i_width - p_region->fmt.i_width -
- p_subpic->i_x;
- }
- else if ( !(p_subpic->i_flags & OSD_ALIGN_LEFT) )
- {
- i_x_offset = i_width / 2 - p_region->fmt.i_width / 2;
- }
-
- if( p_subpic->b_absolute )
- {
- i_x_offset = p_region->i_x + p_subpic->i_x;
- i_y_offset = p_region->i_y + p_subpic->i_y;
- }
-
- p_sys->p_filter_blend->fmt_in.video = p_region->fmt;
-
- p_sys->p_filter_blend->pf_video_blend(
- p_sys->p_filter_blend, p_pic, p_pic,
- &p_region->picture, i_x_offset, i_y_offset );
-
- p_region = p_region->p_next;
+ vout_CopyPicture( p_stream, p_tmp, p_pic );
+ p_pic->pf_release( p_pic );
+ p_pic = p_tmp;
}
-
- p_subpic = p_subpic->p_next;
}
+
+ if( id->i_filter )
+ p_fmt = &id->pp_filter[id->i_filter -1]->fmt_out.video;
+ else
+ p_fmt = &id->p_decoder->fmt_out.video;
+
+ /* FIXME (shouldn't have to be done here) */
+ p_fmt->i_sar_num = p_fmt->i_aspect *
+ p_fmt->i_height / p_fmt->i_width;
+ p_fmt->i_sar_den = VOUT_ASPECT_FACTOR;
+
+ spu_RenderSubpictures( p_sys->p_spu, p_fmt, p_pic, p_pic, p_subpic,
+ i_scale_width, i_scale_height );
}
- if( p_sys->i_threads >= 1 )
+ /* Run vfilter chain */
+ for( i = 0; i < id->i_vfilter; i++ )
{
- vlc_mutex_lock( &p_sys->lock_out );
- p_sys->pp_pics[p_sys->i_last_pic++] = p_pic;
- p_sys->i_last_pic %= PICTURE_RING_SIZE;
- *out = p_sys->p_buffers;
- p_sys->p_buffers = NULL;
- vlc_cond_signal( &p_sys->cond );
- vlc_mutex_unlock( &p_sys->lock_out );
+ p_pic = id->pp_vfilter[i]->pf_video_filter(id->pp_vfilter[i], p_pic);
}
- else
+
+ if( p_sys->i_threads == 0 )
{
block_t *p_block;
p_block = id->p_encoder->pf_encode_video( id->p_encoder, p_pic );
block_ChainAppend( out, p_block );
+ }
+
+ if( p_sys->b_master_sync )
+ {
+ mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
+ if ( p_pic->date - i_pts > MASTER_SYNC_MAX_DRIFT
+ || p_pic->date - i_pts < -MASTER_SYNC_MAX_DRIFT )
+ {
+ msg_Dbg( p_stream, "drift is too high, resetting master sync" );
+ date_Set( &id->interpolated_pts, p_pic->date );
+ i_pts = p_pic->date + 1;
+ }
+ date_Increment( &id->interpolated_pts, 1 );
+ }
+
+ if( p_sys->b_master_sync && i_duplicate > 1 )
+ {
+ mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
+ if ( p_pic->date - i_pts > MASTER_SYNC_MAX_DRIFT
+ || p_pic->date - i_pts < -MASTER_SYNC_MAX_DRIFT )
+ {
+ msg_Dbg( p_stream, "drift is too high, resetting master sync" );
+ date_Set( &id->interpolated_pts, p_pic->date );
+ i_pts = p_pic->date + 1;
+ }
+ date_Increment( &id->interpolated_pts, 1 );
- if( p_sys->b_audio_sync && i_duplicate > 1 )
+ if( p_sys->i_threads >= 1 )
+ {
+ /* We can't modify the picture, we need to duplicate it */
+ p_pic2 = video_new_buffer_decoder( id->p_decoder );
+ if( p_pic2 != NULL )
+ {
+ vout_CopyPicture( p_stream, p_pic2, p_pic );
+ p_pic2->date = i_pts;
+ }
+ }
+ else
{
- mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
- date_Increment( &id->interpolated_pts, 1 );
+ block_t *p_block;
p_pic->date = i_pts;
p_block = id->p_encoder->pf_encode_video(id->p_encoder, p_pic);
block_ChainAppend( out, p_block );
}
+ }
+ if( p_sys->i_threads == 0 )
+ {
p_pic->pf_release( p_pic );
}
+ else
+ {
+ vlc_mutex_lock( &p_sys->lock_out );
+ p_sys->pp_pics[p_sys->i_last_pic++] = p_pic;
+ p_sys->i_last_pic %= PICTURE_RING_SIZE;
+ *out = p_sys->p_buffers;
+ p_sys->p_buffers = NULL;
+ if( p_pic2 != NULL )
+ {
+ p_sys->pp_pics[p_sys->i_last_pic++] = p_pic2;
+ p_sys->i_last_pic %= PICTURE_RING_SIZE;
+ }
+ vlc_cond_signal( &p_sys->cond );
+ vlc_mutex_unlock( &p_sys->lock_out );
+ }
+
}
return VLC_SUCCESS;
{
sout_stream_id_t *id = p_sys->id_video;
picture_t *p_pic;
- int i_plane;
while( !p_sys->b_die && !p_sys->b_error )
{
p_block = id->p_encoder->pf_encode_video( id->p_encoder, p_pic );
vlc_mutex_lock( &p_sys->lock_out );
block_ChainAppend( &p_sys->p_buffers, p_block );
+
vlc_mutex_unlock( &p_sys->lock_out );
- for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
- {
- free( p_pic->p[i_plane].p_pixels );
- }
- free( p_pic );
+ p_pic->pf_release( p_pic );
}
while( p_sys->i_last_pic != p_sys->i_first_pic )
p_pic = p_sys->pp_pics[p_sys->i_first_pic++];
p_sys->i_first_pic %= PICTURE_RING_SIZE;
- for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
- {
- free( p_pic->p[i_plane].p_pixels );
- }
- free( p_pic );
+ p_pic->pf_release( p_pic );
}
block_ChainRelease( p_sys->p_buffers );
struct picture_sys_t
{
- decoder_t *p_dec;
+ 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( p_pic->p_sys->p_dec, p_pic );
+ 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( decoder_t *p_dec )
+static picture_t *video_new_buffer( vlc_object_t *p_this, picture_t **pp_ring,
+ sout_stream_sys_t *p_sys )
{
- picture_t *p_pic = malloc( sizeof(picture_t) );
+ 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++ )
+ {
+ 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_pic->pf_release = video_release_buffer;
p_pic->p_sys = malloc( sizeof(picture_sys_t) );
- p_pic->p_sys->p_dec = p_dec;
+ p_pic->p_sys->p_owner = p_this;
+ p_pic->i_status = RESERVED_PICTURE;
+
+ pp_ring[i] = p_pic;
return p_pic;
}
-static void video_del_buffer( decoder_t *p_dec, picture_t *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 ) free( p_pic->p_data );
+ 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_link_picture( decoder_t *p_dec, picture_t *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_t *p_dec, picture_t *p_pic )
+static void video_unlink_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
{
video_release_buffer( p_pic );
}
/* Initialization of decoder structures */
id->p_decoder->pf_spu_buffer_new = spu_new_buffer;
id->p_decoder->pf_spu_buffer_del = spu_del_buffer;
- //id->p_decoder->p_cfg = p_sys->p_spu_cfg;
+ 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 );
return VLC_EGENERIC;
}
}
- else
+
+ if( !p_sys->p_spu )
{
- p_sys->p_filter_blend =
- vlc_object_create( p_stream, VLC_OBJECT_FILTER );
- vlc_object_attach( p_sys->p_filter_blend, p_stream );
- p_sys->p_filter_blend->fmt_out.video.i_chroma =
- VLC_FOURCC('I','4','2','0');
- p_sys->p_filter_blend->fmt_in.video.i_chroma =
- VLC_FOURCC('Y','U','V','A');
- p_sys->p_filter_blend->p_module =
- module_Need( p_sys->p_filter_blend, "video blending", 0, 0 );
+ p_sys->p_spu = spu_Create( p_stream );
+ spu_Init( p_sys->p_spu );
}
return VLC_SUCCESS;
static void transcode_spu_close( sout_stream_t *p_stream, sout_stream_id_t *id)
{
- sout_stream_sys_t *p_sys = p_stream->p_sys;
- int i;
-
/* Close decoder */
if( id->p_decoder->p_module )
module_Unneed( id->p_decoder, id->p_decoder->p_module );
/* Close encoder */
if( id->p_encoder->p_module )
module_Unneed( id->p_encoder, id->p_encoder->p_module );
-
- /* Free subpictures */
- for( i = 0; i < SUBPICTURE_RING_SIZE; i++ )
- {
- if( !p_sys->pp_subpics[i] ) continue;
-
- spu_del_buffer( id->p_decoder, p_sys->pp_subpics[i] );
- p_sys->pp_subpics[i] = NULL;
- }
}
static int transcode_spu_process( sout_stream_t *p_stream,
*out = NULL;
p_subpic = id->p_decoder->pf_decode_sub( id->p_decoder, &in );
- if( p_subpic && p_sys->b_soverlay )
- {
- int i;
+ if( !p_subpic ) return VLC_EGENERIC;
- /* Find a free slot in our supictures ring buffer */
- for( i = 0; i < SUBPICTURE_RING_SIZE; i++ )
- {
- if( !p_sys->pp_subpics[i] )
- {
- p_sys->pp_subpics[i] = p_subpic;
- break;
- }
- }
- if( i == SUBPICTURE_RING_SIZE )
- {
- spu_del_buffer( id->p_decoder, p_subpic );
- }
+ if( p_sys->b_master_sync && p_sys->i_master_drift )
+ {
+ p_subpic->i_start -= p_sys->i_master_drift;
+ if( p_subpic->i_stop ) p_subpic->i_stop -= p_sys->i_master_drift;
}
- if( p_subpic && !p_sys->b_soverlay )
+ if( p_sys->b_soverlay )
+ {
+ spu_DisplaySubpicture( p_sys->p_spu, p_subpic );
+ }
+ else
{
block_t *p_block;
return VLC_EGENERIC;
}
-static subpicture_t *transcode_spu_get( sout_stream_t *p_stream,
- sout_stream_id_t *id,
- mtime_t display_date )
+static subpicture_t *spu_new_buffer( decoder_t *p_dec )
+{
+ sout_stream_t *p_stream = (sout_stream_t *)p_dec->p_owner;
+ return spu_CreateSubpicture( p_stream->p_sys->p_spu );
+}
+
+static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_subpic )
+{
+ sout_stream_t *p_stream = (sout_stream_t *)p_dec->p_owner;
+ spu_DestroySubpicture( p_stream->p_sys->p_spu, p_subpic );
+}
+
+/*
+ * OSD menu
+ */
+static int transcode_osd_new( sout_stream_t *p_stream, sout_stream_id_t *id )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- subpicture_t *p_subpic = 0;
- subpicture_t *p_ephemer = 0;
- subpicture_t **pp_subpic = &p_subpic;
- int i;
+ es_format_t fmt;
+
+ fmt.i_cat = SPU_ES;
+ fmt.i_id = 0xbd1f; /* pid ?? */
+ fmt.i_group = 3; /* pmt entry ?? */
+ fmt.i_codec = VLC_FOURCC( 'Y', 'U', 'V', 'A' );
+ fmt.psz_language = strdup( "osd" );
+
+ id = malloc( sizeof( sout_stream_id_t ) );
+ memset( id, 0, sizeof(sout_stream_id_t) );
- /* Find current subpictures and remove old ones */
- for( i = 0; i < SUBPICTURE_RING_SIZE; i++ )
+ id->id = NULL;
+ id->p_decoder = NULL;
+ id->p_encoder = NULL;
+
+ /* Create encoder object */
+ id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
+ if( !id->p_encoder )
{
- if( !p_sys->pp_subpics[i] ) continue;
+ msg_Err( p_stream, "out of memory" );
+ goto error;
+ }
+ vlc_object_attach( id->p_encoder, p_stream );
+ id->p_encoder->p_module = NULL;
- if( !p_sys->pp_subpics[i]->b_ephemer &&
- p_sys->pp_subpics[i]->i_stop < display_date )
- {
- spu_del_buffer( id->p_decoder, p_sys->pp_subpics[i] );
- p_sys->pp_subpics[i] = NULL;
- continue;
- }
+ /* Create fake destination format */
+ es_format_Init( &id->p_encoder->fmt_out, fmt.i_cat, 0 );
+ id->p_encoder->fmt_out.i_id = fmt.i_id;
+ id->p_encoder->fmt_out.i_group = fmt.i_group;
+ id->p_encoder->fmt_out.psz_language = strdup( fmt.psz_language );
+
+ if( p_sys->i_osdcodec != 0 || p_sys->psz_osdenc )
+ {
+ msg_Dbg( p_stream, "creating osdmenu transcoding from fcc=`%4.4s' "
+ "to fcc=`%4.4s'", (char*)&fmt.i_codec,
+ (char*)&p_sys->i_osdcodec );
- if( p_sys->pp_subpics[i]->i_start > display_date ) continue;
+ /* Complete destination format */
+ id->p_encoder->fmt_out.i_codec = p_sys->i_osdcodec;
+
+ /*
+ * Open encoder
+ */
+
+ /* Initialization of encoder format structures */
+ es_format_Init( &id->p_encoder->fmt_in, fmt.i_cat, fmt.i_codec );
+ id->p_encoder->fmt_in.psz_language = strdup( fmt.psz_language );
- if( p_sys->pp_subpics[i]->b_ephemer && !p_ephemer )
- {
- p_ephemer = p_sys->pp_subpics[i];
- }
- else if( p_sys->pp_subpics[i]->b_ephemer )
- {
- if( p_ephemer->i_start < p_sys->pp_subpics[i]->i_start )
- {
- subpicture_t tmp;
- tmp = *p_ephemer;
- *p_ephemer = *p_sys->pp_subpics[i];
- *p_sys->pp_subpics[i] = tmp;
- }
+ id->p_encoder->p_cfg = p_sys->p_osd_cfg;
- spu_del_buffer( id->p_decoder, p_sys->pp_subpics[i] );
- p_sys->pp_subpics[i] = NULL;
- continue;
+ id->p_encoder->p_module =
+ module_Need( id->p_encoder, "encoder", p_sys->psz_osdenc, VLC_TRUE );
+
+ if( !id->p_encoder->p_module )
+ {
+ msg_Err( p_stream, "cannot find encoder" );
+ goto error;
}
+
+ /* open output stream */
+ id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_encoder->fmt_out );
+ id->b_transcode = VLC_TRUE;
- /* Add subpicture to the list */
- *pp_subpic = p_sys->pp_subpics[i];
- pp_subpic = &p_sys->pp_subpics[i]->p_next;
+ if( !id->id ) goto error;
}
+ else
+ {
+ msg_Dbg( p_stream, "not transcoding a stream (fcc=`%4.4s')",
+ (char*)&fmt.i_codec );
+ id->id = p_sys->p_out->pf_add( p_sys->p_out, &fmt );
+ id->b_transcode = VLC_FALSE;
- return p_subpic;
-}
-
-static subpicture_t *spu_new_buffer( decoder_t *p_dec )
-{
- subpicture_t *p_subpic = (subpicture_t *)malloc(sizeof(subpicture_t));
- memset( p_subpic, 0, sizeof(subpicture_t) );
- p_subpic->b_absolute = VLC_TRUE;
+ if( !id->id ) goto error;
+ }
- p_subpic->pf_create_region = __spu_CreateRegion;
- p_subpic->pf_destroy_region = __spu_DestroyRegion;
+ p_sys->id_osd = id;
+ p_sys->b_es_osd = VLC_TRUE;
- return p_subpic;
+ if( !p_sys->p_spu )
+ {
+ p_sys->p_spu = spu_Create( p_stream );
+ if( spu_Init( p_sys->p_spu ) != VLC_SUCCESS )
+ msg_Err( p_sys, "spu initialisation failed" );
+ }
+
+ if( fmt.psz_language )
+ free( fmt.psz_language );
+
+ return VLC_SUCCESS;
+
+ error:
+ msg_Err( p_stream, "starting osd encoding thread failed" );
+ if( id->p_encoder->p_module )
+ module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ if( id->p_encoder )
+ {
+ vlc_object_detach( id->p_encoder );
+ vlc_object_destroy( id->p_encoder );
+ }
+ if( fmt.psz_language ) free( fmt.psz_language );
+ if( id ) free( id );
+ p_sys->id_osd = NULL;
+ p_sys->b_es_osd = VLC_FALSE;
+ return VLC_EGENERIC;
+}
+
+static void transcode_osd_close( sout_stream_t *p_stream, sout_stream_id_t *id)
+{
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+
+ /* Close encoder */
+ if( p_sys->b_es_osd && id )
+ {
+ if( id->p_encoder->p_module )
+ module_Unneed( id->p_encoder, id->p_encoder->p_module );
+
+ if( id->id ) p_sys->p_out->pf_del( p_sys->p_out, id->id );
+
+ if( id->p_encoder )
+ {
+ vlc_object_detach( id->p_encoder );
+ vlc_object_destroy( id->p_encoder );
+ }
+ }
+ p_sys->b_es_osd = VLC_FALSE;
+ if( id ) free( id );
}
-static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_subpic )
+static int transcode_osd_process( sout_stream_t *p_stream,
+ sout_stream_id_t *id,
+ block_t *in, block_t **out )
{
- while( p_subpic->p_region )
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+ subpicture_t *p_subpic = NULL;
+
+ /* Check if we have a subpicture to send */
+ if( p_sys->p_spu && in->i_dts > 0)
{
- subpicture_region_t *p_region = p_subpic->p_region;
- p_subpic->p_region = p_region->p_next;
- p_subpic->pf_destroy_region( VLC_OBJECT(p_dec), p_region );
+ p_subpic = spu_SortSubpictures( p_sys->p_spu, in->i_dts );
}
-
- free( p_subpic );
+ else
+ {
+ msg_Warn( p_stream, "spu channel not initialized, doing it now" );
+ if( !p_sys->p_spu )
+ {
+ p_sys->p_spu = spu_Create( p_stream );
+ if( spu_Init( p_sys->p_spu ) != VLC_SUCCESS )
+ msg_Err( p_stream, "spu initialisation failed" );
+ }
+ }
+
+ if( p_subpic )
+ {
+ block_t *p_block = NULL;
+
+ if( p_sys->b_master_sync && p_sys->i_master_drift )
+ {
+ p_subpic->i_start -= p_sys->i_master_drift;
+ if( p_subpic->i_stop ) p_subpic->i_stop -= p_sys->i_master_drift;
+ }
+
+ p_block = p_sys->id_osd->p_encoder->pf_encode_sub( p_sys->id_osd->p_encoder, p_subpic );
+ if( p_block )
+ {
+ p_block->i_dts = p_block->i_pts = in->i_dts;
+ block_ChainAppend( out, p_block );
+ if( *out )
+ {
+ if( p_sys->p_out->pf_send( p_sys->p_out, p_sys->id_osd->id, *out ) == VLC_SUCCESS )
+ spu_DestroySubpicture( p_sys->p_spu, p_subpic );
+ }
+ return VLC_SUCCESS;
+ }
+ }
+ return VLC_EGENERIC;
}