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 void* EncoderThread( vlc_object_t * p_this );
-static int pi_channels_maps[6] =
+static const int pi_channels_maps[6] =
{
0,
AOUT_CHAN_CENTER, AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
id = malloc( sizeof( sout_stream_id_t ) );
if( !id )
- {
- msg_Err( p_stream, "out of memory" );
goto error;
- }
memset( id, 0, sizeof(sout_stream_id_t) );
id->id = NULL;
/* Create decoder object */
id->p_decoder = vlc_object_create( p_stream, VLC_OBJECT_DECODER );
if( !id->p_decoder )
- {
- msg_Err( p_stream, "out of memory" );
goto error;
- }
vlc_object_attach( id->p_decoder, p_stream );
id->p_decoder->p_module = NULL;
id->p_decoder->fmt_in = *p_fmt;
/* 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;
return id;
- error:
- if( id->p_decoder )
+error:
+ if( id )
{
- vlc_object_detach( id->p_decoder );
- vlc_object_release( id->p_decoder );
- id->p_decoder = NULL;
- }
+ if( id->p_decoder )
+ {
+ vlc_object_detach( id->p_decoder );
+ vlc_object_release( id->p_decoder );
+ id->p_decoder = NULL;
+ }
- if( id->p_encoder )
- {
- vlc_object_detach( id->p_encoder );
- es_format_Clean( &id->p_encoder->fmt_out );
- vlc_object_release( id->p_encoder );
- id->p_encoder = NULL;
- }
+ if( id->p_encoder )
+ {
+ vlc_object_detach( id->p_encoder );
+ es_format_Clean( &id->p_encoder->fmt_out );
+ vlc_object_release( id->p_encoder );
+ id->p_encoder = NULL;
+ }
- free( id );
+ free( id );
+ }
return NULL;
}
* decoder reencoder part
****************************************************************************/
-static int audio_BitsPerSample( vlc_fourcc_t i_format )
-{
- 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;
- }
-
- return 0;
-}
-
static block_t *transcode_audio_alloc( filter_t *p_filter, int size )
{
VLC_UNUSED( p_filter );
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
es_format_t fmt_last;
+ int i;
/*
* Open decoder
return VLC_EGENERIC;
}
id->p_decoder->fmt_out.audio.i_bitspersample =
- audio_BitsPerSample( id->p_decoder->fmt_out.i_codec );
+ aout_BitsPerSample( id->p_decoder->fmt_out.i_codec );
fmt_last = id->p_decoder->fmt_out;
/* Fix AAC SBR changing number of channels and sampling rate */
if( !(id->p_decoder->fmt_in.i_codec == VLC_FOURCC('m','p','4','a') &&
id->p_decoder->fmt_out.i_codec );
id->p_encoder->fmt_in.audio.i_format = id->p_decoder->fmt_out.i_codec;
- 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_rate = id->p_encoder->fmt_out.audio.i_rate;
id->p_encoder->fmt_in.audio.i_physical_channels =
id->p_encoder->fmt_out.audio.i_physical_channels;
id->p_encoder->fmt_in.audio.i_original_channels =
id->p_encoder->fmt_in.audio.i_channels =
id->p_encoder->fmt_out.audio.i_channels;
id->p_encoder->fmt_in.audio.i_bitspersample =
- audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
+ aout_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 =
}
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 );
+ aout_BitsPerSample( id->p_encoder->fmt_in.i_codec );
/* Init filter chain */
id->p_f_chain = filter_chain_New( p_stream, "audio filter2", true,
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');
- filter_chain_AppendFilter( id->p_f_chain, NULL, NULL, &fmt_last, &fmt_out );
- fmt_last = fmt_out;
+ fmt_last.i_codec = fmt_last.audio.i_format = VLC_FOURCC('f','l','3','2');
+ fmt_last.audio.i_bitspersample = aout_BitsPerSample( fmt_last.i_codec );
+ filter_chain_AppendFilter( id->p_f_chain, NULL, NULL, NULL, &fmt_last );
+ fmt_last = *filter_chain_GetFmtOut( id->p_f_chain );
}
- /* FIXME: same comment as in "#if 0"ed code */
- int i;
for( i = 0; i < 4; i++ )
{
if( (fmt_last.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) )
{
- filter_chain_AppendFilter( id->p_f_chain, NULL, NULL, &fmt_last, &id->p_encoder->fmt_in );
+ msg_Dbg( p_stream, "Looking for filter "
+ "(%4.4s->%4.4s, channels %d->%d, rate %d->%d)",
+ (char *)&fmt_last.i_codec,
+ (char *)&id->p_encoder->fmt_in.i_codec,
+ 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 );
+ filter_chain_AppendFilter( id->p_f_chain, NULL, NULL,
+ &fmt_last, &id->p_encoder->fmt_in );
fmt_last = *filter_chain_GetFmtOut( id->p_f_chain );
}
+ else break;
}
-#if 0
-/* FIXME FIXME FIXME WHAT DOES THIS CODE DO? LOOKS LIKE IT'S RANDOMLY TRYING
-TO CHAIN A BUNCH OF AUDIO FILTERS */
- for( i = 0; i < TRANSCODE_FILTERS; i++ )
- {
- 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, NULL );
-
- if( id->pp_filter[id->i_filter] )
- id->i_filter++;
- else
- break;
- }
- }
-#endif
-
/* 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)",
+ msg_Err( p_stream, "no audio filter found "
+ "(%4.4s->%4.4s, channels %d->%d, rate %d->%d)",
(char *)&fmt_last.i_codec,
- (char *)&id->p_encoder->fmt_in.i_codec );
+ (char *)&id->p_encoder->fmt_in.i_codec,
+ 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 );
transcode_audio_close( id );
return VLC_EGENERIC;
}
transcode_audio_filter_allocation_init, NULL, NULL );
filter_chain_Reset( id->p_uf_chain, &fmt_last, &id->p_encoder->fmt_in );
filter_chain_AppendFromString( id->p_uf_chain, p_sys->psz_af2 );
+ fmt_last = *filter_chain_GetFmtOut( id->p_uf_chain );
}
if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels )
id->p_encoder->p_cfg = p_stream->p_sys->p_audio_cfg;
id->p_encoder->p_module =
module_Need( id->p_encoder, "encoder", p_sys->psz_aenc, true );
- if( !id->p_encoder->p_module )
+ if( !id->p_encoder->p_module ||
+ fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ||
+ fmt_last.i_codec != id->p_encoder->fmt_in.i_codec )
{
+ if( id->p_encoder->p_module )
+ {
+ module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ id->p_encoder->p_module = NULL;
+ }
msg_Err( p_stream, "cannot find audio encoder (module:%s fourcc:%4.4s)",
p_sys->psz_aenc ? p_sys->psz_aenc : "any",
(char *)&p_sys->i_acodec );
}
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 );
+ aout_BitsPerSample( id->p_encoder->fmt_in.i_codec );
#else
msg_Err( p_stream, "no audio filter found for mixing from"
" %i to %i channels", fmt_last.audio.i_channels,
id->p_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) );
+ if( !id->p_decoder->p_owner )
+ return VLC_EGENERIC;
+
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;
if( !id->p_decoder->p_module )
{
msg_Err( p_stream, "cannot find video decoder" );
+ free( id->p_decoder->p_owner );
return VLC_EGENERIC;
}
(char *)&p_sys->i_vcodec );
module_Unneed( id->p_decoder, id->p_decoder->p_module );
id->p_decoder->p_module = 0;
+ free( id->p_decoder->p_owner );
return VLC_EGENERIC;
}
VLC_THREAD_PRIORITY_VIDEO;
p_sys->id_video = id;
vlc_mutex_init( &p_sys->lock_out );
- vlc_cond_init( p_stream, &p_sys->cond );
+ vlc_cond_init( &p_sys->cond );
memset( p_sys->pp_pics, 0, sizeof(p_sys->pp_pics) );
p_sys->i_first_pic = 0;
p_sys->i_last_pic = 0;
msg_Err( p_stream, "cannot spawn encoder thread" );
module_Unneed( id->p_decoder, id->p_decoder->p_module );
id->p_decoder->p_module = 0;
+ free( id->p_decoder->p_owner );
return VLC_EGENERIC;
}
}
f_aspect = f_aspect * i_dst_width / i_dst_height;
/* Store calculated values */
- id->p_encoder->fmt_out.video.i_width = i_dst_width;
- id->p_encoder->fmt_out.video.i_height = i_dst_height;
+ id->p_encoder->fmt_out.video.i_width =
+ id->p_encoder->fmt_out.video.i_visible_width = i_dst_width;
+ id->p_encoder->fmt_out.video.i_height =
+ id->p_encoder->fmt_out.video.i_visible_height = i_dst_height;
- id->p_encoder->fmt_in.video.i_width = i_dst_width;
- id->p_encoder->fmt_in.video.i_height = i_dst_height;
+ id->p_encoder->fmt_in.video.i_width =
+ id->p_encoder->fmt_in.video.i_visible_width = i_dst_width;
+ id->p_encoder->fmt_in.video.i_height =
+ id->p_encoder->fmt_in.video.i_visible_height = i_dst_height;
msg_Dbg( p_stream, "source %ix%i, destination %ix%i",
i_src_width, i_src_height,
transcode_video_filter_allocation_init,
transcode_video_filter_allocation_clear,
p_stream->p_sys );
- filter_chain_Reset( id->p_uf_chain, &id->p_decoder->fmt_out,
+ filter_chain_Reset( id->p_uf_chain, &id->p_encoder->fmt_in,
&id->p_encoder->fmt_in );
filter_chain_AppendFromString( id->p_uf_chain, p_sys->psz_vf2 );
p_fmt_out = filter_chain_GetFmtOut( id->p_uf_chain );
id->p_encoder->fmt_in.video.i_width;
id->p_encoder->fmt_out.video.i_height =
id->p_encoder->fmt_in.video.i_height;
+ id->p_encoder->fmt_out.video.i_aspect =
+ id->p_encoder->fmt_in.video.i_aspect;
}
if( transcode_video_encoder_open( p_stream, id ) != VLC_SUCCESS )
{
- filter_chain_Delete( id->p_f_chain );
- if( id->p_uf_chain )
- filter_chain_Delete( id->p_uf_chain );
p_pic->pf_release( p_pic );
transcode_video_close( p_stream, id );
id->b_transcode = false;
if( p_sys->p_spu )
{
p_subpic = spu_SortSubpictures( p_sys->p_spu, p_pic->date,
- false /* Fixme: check if stream is paused */ );
+ false /* Fixme: check if stream is paused */, false );
/* TODO: get another pic */
}
/* Overlay subpicture */
if( p_subpic )
{
- int i_scale_width, i_scale_height;
video_format_t fmt;
- 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;
-
if( p_pic->i_refcount && !filter_chain_GetLength( id->p_f_chain ) )
{
/* We can't modify the picture, we need to duplicate it */
}
}
- fmt = filter_chain_GetFmtOut( id->p_f_chain )->video;
+ if( filter_chain_GetLength( id->p_f_chain ) > 0 )
+ fmt = filter_chain_GetFmtOut( id->p_f_chain )->video;
+ else
+ fmt = id->p_decoder->fmt_out.video;
/* FIXME (shouldn't have to be done here) */
fmt.i_sar_num = fmt.i_aspect * fmt.i_height / fmt.i_width;
fmt.i_sar_den = VOUT_ASPECT_FACTOR;
- spu_RenderSubpictures( p_sys->p_spu, &fmt, p_pic, p_pic, p_subpic,
- i_scale_width, i_scale_height );
+ spu_RenderSubpictures( p_sys->p_spu, p_pic, &fmt,
+ p_subpic, &id->p_decoder->fmt_out.video );
}
/* Run user specified filter chain */
return VLC_SUCCESS;
}
-static int EncoderThread( sout_stream_sys_t *p_sys )
+static void* EncoderThread( vlc_object_t* p_this )
{
+ sout_stream_sys_t *p_sys = (sout_stream_sys_t*)p_this;
sout_stream_id_t *id = p_sys->id_video;
picture_t *p_pic;
+ int canc = vlc_savecancel ();
- while( !p_sys->b_die && !p_sys->b_error )
+ while( vlc_object_alive (p_sys) && !p_sys->b_error )
{
block_t *p_block;
while( p_sys->i_last_pic == p_sys->i_first_pic )
{
vlc_cond_wait( &p_sys->cond, &p_sys->lock_out );
- if( p_sys->b_die || p_sys->b_error ) break;
+ if( !vlc_object_alive (p_sys) || p_sys->b_error ) break;
}
- if( p_sys->b_die || p_sys->b_error )
+ if( !vlc_object_alive (p_sys) || p_sys->b_error )
{
vlc_mutex_unlock( &p_sys->lock_out );
break;
}
block_ChainRelease( p_sys->p_buffers );
- return 0;
+ vlc_restorecancel (canc);
+ return NULL;
}
struct picture_sys_t
VLC_UNUSED(p_this);
if( p_pic )
{
+ free( p_pic->p_q );
free( p_pic->p_data_orig );
free( p_pic->p_sys );
free( p_pic );
VLC_UNUSED(p_decoder);
p_pic->i_refcount = 0;
p_pic->i_status = DESTROYED_PICTURE;
+ picture_CleanupQuant( p_pic );
}
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;
+ picture_CleanupQuant( p_pic );
}
static void video_link_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
/* 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, false );
+ p_subpic = spu_SortSubpictures( p_sys->p_spu, in->i_dts, false, false );
}
else
{
projects / vlc / blobdiff