/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_input.h>
#include <vlc_sout.h>
static int Send( sout_stream_t *, sout_stream_id_t *, block_t* );
static int transcode_audio_new ( sout_stream_t *, sout_stream_id_t * );
-static void transcode_audio_close ( sout_stream_t *, sout_stream_id_t * );
+static void transcode_audio_close ( sout_stream_id_t * );
static int transcode_audio_process( sout_stream_t *, sout_stream_id_t *,
block_t *, block_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 void transcode_spu_close ( sout_stream_id_t * );
static int transcode_spu_process( sout_stream_t *, sout_stream_id_t *,
block_t *, block_t ** );
vlc_fourcc_t i_acodec; /* codec audio (0 if not transcode) */
char *psz_aenc;
config_chain_t *p_audio_cfg;
- int i_sample_rate;
- int i_channels;
+ uint32_t i_sample_rate;
+ uint32_t i_channels;
int i_abitrate;
char *psz_afilters[TRANSCODE_FILTERS];
config_chain_t *p_afilters_cfg[TRANSCODE_FILTERS];
if( !p_sys->p_out )
{
msg_Err( p_stream, "cannot create chain" );
- vlc_object_destroy( p_sys );
+ vlc_object_release( p_sys );
return VLC_EGENERIC;
}
}
if( p_sys->psz_osdenc ) free( p_sys->psz_osdenc );
- vlc_object_destroy( p_sys );
+ vlc_object_release( p_sys );
}
struct sout_stream_id_t
/* Complete destination format */
id->p_encoder->fmt_out.i_codec = p_sys->i_acodec;
id->p_encoder->fmt_out.audio.i_rate = p_sys->i_sample_rate > 0 ?
- p_sys->i_sample_rate : (int)p_fmt->audio.i_rate;
+ p_sys->i_sample_rate : p_fmt->audio.i_rate;
id->p_encoder->fmt_out.i_bitrate = p_sys->i_abitrate;
id->p_encoder->fmt_out.audio.i_bitspersample =
p_fmt->audio.i_bitspersample;
if( !id->id )
{
- transcode_audio_close( p_stream, id );
+ transcode_audio_close( id );
goto error;
}
if( !id->id )
{
- transcode_spu_close( p_stream, id );
+ transcode_spu_close( id );
goto error;
}
}
if( id->p_decoder )
{
vlc_object_detach( id->p_decoder );
- vlc_object_destroy( id->p_decoder );
+ vlc_object_release( id->p_decoder );
id->p_decoder = NULL;
}
{
vlc_object_detach( id->p_encoder );
es_format_Clean( &id->p_encoder->fmt_out );
- vlc_object_destroy( id->p_encoder );
+ vlc_object_release( id->p_encoder );
id->p_encoder = NULL;
}
switch( id->p_decoder->fmt_in.i_cat )
{
case AUDIO_ES:
- transcode_audio_close( p_stream, id );
+ transcode_audio_close( id );
break;
case VIDEO_ES:
transcode_video_close( p_stream, id );
if( p_sys->b_osd )
transcode_osd_close( p_stream, id );
else
- transcode_spu_close( p_stream, id );
+ transcode_spu_close( id );
break;
}
}
if( id->p_decoder )
{
vlc_object_detach( id->p_decoder );
- vlc_object_destroy( id->p_decoder );
+ vlc_object_release( id->p_decoder );
id->p_decoder = NULL;
}
{
vlc_object_detach( id->p_encoder );
es_format_Clean( &id->p_encoder->fmt_out );
- vlc_object_destroy( id->p_encoder );
+ vlc_object_release( id->p_encoder );
id->p_encoder = NULL;
}
free( id );
else
{
vlc_object_detach( p_filter );
- vlc_object_destroy( p_filter );
+ vlc_object_release( p_filter );
p_filter = 0;
}
id->p_decoder->fmt_out.i_codec );
id->p_encoder->fmt_in.audio.i_format = id->p_decoder->fmt_out.i_codec;
- /* Initialization of encoder format structures */
- es_format_Init( &id->p_encoder->fmt_in, AUDIO_ES, VLC_FOURCC('f','l','3','2') );
- id->p_encoder->fmt_in.audio.i_format = VLC_FOURCC('f','l','3','2');
-
- id->p_encoder->fmt_in.audio.i_rate = id->p_decoder->fmt_out.audio.i_rate;
+ if( ( id->p_encoder->fmt_out.i_codec == VLC_FOURCC('s','a','m','r') ) ||
+ ( id->p_encoder->fmt_out.i_codec == VLC_FOURCC('s','a','w','b') ) )
+ id->p_encoder->fmt_in.audio.i_rate = id->p_encoder->fmt_out.audio.i_rate;
+ else
+ id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;
id->p_encoder->fmt_in.audio.i_physical_channels =
- id->p_decoder->fmt_out.audio.i_physical_channels;
+ id->p_encoder->fmt_out.audio.i_physical_channels;
id->p_encoder->fmt_in.audio.i_original_channels =
- id->p_decoder->fmt_out.audio.i_original_channels;
+ id->p_encoder->fmt_out.audio.i_original_channels;
id->p_encoder->fmt_in.audio.i_channels =
- id->p_decoder->fmt_out.audio.i_channels;
+ id->p_encoder->fmt_out.audio.i_channels;
id->p_encoder->fmt_in.audio.i_bitspersample =
audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
id->p_encoder->fmt_in.audio.i_bitspersample =
audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
- /* Fix AAC SBR changing number of channels and sampling rate */
- if( ( id->p_decoder->fmt_in.i_codec == VLC_FOURCC('m','p','4','a') ) &&
- ( fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate ) &&
- ( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ) )
- {
- id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;
- id->p_encoder->fmt_out.audio.i_rate = fmt_last.audio.i_rate;
- }
-
/* Load conversion filters */
if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ||
fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate )
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 );
+ transcode_audio_close( id );
return VLC_EGENERIC;
}
if( !id->p_encoder->p_module )
{
msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_aenc );
- transcode_audio_close( p_stream, id );
+ transcode_audio_close( id );
return VLC_EGENERIC;
}
id->p_encoder->fmt_in.audio.i_format = id->p_encoder->fmt_in.i_codec;
" %i to %i channels", fmt_last.audio.i_channels,
id->p_encoder->fmt_in.audio.i_channels );
- transcode_audio_close( p_stream, id );
+ transcode_audio_close( id );
return VLC_EGENERIC;
#endif
}
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 );
+ transcode_audio_close( id );
return VLC_EGENERIC;
#endif
}
return VLC_SUCCESS;
}
-static void transcode_audio_close( sout_stream_t *p_stream,
- sout_stream_id_t *id )
+static void transcode_audio_close( sout_stream_id_t *id )
{
int 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] );
+ vlc_object_release( id->pp_filter[i] );
}
for( i = 0; i < id->i_ufilter; i++ )
{
vlc_object_detach( id->pp_ufilter[i] );
if( id->pp_ufilter[i]->p_module )
module_Unneed( id->pp_ufilter[i], id->pp_ufilter[i]->p_module );
- vlc_object_destroy( id->pp_ufilter[i] );
+ vlc_object_release( id->pp_ufilter[i] );
}
}
static void audio_del_buffer( decoder_t *p_dec, aout_buffer_t *p_buffer )
{
+ VLC_UNUSED(p_dec);
if( p_buffer && p_buffer->p_sys ) block_Release( p_buffer->p_sys );
- if( p_buffer ) free( p_buffer );
+ free( p_buffer );
}
/*
id->pp_filter[i]->p_owner->pp_pics[j] );
}
free( id->pp_filter[i]->p_owner );
- vlc_object_destroy( id->pp_filter[i] );
+ vlc_object_release( id->pp_filter[i] );
id->pp_filter[i] = NULL;
}
id->pp_ufilter[i]->p_owner->pp_pics[j] );
}
free( id->pp_ufilter[i]->p_owner );
- vlc_object_destroy( id->pp_ufilter[i] );
+ vlc_object_release( id->pp_ufilter[i] );
id->pp_ufilter[i] = NULL;
}
}
{
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] );
+ vlc_object_release( id->pp_filter[id->i_filter] );
}
}
id->pp_filter[id->i_filter]->p_module =
module_Need( id->pp_filter[id->i_filter],
+#if ( (defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)) )
+ "video filter2", "scale", VLC_TRUE );
+#else
"crop padd", 0, 0 );
+#endif
if( id->pp_filter[id->i_filter]->p_module )
{
id->pp_filter[id->i_filter]->p_owner =
{
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] );
+ vlc_object_release( id->pp_filter[id->i_filter] );
p_pic->pf_release( p_pic );
transcode_video_close( p_stream, id );
{
msg_Dbg( p_stream, "no video filter found" );
vlc_object_detach( id->pp_ufilter[id->i_ufilter] );
- vlc_object_destroy( id->pp_ufilter[id->i_ufilter] );
+ vlc_object_release( id->pp_ufilter[id->i_ufilter] );
id->pp_ufilter[id->i_ufilter] = NULL;
}
}
static void video_del_buffer( vlc_object_t *p_this, picture_t *p_pic )
{
- if( p_pic && p_pic->p_data_orig ) free( p_pic->p_data_orig );
- if( p_pic && p_pic->p_sys ) free( p_pic->p_sys );
- if( p_pic ) free( p_pic );
+ VLC_UNUSED(p_this);
+ if( p_pic )
+ {
+ free( p_pic->p_data_orig );
+ free( p_pic->p_sys );
+ free( p_pic );
+ }
}
static void video_del_buffer_decoder( decoder_t *p_decoder, picture_t *p_pic )
{
+ VLC_UNUSED(p_decoder);
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 )
{
+ VLC_UNUSED(p_filter);
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 )
{
+ VLC_UNUSED(p_dec);
p_pic->i_refcount++;
}
static void video_unlink_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
{
+ VLC_UNUSED(p_dec);
video_release_buffer( p_pic );
}
return VLC_SUCCESS;
}
-static void transcode_spu_close( sout_stream_t *p_stream, sout_stream_id_t *id)
+static void transcode_spu_close( sout_stream_id_t *id)
{
/* Close decoder */
if( id->p_decoder->p_module )
return VLC_SUCCESS;
}
}
+
return VLC_EGENERIC;
}