#include <vlc_aout.h>
#include <vlc_vout.h>
#include <vlc_codec.h>
+#include <vlc_meta.h>
#include <vlc_block.h>
#include <vlc_filter.h>
#include <vlc_osd.h>
free( p_sys->psz_af2 );
- while( p_sys->p_audio_cfg != NULL )
- {
- config_chain_t *p_next = p_sys->p_audio_cfg->p_next;
-
- free( p_sys->p_audio_cfg->psz_name );
- free( p_sys->p_audio_cfg->psz_value );
- free( p_sys->p_audio_cfg );
-
- p_sys->p_audio_cfg = p_next;
- }
+ config_ChainDestroy( p_sys->p_audio_cfg );
free( p_sys->psz_aenc );
free( p_sys->psz_vf2 );
- while( p_sys->p_video_cfg != NULL )
- {
- config_chain_t *p_next = p_sys->p_video_cfg->p_next;
-
- free( p_sys->p_video_cfg->psz_name );
- free( p_sys->p_video_cfg->psz_value );
- free( p_sys->p_video_cfg );
-
- p_sys->p_video_cfg = p_next;
- }
+ config_ChainDestroy( p_sys->p_video_cfg );
free( p_sys->psz_venc );
- while( p_sys->p_deinterlace_cfg != NULL )
- {
- config_chain_t *p_next = p_sys->p_deinterlace_cfg->p_next;
-
- free( p_sys->p_deinterlace_cfg->psz_name );
- free( p_sys->p_deinterlace_cfg->psz_value );
- free( p_sys->p_deinterlace_cfg );
-
- p_sys->p_deinterlace_cfg = p_next;
- }
+ config_ChainDestroy( p_sys->p_deinterlace_cfg );
free( p_sys->psz_deinterlace );
- while( p_sys->p_spu_cfg != NULL )
- {
- config_chain_t *p_next = p_sys->p_spu_cfg->p_next;
-
- free( p_sys->p_spu_cfg->psz_name );
- free( p_sys->p_spu_cfg->psz_value );
- free( p_sys->p_spu_cfg );
-
- p_sys->p_spu_cfg = p_next;
- }
+ config_ChainDestroy( p_sys->p_spu_cfg );
free( p_sys->psz_senc );
if( p_sys->p_spu ) spu_Destroy( p_sys->p_spu );
- while( p_sys->p_osd_cfg != NULL )
- {
- config_chain_t *p_next = p_sys->p_osd_cfg->p_next;
-
- free( p_sys->p_osd_cfg->psz_name );
- free( p_sys->p_osd_cfg->psz_value );
- free( p_sys->p_osd_cfg );
-
- p_sys->p_osd_cfg = p_next;
- }
+ config_ChainDestroy( p_sys->p_osd_cfg );
free( p_sys->psz_osdenc );
vlc_object_release( p_sys );
struct sout_stream_id_t
{
- vlc_fourcc_t b_transcode;
+ bool b_transcode;
/* id of the out stream */
void *id;
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_stream_id_t *id;
- id = malloc( sizeof( sout_stream_id_t ) );
+ id = calloc( 1, sizeof( sout_stream_id_t ) );
if( !id )
goto error;
- memset( id, 0, sizeof(sout_stream_id_t) );
id->id = NULL;
id->p_decoder = NULL;
id->p_decoder->b_pace_control = true;
/* Create encoder object */
- id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
+ id->p_encoder = sout_EncoderCreate( p_stream );
if( !id->p_encoder )
goto error;
vlc_object_attach( id->p_encoder, p_stream );
}
/* Open output stream */
- id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_encoder->fmt_out );
+ id->id = sout_StreamIdAdd( p_sys->p_out, &id->p_encoder->fmt_out );
id->b_transcode = true;
if( !id->id )
}
/* open output stream */
- id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_encoder->fmt_out );
+ id->id = sout_StreamIdAdd( p_sys->p_out, &id->p_encoder->fmt_out );
id->b_transcode = true;
if( !id->id )
{
msg_Dbg( p_stream, "not transcoding a stream (fcc=`%4.4s')",
(char*)&p_fmt->i_codec );
- id->id = p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
+ id->id = sout_StreamIdAdd( p_sys->p_out, p_fmt );
id->b_transcode = false;
if( !id->id ) goto error;
}
}
- if( id->id ) p_sys->p_out->pf_del( p_sys->p_out, id->id );
+ if( id->id ) sout_StreamIdDel( p_sys->p_out, id->id );
if( id->p_decoder )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
block_t *p_out = NULL;
- if( !id->b_transcode && id->id )
- {
- return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer );
- }
- else if( !id->b_transcode )
+ if( !id->b_transcode )
{
+ if( id->id )
+ return sout_StreamIdSend( p_sys->p_out, id->id, p_buffer );
+
block_Release( p_buffer );
return VLC_EGENERIC;
}
break;
}
- if( p_out ) return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_out );
+ if( p_out )
+ return sout_StreamIdSend( p_sys->p_out, id->id, p_out );
return VLC_SUCCESS;
}
/* id->p_decoder->p_cfg = p_sys->p_audio_cfg; */
id->p_decoder->p_module =
- module_need( id->p_decoder, "decoder", "$codec", 0 );
+ module_need( id->p_decoder, "decoder", "$codec", false );
if( !id->p_decoder->p_module )
{
msg_Err( p_stream, "cannot find audio decoder" );
module_unneed( id->p_decoder, id->p_decoder->p_module );
id->p_decoder->p_module = NULL;
+ if( id->p_decoder->p_description )
+ vlc_meta_Delete( id->p_decoder->p_description );
+ id->p_decoder->p_description = NULL;
+
/* Close encoder */
if( id->p_encoder->p_module )
module_unneed( id->p_encoder, id->p_encoder->p_module );
/* id->p_decoder->p_cfg = p_sys->p_video_cfg; */
id->p_decoder->p_module =
- module_need( id->p_decoder, "decoder", "$codec", 0 );
+ module_need( id->p_decoder, "decoder", "$codec", false );
if( !id->p_decoder->p_module )
{
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, i_priority,
- false ) )
+ if( vlc_thread_create( p_sys, "encoder", EncoderThread, i_priority ) )
{
msg_Err( p_stream, "cannot spawn encoder thread" );
module_unneed( id->p_decoder, id->p_decoder->p_module );
id->p_encoder->fmt_out.i_codec = VLC_FOURCC('m','p','g','v');
}
- id->id = p_stream->p_sys->p_out->pf_add( p_stream->p_sys->p_out,
- &id->p_encoder->fmt_out );
+ id->id = sout_StreamIdAdd( p_stream->p_sys->p_out,
+ &id->p_encoder->fmt_out );
if( !id->id )
{
msg_Err( p_stream, "cannot add this stream" );
/* Close decoder */
if( id->p_decoder->p_module )
module_unneed( id->p_decoder, id->p_decoder->p_module );
+ if( id->p_decoder->p_description )
+ vlc_meta_Delete( id->p_decoder->p_description );
if( id->p_decoder->p_owner )
{
/* id->p_decoder->p_cfg = p_sys->p_spu_cfg; */
id->p_decoder->p_module =
- module_need( id->p_decoder, "decoder", "$codec", 0 );
+ module_need( id->p_decoder, "decoder", "$codec", false );
if( !id->p_decoder->p_module )
{
/* Close decoder */
if( id->p_decoder->p_module )
module_unneed( id->p_decoder, id->p_decoder->p_module );
+ if( id->p_decoder->p_description )
+ vlc_meta_Delete( id->p_decoder->p_description );
/* Close encoder */
if( id->p_encoder->p_module )
}
/* open output stream */
- id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_encoder->fmt_out );
+ id->id = sout_StreamIdAdd( p_sys->p_out, &id->p_encoder->fmt_out );
id->b_transcode = true;
if( !id->id ) goto error;
{
msg_Dbg( p_stream, "not transcoding a stream (fcc=`%4.4s')",
(char*)&id->p_decoder->fmt_out.i_codec );
- id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_decoder->fmt_out );
+ id->id = sout_StreamIdAdd( p_sys->p_out, &id->p_decoder->fmt_out );
id->b_transcode = false;
if( !id->id ) goto error;