/*****************************************************************************
* transcode.c: transcoding stream output module
*****************************************************************************
- * Copyright (C) 2003-2004 VideoLAN
+ * Copyright (C) 2003-2004 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
+ * Jean-Paul Saman <jpsaman #_at_# m2x dot nl>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <vlc/vout.h>
#include <vlc/decoder.h>
#include "vlc_filter.h"
-#include "osd.h"
+#include "vlc_osd.h"
+
+#define MASTER_SYNC_MAX_DRIFT 100000
/*****************************************************************************
* Module descriptor
"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 (ffmpeg-deinterlace or " \
- "deinterlace)." )
+ "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. 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 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 * );
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 );
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 );
"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
+ "osd", "audio-sync", "high-priority", "maxwidth", "maxheight", NULL
};
/*****************************************************************************
static int transcode_spu_process( sout_stream_t *, sout_stream_id_t *,
block_t *, block_t ** );
+static int transcode_osd_new ( sout_stream_t *, sout_stream_id_t * );
+static void transcode_osd_close ( sout_stream_t *, sout_stream_id_t * );
+static int transcode_osd_process( sout_stream_t *, sout_stream_id_t *,
+ block_t *, block_t ** );
+
static int EncoderThread( struct sout_stream_sys_t * p_sys );
static int pi_channels_maps[6] =
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;
sout_cfg_t *p_spu_cfg;
spu_t *p_spu;
+ /* OSD Menu */
+ sout_stream_id_t *id_osd; /* extension for streaming OSD menus */
+ vlc_fourcc_t i_osdcodec; /* codec osd menu (0 if not transcode) */
+ char *psz_osdenc;
+ 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_master_sync;
mtime_t i_master_drift;
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 "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 )
}
/* Subpictures transcoding parameters */
- p_sys->p_spu = 0;
+ p_sys->p_spu = NULL;
p_sys->psz_senc = NULL;
p_sys->p_spu_cfg = NULL;
p_sys->i_scodec = 0;
}
if( val.psz_string ) free( val.psz_string );
+ /* OSD menu transcoding parameters */
+ p_sys->psz_osdenc = NULL;
+ p_sys->p_osd_cfg = NULL;
+ p_sys->i_osdcodec = 0;
+ p_sys->b_es_osd = VLC_FALSE;
+
+ var_Get( p_stream, SOUT_CFG_PREFIX "osd", &val );
+ p_sys->b_sout_osd = val.b_bool;
+ if( p_sys->b_sout_osd )
+ {
+ vlc_value_t osd_val;
+ char *psz_next;
+
+ psz_next = 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_master_sync = val.b_bool;
if( p_sys->f_fps > 0 ) p_sys->b_master_sync = VLC_TRUE;
if( p_sys->p_spu ) spu_Destroy( p_sys->p_spu );
+ while( p_sys->p_osd_cfg != NULL )
+ {
+ sout_cfg_t *p_next = p_sys->p_osd_cfg->p_next;
+
+ if( p_sys->p_osd_cfg->psz_name )
+ free( p_sys->p_osd_cfg->psz_name );
+ if( p_sys->p_osd_cfg->psz_value )
+ free( p_sys->p_osd_cfg->psz_value );
+ free( p_sys->p_osd_cfg );
+
+ p_sys->p_osd_cfg = p_next;
+ }
+ if( p_sys->psz_osdenc ) free( p_sys->psz_osdenc );
+
vlc_object_destroy( p_sys );
}
date_t interpolated_pts;
};
-
static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_encoder->fmt_out );
id->b_transcode = VLC_TRUE;
- if( !id->id ) goto error;
+ if( !id->id )
+ {
+ transcode_audio_close( p_stream, id );
+ goto error;
+ }
date_Init( &id->interpolated_pts, p_fmt->audio.i_rate, 1 );
}
id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_encoder->fmt_out );
id->b_transcode = VLC_TRUE;
- if( !id->id ) goto error;
+ if( !id->id )
+ {
+ transcode_spu_close( p_stream, id );
+ goto error;
+ }
}
else if( p_fmt->i_cat == SPU_ES && p_sys->b_soverlay )
{
if( !id->id ) goto error;
}
+ if( p_sys->b_sout_osd )
+ {
+ /* Create a fake OSD menu elementary stream */
+ if( !p_sys->b_es_osd && (p_sys->i_osdcodec != 0 || p_sys->psz_osdenc) )
+ {
+ if( transcode_osd_new( p_stream, p_sys->id_osd ) )
+ {
+ msg_Err( p_stream, "cannot create osd chain" );
+ goto error;
+ }
+ p_sys->b_es_osd = VLC_TRUE;
+ }
+ }
return id;
error:
if( id->p_encoder )
{
vlc_object_detach( id->p_encoder );
+ es_format_Clean( &id->p_encoder->fmt_out );
vlc_object_destroy( id->p_encoder );
}
{
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 )
if( id->p_encoder )
{
vlc_object_detach( id->p_encoder );
+ es_format_Clean( &id->p_encoder->fmt_out );
vlc_object_destroy( id->p_encoder );
}
block_t *p_buffer )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- block_t *p_out;
+ block_t *p_out = NULL;
if( !id->b_transcode && id->id )
{
- if( p_sys->b_master_sync && p_sys->i_master_drift )
+ /* Transcode OSD menu pictures. */
+ if( p_sys->b_es_osd )
{
- if( p_buffer->i_dts > 0 )
- {
- p_buffer->i_dts -= p_sys->i_master_drift;
- if( p_buffer->i_dts < 0 )
- {
- block_Release( p_buffer );
- return VLC_EGENERIC;
- }
- }
- if( p_buffer->i_pts > 0 )
- {
- p_buffer->i_pts -= p_sys->i_master_drift;
- if( p_buffer->i_pts < 0 )
- {
- block_Release( p_buffer );
- return VLC_EGENERIC;
- }
- }
+ transcode_osd_process( p_stream, id, p_buffer, &p_out );
}
-
return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer );
}
else if( !id->b_transcode )
break;
default:
+ p_out = NULL;
block_Release( p_buffer );
break;
}
filter_t *p_filter = vlc_object_create( p_stream, VLC_OBJECT_FILTER );
vlc_object_attach( p_filter, p_stream );
- p_filter->pf_audio_buffer_new = __block_New;
+ p_filter->pf_audio_buffer_new = (block_t* (*) (filter_t*, int))__block_New;
p_filter->fmt_in = *p_fmt_in;
p_filter->fmt_out = *p_fmt_out;
id->p_decoder->pf_decode_audio = 0;
id->p_decoder->pf_aout_buffer_new = audio_new_buffer;
id->p_decoder->pf_aout_buffer_del = audio_del_buffer;
- //id->p_decoder->p_cfg = p_sys->p_video_cfg;
+ /* id->p_decoder->p_cfg = p_sys->p_audio_cfg; */
id->p_decoder->p_module =
module_Need( id->p_decoder, "decoder", "$codec", 0 );
while( (p_audio_buf = id->p_decoder->pf_decode_audio( id->p_decoder,
&in )) )
{
+ stats_UpdateInteger( p_stream->p_parent->p_parent, STATS_DECODED_AUDIO,
+ 1, NULL );
if( p_sys->b_master_sync )
{
mtime_t i_dts = date_Get( &id->interpolated_pts ) + 1;
+ if ( p_audio_buf->start_date - i_dts > MASTER_SYNC_MAX_DRIFT
+ || p_audio_buf->start_date - i_dts < -MASTER_SYNC_MAX_DRIFT )
+ {
+ msg_Dbg( p_stream, "drift is too high, resetting master sync" );
+ date_Set( &id->interpolated_pts, p_audio_buf->start_date );
+ i_dts = p_audio_buf->start_date + 1;
+ }
p_sys->i_master_drift = p_audio_buf->start_date - i_dts;
date_Increment( &id->interpolated_pts, p_audio_buf->i_nb_samples );
p_audio_buf->start_date -= p_sys->i_master_drift;
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_cfg = p_sys->p_video_cfg; */
id->p_decoder->p_module =
module_Need( id->p_decoder, "decoder", "$codec", 0 );
/* Close the encoder.
* We'll open it only when we have the first frame. */
module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ if( id->p_encoder->fmt_out.p_extra )
+ free( id->p_encoder->fmt_out.p_extra );
id->p_encoder->p_module = NULL;
if( p_sys->i_threads >= 1 )
}
}
- date_Set( &id->interpolated_pts, 0 );
-
return VLC_SUCCESS;
}
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;
{
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;
+ stats_UpdateInteger( p_stream->p_parent->p_parent, STATS_DECODED_VIDEO,
+ 1, NULL );
if( p_stream->p_sout->i_out_pace_nocontrol && p_sys->b_hurry_up )
{
mtime_t i_master_drift = p_sys->i_master_drift;
mtime_t i_pts;
- if( !i_master_drift )
+ i_pts = date_Get( &id->interpolated_pts ) + 1;
+ if ( p_pic->date - i_pts > MASTER_SYNC_MAX_DRIFT
+ || p_pic->date - i_pts < -MASTER_SYNC_MAX_DRIFT )
{
- /* No audio track ? */
- p_sys->i_master_drift = i_master_drift = p_pic->date;
+ msg_Dbg( p_stream, "drift is too high, resetting master sync" );
+ date_Set( &id->interpolated_pts, p_pic->date );
+ i_pts = p_pic->date + 1;
}
-
- i_pts = date_Get( &id->interpolated_pts ) + 1;
i_video_drift = p_pic->date - i_pts;
i_duplicate = 1;
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_filter]->p_owner->p_sys = p_sys;
+ id->pp_vfilter[id->i_vfilter]->p_owner->p_sys = p_sys;
id->i_vfilter++;
}
p_pic = id->pp_vfilter[i]->pf_video_filter(id->pp_vfilter[i], p_pic);
}
- if( p_sys->i_threads >= 1 )
- {
- 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 );
- }
- 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 )
- date_Increment( &id->interpolated_pts, 1 );
+ 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_master_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;
vlc_mutex_lock( &p_sys->lock_out );
block_ChainAppend( &p_sys->p_buffers, p_block );
- if( p_sys->b_master_sync )
- date_Increment( &id->interpolated_pts, 1 );
-
-#if 0
- if( p_sys->b_master_sync && i_duplicate > 1 )
- {
- mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
- date_Increment( &id->interpolated_pts, 1 );
- p_pic->date = i_pts;
- p_block = id->p_encoder->pf_encode_video(id->p_encoder, p_pic);
- block_ChainAppend( &p_sys->p_buffers, p_block );
- }
-#endif
vlc_mutex_unlock( &p_sys->lock_out );
p_pic->pf_release( p_pic );
id->p_decoder->pf_spu_buffer_new = spu_new_buffer;
id->p_decoder->pf_spu_buffer_del = spu_del_buffer;
id->p_decoder->p_owner = (decoder_owner_sys_t *)p_stream;
- //id->p_decoder->p_cfg = p_sys->p_spu_cfg;
+ /* id->p_decoder->p_cfg = p_sys->p_spu_cfg; */
id->p_decoder->p_module =
module_Need( id->p_decoder, "decoder", "$codec", 0 );
sout_stream_t *p_stream = (sout_stream_t *)p_dec->p_owner;
spu_DestroySubpicture( p_stream->p_sys->p_spu, p_subpic );
}
+
+/*
+ * OSD menu
+ */
+static int transcode_osd_new( sout_stream_t *p_stream, sout_stream_id_t *id )
+{
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+ es_format_t fmt;
+
+ fmt.i_cat = SPU_ES;
+ fmt.i_id = 0xbd1f; /* pid ?? */
+ fmt.i_group = 3; /* pmt entry ?? */
+ fmt.i_codec = VLC_FOURCC( 'Y', 'U', 'V', 'A' );
+ fmt.psz_language = strdup( "osd" );
+
+ id = malloc( sizeof( sout_stream_id_t ) );
+ memset( id, 0, sizeof(sout_stream_id_t) );
+
+ id->id = NULL;
+ id->p_decoder = NULL;
+ id->p_encoder = NULL;
+
+ /* Create encoder object */
+ id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
+ if( !id->p_encoder )
+ {
+ msg_Err( p_stream, "out of memory" );
+ goto error;
+ }
+ vlc_object_attach( id->p_encoder, p_stream );
+ id->p_encoder->p_module = NULL;
+
+ /* Create fake destination format */
+ es_format_Init( &id->p_encoder->fmt_out, fmt.i_cat, 0 );
+ id->p_encoder->fmt_out.i_id = fmt.i_id;
+ id->p_encoder->fmt_out.i_group = fmt.i_group;
+ id->p_encoder->fmt_out.psz_language = strdup( fmt.psz_language );
+
+ if( p_sys->i_osdcodec != 0 || p_sys->psz_osdenc )
+ {
+ msg_Dbg( p_stream, "creating osdmenu transcoding from fcc=`%4.4s' "
+ "to fcc=`%4.4s'", (char*)&fmt.i_codec,
+ (char*)&p_sys->i_osdcodec );
+
+ /* Complete destination format */
+ id->p_encoder->fmt_out.i_codec = p_sys->i_osdcodec;
+
+ /*
+ * Open encoder
+ */
+
+ /* Initialization of encoder format structures */
+ es_format_Init( &id->p_encoder->fmt_in, fmt.i_cat, fmt.i_codec );
+ id->p_encoder->fmt_in.psz_language = strdup( fmt.psz_language );
+
+ id->p_encoder->p_cfg = p_sys->p_osd_cfg;
+
+ id->p_encoder->p_module =
+ module_Need( id->p_encoder, "encoder", p_sys->psz_osdenc, VLC_TRUE );
+
+ if( !id->p_encoder->p_module )
+ {
+ msg_Err( p_stream, "cannot find encoder" );
+ goto error;
+ }
+
+ /* open output stream */
+ id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_encoder->fmt_out );
+ id->b_transcode = VLC_TRUE;
+
+ if( !id->id ) goto error;
+ }
+ else
+ {
+ msg_Dbg( p_stream, "not transcoding a stream (fcc=`%4.4s')",
+ (char*)&fmt.i_codec );
+ id->id = p_sys->p_out->pf_add( p_sys->p_out, &fmt );
+ id->b_transcode = VLC_FALSE;
+
+ if( !id->id ) goto error;
+ }
+
+ p_sys->id_osd = id;
+ p_sys->b_es_osd = VLC_TRUE;
+
+ if( !p_sys->p_spu )
+ {
+ p_sys->p_spu = spu_Create( p_stream );
+ if( spu_Init( p_sys->p_spu ) != VLC_SUCCESS )
+ msg_Err( p_sys, "spu initialisation failed" );
+ }
+
+ if( fmt.psz_language )
+ free( fmt.psz_language );
+
+ return VLC_SUCCESS;
+
+ error:
+ msg_Err( p_stream, "starting osd encoding thread failed" );
+ if( id->p_encoder->p_module )
+ module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ if( id->p_encoder )
+ {
+ vlc_object_detach( id->p_encoder );
+ vlc_object_destroy( id->p_encoder );
+ }
+ if( fmt.psz_language ) free( fmt.psz_language );
+ if( id ) free( id );
+ p_sys->id_osd = NULL;
+ p_sys->b_es_osd = VLC_FALSE;
+ return VLC_EGENERIC;
+}
+
+static void transcode_osd_close( sout_stream_t *p_stream, sout_stream_id_t *id)
+{
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+
+ /* Close encoder */
+ if( p_sys->b_es_osd && id )
+ {
+ if( id->p_encoder->p_module )
+ module_Unneed( id->p_encoder, id->p_encoder->p_module );
+
+ if( id->id ) p_sys->p_out->pf_del( p_sys->p_out, id->id );
+
+ if( id->p_encoder )
+ {
+ vlc_object_detach( id->p_encoder );
+ vlc_object_destroy( id->p_encoder );
+ }
+ }
+ p_sys->b_es_osd = VLC_FALSE;
+ if( id ) free( id );
+}
+
+static int transcode_osd_process( sout_stream_t *p_stream,
+ sout_stream_id_t *id,
+ block_t *in, block_t **out )
+{
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+ subpicture_t *p_subpic = NULL;
+
+ /* Check if we have a subpicture to send */
+ if( p_sys->p_spu && in->i_dts > 0)
+ {
+ p_subpic = spu_SortSubpictures( p_sys->p_spu, in->i_dts );
+ }
+ else
+ {
+ msg_Warn( p_stream, "spu channel not initialized, doing it now" );
+ if( !p_sys->p_spu )
+ {
+ p_sys->p_spu = spu_Create( p_stream );
+ if( spu_Init( p_sys->p_spu ) != VLC_SUCCESS )
+ msg_Err( p_stream, "spu initialisation failed" );
+ }
+ }
+
+ if( p_subpic )
+ {
+ block_t *p_block = NULL;
+
+ if( p_sys->b_master_sync && p_sys->i_master_drift )
+ {
+ p_subpic->i_start -= p_sys->i_master_drift;
+ if( p_subpic->i_stop ) p_subpic->i_stop -= p_sys->i_master_drift;
+ }
+
+ p_block = p_sys->id_osd->p_encoder->pf_encode_sub( p_sys->id_osd->p_encoder, p_subpic );
+ if( p_block )
+ {
+ p_block->i_dts = p_block->i_pts = in->i_dts;
+ block_ChainAppend( out, p_block );
+ if( *out )
+ {
+ if( p_sys->p_out->pf_send( p_sys->p_out, p_sys->id_osd->id, *out ) == VLC_SUCCESS )
+ spu_DestroySubpicture( p_sys->p_spu, p_subpic );
+ }
+ return VLC_SUCCESS;
+ }
+ }
+ return VLC_EGENERIC;
+}
projects / vlc / blobdiff