set_category( CAT_SOUT )
set_subcategory( SUBCAT_SOUT_STREAM )
set_section( N_("Video"), NULL )
- add_string( SOUT_CFG_PREFIX "venc", NULL, NULL, VENC_TEXT,
+ add_module( SOUT_CFG_PREFIX "venc", "encoder", NULL, NULL, VENC_TEXT,
VENC_LONGTEXT, false )
add_string( SOUT_CFG_PREFIX "vcodec", NULL, NULL, VCODEC_TEXT,
VCODEC_LONGTEXT, false )
- add_integer( SOUT_CFG_PREFIX "vb", 800 * 1000, NULL, VB_TEXT,
+ add_integer( SOUT_CFG_PREFIX "vb", 0, NULL, VB_TEXT,
VB_LONGTEXT, false )
add_float( SOUT_CFG_PREFIX "scale", 1, NULL, SCALE_TEXT,
SCALE_LONGTEXT, false )
FPS_LONGTEXT, false )
add_bool( SOUT_CFG_PREFIX "hurry-up", true, NULL, HURRYUP_TEXT,
HURRYUP_LONGTEXT, false )
- add_bool( SOUT_CFG_PREFIX "deinterlace", 0, NULL, DEINTERLACE_TEXT,
+ add_bool( SOUT_CFG_PREFIX "deinterlace", false, NULL, DEINTERLACE_TEXT,
DEINTERLACE_LONGTEXT, false )
add_string( SOUT_CFG_PREFIX "deinterlace-module", "deinterlace", NULL,
DEINTERLACE_MODULE_TEXT, DEINTERLACE_MODULE_LONGTEXT,
VFILTER_TEXT, VFILTER_LONGTEXT, false )
set_section( N_("Audio"), NULL )
- add_string( SOUT_CFG_PREFIX "aenc", NULL, NULL, AENC_TEXT,
+ add_module( SOUT_CFG_PREFIX "aenc", "encoder", NULL, NULL, AENC_TEXT,
AENC_LONGTEXT, false )
add_string( SOUT_CFG_PREFIX "acodec", NULL, NULL, ACODEC_TEXT,
ACODEC_LONGTEXT, false )
ACHANS_LONGTEXT, false )
add_integer( SOUT_CFG_PREFIX "samplerate", 0, NULL, ARATE_TEXT,
ARATE_LONGTEXT, true )
- add_bool( SOUT_CFG_PREFIX "audio-sync", 0, NULL, ASYNC_TEXT,
+ add_bool( SOUT_CFG_PREFIX "audio-sync", false, NULL, ASYNC_TEXT,
ASYNC_LONGTEXT, false )
add_module_list( SOUT_CFG_PREFIX "afilter", "audio filter2",
NULL, NULL,
AFILTER_TEXT, AFILTER_LONGTEXT, false )
set_section( N_("Overlays/Subtitles"), NULL )
- add_string( SOUT_CFG_PREFIX "senc", NULL, NULL, SENC_TEXT,
+ add_module( SOUT_CFG_PREFIX "senc", "encoder", NULL, NULL, SENC_TEXT,
SENC_LONGTEXT, false )
add_string( SOUT_CFG_PREFIX "scodec", NULL, NULL, SCODEC_TEXT,
SCODEC_LONGTEXT, false )
- add_bool( SOUT_CFG_PREFIX "soverlay", 0, NULL, SCODEC_TEXT,
+ add_bool( SOUT_CFG_PREFIX "soverlay", false, NULL, SCODEC_TEXT,
SCODEC_LONGTEXT, false )
add_module_list( SOUT_CFG_PREFIX "sfilter", "video filter",
NULL, NULL,
SFILTER_TEXT, SFILTER_LONGTEXT, false )
set_section( N_("On Screen Display"), NULL )
- add_bool( SOUT_CFG_PREFIX "osd", 0, NULL, OSD_TEXT,
+ add_bool( SOUT_CFG_PREFIX "osd", false, NULL, OSD_TEXT,
OSD_LONGTEXT, false )
set_section( N_("Miscellaneous"), NULL )
add_integer( SOUT_CFG_PREFIX "threads", 0, NULL, THREADS_TEXT,
THREADS_LONGTEXT, true )
- add_bool( SOUT_CFG_PREFIX "high-priority", 0, NULL, HP_TEXT, HP_LONGTEXT,
+ add_bool( SOUT_CFG_PREFIX "high-priority", false, NULL, HP_TEXT, HP_LONGTEXT,
true )
vlc_module_end ()
static int transcode_video_process( sout_stream_t *, sout_stream_id_t *,
block_t *, block_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_id_t * );
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;
};
if( p_sys->i_acodec )
{
- if( p_sys->i_acodec == VLC_FOURCC('m','p','3',0) &&
- p_sys->i_channels > 2 )
+ if( ( p_sys->i_acodec == VLC_CODEC_MP3 ||
+ p_sys->i_acodec == VLC_CODEC_MPGA ) && p_sys->i_channels > 2 )
{
msg_Warn( p_stream, "%d channels invalid for mp3, forcing to 2",
p_sys->i_channels );
&p_sys->p_osd_cfg, strdup( "dvbsub") );
free( psz_next );
- p_sys->i_osdcodec = VLC_FOURCC('Y','U','V','P' );
+ p_sys->i_osdcodec = VLC_CODEC_YUVP;
msg_Dbg( p_stream, "codec osd=%4.4s", (char *)&p_sys->i_osdcodec );
return VLC_SUCCESS;
}
+static bool transcode_audio_filter_needed( const es_format_t *p_fmt1, const es_format_t *p_fmt2 )
+{
+ if( p_fmt1->i_codec != p_fmt2->i_codec ||
+ p_fmt1->audio.i_channels != p_fmt2->audio.i_channels ||
+ p_fmt1->audio.i_rate != p_fmt2->audio.i_rate )
+ return true;
+ return false;
+}
+static int transcode_audio_filter_chain_build( sout_stream_t *p_stream, filter_chain_t *p_chain,
+ const es_format_t *p_dst, const es_format_t *p_src )
+{
+ if( !transcode_audio_filter_needed( p_dst, p_src ) )
+ return VLC_SUCCESS;
+
+ es_format_t current = *p_src;
+
+ msg_Dbg( p_stream, "Looking for filter "
+ "(%4.4s->%4.4s, channels %d->%d, rate %d->%d)",
+ (const char *)&p_src->i_codec,
+ (const char *)&p_dst->i_codec,
+ p_src->audio.i_channels,
+ p_dst->audio.i_channels,
+ p_src->audio.i_rate,
+ p_dst->audio.i_rate );
+
+ /* If any filter is needed, convert to fl32 */
+ if( current.i_codec != VLC_CODEC_FL32 )
+ {
+ /* First step, convert to fl32 */
+ current.i_codec =
+ current.audio.i_format = VLC_CODEC_FL32;
+
+ if( !filter_chain_AppendFilter( p_chain, NULL, NULL, NULL, ¤t ) )
+ {
+ msg_Err( p_stream, "Failed to find conversion filter to fl32" );
+ return VLC_EGENERIC;
+ }
+ current = *filter_chain_GetFmtOut( p_chain );
+ }
+
+ /* Fix sample rate */
+ if( current.audio.i_rate != p_dst->audio.i_rate )
+ {
+ current.audio.i_rate = p_dst->audio.i_rate;
+ if( !filter_chain_AppendFilter( p_chain, NULL, NULL, NULL, ¤t ) )
+ {
+ msg_Err( p_stream, "Failed to find conversion filter for resampling" );
+ return VLC_EGENERIC;
+ }
+ current = *filter_chain_GetFmtOut( p_chain );
+ }
+
+ /* Fix channels */
+ if( current.audio.i_channels != p_dst->audio.i_channels )
+ {
+ current.audio.i_channels = p_dst->audio.i_channels;
+ current.audio.i_physical_channels = p_dst->audio.i_physical_channels;
+ current.audio.i_original_channels = p_dst->audio.i_original_channels;
+
+ if( ( !current.audio.i_physical_channels || !current.audio.i_original_channels ) &&
+ current.audio.i_channels < 6 )
+ current.audio.i_physical_channels =
+ current.audio.i_original_channels = pi_channels_maps[current.audio.i_channels];
+
+ if( !filter_chain_AppendFilter( p_chain, NULL, NULL, NULL, ¤t ) )
+ {
+ msg_Err( p_stream, "Failed to find conversion filter for channel mixing" );
+ return VLC_EGENERIC;
+ }
+ current = *filter_chain_GetFmtOut( p_chain );
+ }
+
+ /* And last step, convert to the requested codec */
+ if( current.i_codec != p_dst->i_codec )
+ {
+ current.i_codec = p_dst->i_codec;
+ if( !filter_chain_AppendFilter( p_chain, NULL, NULL, NULL, ¤t ) )
+ {
+ msg_Err( p_stream, "Failed to find conversion filter to %4.4s",
+ (const char*)&p_dst->i_codec);
+ return VLC_EGENERIC;
+ }
+ current = *filter_chain_GetFmtOut( p_chain );
+ }
+
+ if( transcode_audio_filter_needed( p_dst, ¤t ) )
+ {
+ /* Weird case, a filter has side effects, doomed */
+ msg_Err( p_stream, "Failed to create a valid audio filter chain" );
+ return VLC_EGENERIC;
+ }
+
+ msg_Dbg( p_stream, "Got complete audio filter chain" );
+ return VLC_SUCCESS;
+}
+
static int transcode_audio_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_last;
- int i;
/*
* Open decoder
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') &&
+ if( !(id->p_decoder->fmt_in.i_codec == VLC_CODEC_MP4A &&
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) )
fmt_last.audio.i_rate = id->p_decoder->fmt_in.audio.i_rate;
id->p_encoder->fmt_in.audio.i_bitspersample =
aout_BitsPerSample( id->p_encoder->fmt_in.i_codec );
- /* Init filter chain */
- id->p_f_chain = filter_chain_New( p_stream, "audio filter2", true,
- transcode_audio_filter_allocation_init, NULL, NULL );
- filter_chain_Reset( id->p_f_chain, &fmt_last, &id->p_encoder->fmt_in );
-
- /* 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 */
- 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 );
- }
-
- for( i = 0; i < 4; 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) )
- {
- 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;
- }
-
- /* 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, 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 );
- transcode_audio_close( id );
- return VLC_EGENERIC;
- }
-
- /* Load user specified audio filters now */
+ /* Load user specified audio filters */
if( p_sys->psz_af2 )
{
- id->p_uf_chain = filter_chain_New( p_stream, "audio filter2", false,
- 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 )
- {
-#if 1
- module_unneed( id->p_encoder, id->p_encoder->p_module );
- id->p_encoder->p_module = NULL;
-
- /* 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;
-
- msg_Dbg( p_stream, "number of audio channels for mixing changed, "
- "trying to reopen the encoder for mixing %i to %i channels",
- fmt_last.audio.i_channels,
- id->p_encoder->fmt_in.audio.i_channels );
-
- /* reload encoder */
- 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 ||
- fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ||
- fmt_last.i_codec != id->p_encoder->fmt_in.i_codec )
+ es_format_t fmt_fl32 = fmt_last;
+ fmt_fl32.i_codec =
+ fmt_fl32.audio.i_format = VLC_CODEC_FL32;
+ if( transcode_audio_filter_chain_build( p_stream, id->p_uf_chain,
+ &fmt_fl32, &fmt_last ) )
{
- 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 );
transcode_audio_close( id );
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 =
- 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_encoder->fmt_in.audio.i_channels );
+ fmt_last = fmt_fl32;
- transcode_audio_close( id );
- return VLC_EGENERIC;
-#endif
+ id->p_uf_chain = filter_chain_New( p_stream, "audio filter2", false,
+ transcode_audio_filter_allocation_init, NULL, NULL );
+ filter_chain_Reset( id->p_uf_chain, &fmt_last, &fmt_fl32 );
+ if( filter_chain_AppendFromString( id->p_uf_chain, p_sys->psz_af2 ) > 0 )
+ fmt_last = *filter_chain_GetFmtOut( id->p_uf_chain );
}
- if( fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate )
+ /* Load conversion filters */
+ id->p_f_chain = filter_chain_New( p_stream, "audio filter2", true,
+ transcode_audio_filter_allocation_init, NULL, NULL );
+ filter_chain_Reset( id->p_f_chain, &fmt_last, &id->p_encoder->fmt_in );
+
+ if( transcode_audio_filter_chain_build( p_stream, id->p_f_chain,
+ &id->p_encoder->fmt_in, &fmt_last ) )
{
- 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( id );
return VLC_EGENERIC;
-#endif
}
+ fmt_last = id->p_encoder->fmt_in;
- /* FIXME: Hack for mp3 transcoding support */
- if( id->p_encoder->fmt_out.i_codec == VLC_FOURCC( 'm','p','3',' ' ) )
- id->p_encoder->fmt_out.i_codec = VLC_FOURCC( 'm','p','g','a' );
+ /* */
+ id->p_encoder->fmt_out.i_codec =
+ vlc_fourcc_GetCodec( AUDIO_ES, id->p_encoder->fmt_out.i_codec );
return VLC_SUCCESS;
}
id->p_encoder->p_module = NULL;
/* Close filters */
- if( id->p_f_chain )
- filter_chain_Delete( id->p_f_chain );
if( id->p_uf_chain )
filter_chain_Delete( id->p_uf_chain );
+ if( id->p_f_chain )
+ filter_chain_Delete( id->p_f_chain );
}
static int transcode_audio_process( sout_stream_t *p_stream,
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 )
+ if ( p_audio_buf->i_pts - i_dts > MASTER_SYNC_MAX_DRIFT
+ || p_audio_buf->i_pts - 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;
+ date_Set( &id->interpolated_pts, p_audio_buf->i_pts );
+ i_dts = p_audio_buf->i_pts + 1;
}
- p_sys->i_master_drift = p_audio_buf->start_date - i_dts;
+ p_sys->i_master_drift = p_audio_buf->i_pts - 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->i_pts -= p_sys->i_master_drift;
p_audio_buf->end_date -= p_sys->i_master_drift;
}
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_buf->i_pts;
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;
+ p_audio_buf->i_pts;
+ p_audio_block->i_nb_samples = p_audio_buf->i_nb_samples;
/* Run filter chain */
- p_audio_block = filter_chain_AudioFilter( id->p_f_chain, p_audio_block );
if( id->p_uf_chain )
+ {
p_audio_block = filter_chain_AudioFilter( id->p_uf_chain, p_audio_block );
+ assert( p_audio_block );
+ }
+
+ p_audio_block = filter_chain_AudioFilter( id->p_f_chain, p_audio_block );
assert( p_audio_block );
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->i_nb_samples = p_audio_block->i_nb_samples;
+ p_audio_buf->i_pts = p_audio_block->i_dts;
p_audio_buf->end_date = p_audio_block->i_dts + p_audio_block->i_length;
audio_timer_start( id->p_encoder );
return VLC_SUCCESS;
}
-static void audio_release_buffer( aout_buffer_t *p_buffer )
-{
- if( p_buffer && p_buffer->p_sys ) block_Release( p_buffer->p_sys );
- free( p_buffer );
-}
-
static aout_buffer_t *audio_new_buffer( decoder_t *p_dec, int i_samples )
{
aout_buffer_t *p_buffer;
p_buffer = malloc( sizeof(aout_buffer_t) );
if( !p_buffer ) return NULL;
p_buffer->b_discontinuity = false;
- p_buffer->pf_release = audio_release_buffer;
p_buffer->p_sys = p_block = block_New( p_dec, i_size );
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;
+ p_block->i_nb_samples = i_samples;
return p_buffer;
}
* video
*/
+static picture_t *transcode_video_filter_buffer_new( filter_t *p_filter )
+{
+ p_filter->fmt_out.video.i_chroma = p_filter->fmt_out.i_codec;
+ return picture_New( p_filter->fmt_out.video.i_chroma,
+ p_filter->fmt_out.video.i_width,
+ p_filter->fmt_out.video.i_height,
+ p_filter->fmt_out.video.i_aspect );
+}
+static void transcode_video_filter_buffer_del( filter_t *p_filter, picture_t *p_pic )
+{
+ VLC_UNUSED(p_filter);
+ picture_Release( p_pic );
+}
+
static int transcode_video_filter_allocation_init( filter_t *p_filter,
void *p_data )
{
- sout_stream_sys_t *p_sys = (sout_stream_sys_t*)p_data;
- int i;
-
- p_filter->pf_vout_buffer_new = video_new_buffer_filter;
- p_filter->pf_vout_buffer_del = video_del_buffer_filter;
-
- p_filter->p_owner = malloc( sizeof(filter_owner_sys_t) );
- if( !p_filter->p_owner )
- return VLC_EGENERIC;
-
- for( i = 0; i < PICTURE_RING_SIZE; i++ )
- p_filter->p_owner->pp_pics[i] = 0;
- p_filter->p_owner->p_sys = p_sys;
-
+ VLC_UNUSED(p_data);
+ p_filter->pf_vout_buffer_new = transcode_video_filter_buffer_new;
+ p_filter->pf_vout_buffer_del = transcode_video_filter_buffer_del;
return VLC_SUCCESS;
}
static void transcode_video_filter_allocation_clear( filter_t *p_filter )
{
- int j;
-
- /* Clean-up pictures ring buffer */
- for( j = 0; j < PICTURE_RING_SIZE; j++ )
- {
- if( p_filter->p_owner->pp_pics[j] )
- video_del_buffer( VLC_OBJECT(p_filter),
- p_filter->p_owner->pp_pics[j] );
- }
- free( p_filter->p_owner );
+ VLC_UNUSED(p_filter);
}
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
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;
/* id->p_decoder->p_cfg = p_sys->p_video_cfg; */
/* The dimensions will be set properly later on.
* Just put sensible values so we can test an encoder is available. */
id->p_encoder->fmt_in.video.i_width =
- id->p_encoder->fmt_out.video.i_width ?:
- id->p_decoder->fmt_in.video.i_width ?: 16;
+ id->p_encoder->fmt_out.video.i_width
+ ? id->p_encoder->fmt_out.video.i_width
+ : id->p_decoder->fmt_in.video.i_width
+ ? id->p_decoder->fmt_in.video.i_width : 16;
id->p_encoder->fmt_in.video.i_height =
- id->p_encoder->fmt_out.video.i_height ?:
- id->p_decoder->fmt_in.video.i_height ?: 16;
+ id->p_encoder->fmt_out.video.i_height
+ ? id->p_encoder->fmt_out.video.i_height
+ : id->p_decoder->fmt_in.video.i_height
+ ? id->p_decoder->fmt_in.video.i_height : 16;
id->p_encoder->fmt_in.video.i_frame_rate = ENC_FRAMERATE;
id->p_encoder->fmt_in.video.i_frame_rate_base = ENC_FRAMERATE_BASE;
id->p_encoder->fmt_in.video.i_chroma = id->p_encoder->fmt_in.i_codec;
- /* Hack for mp2v/mp1v transcoding support */
- if( id->p_encoder->fmt_out.i_codec == VLC_FOURCC('m','p','1','v') ||
- id->p_encoder->fmt_out.i_codec == VLC_FOURCC('m','p','2','v') )
- {
- id->p_encoder->fmt_out.i_codec = VLC_FOURCC('m','p','g','v');
- }
+ /* */
+ id->p_encoder->fmt_out.i_codec =
+ vlc_fourcc_GetCodec( VIDEO_ES, id->p_encoder->fmt_out.i_codec );
id->id = sout_StreamIdAdd( p_stream->p_sys->p_out,
&id->p_encoder->fmt_out );
static void transcode_video_close( sout_stream_t *p_stream,
sout_stream_id_t *id )
{
- int i;
-
if( p_stream->p_sys->i_threads >= 1 )
{
vlc_mutex_lock( &p_stream->p_sys->lock_out );
if( id->p_decoder->p_description )
vlc_meta_Delete( id->p_decoder->p_description );
- 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 );
- }
+ free( id->p_decoder->p_owner );
/* Close encoder */
if( id->p_encoder->p_module )
{
msg_Dbg( p_stream, "late picture skipped (%"PRId64")",
current_date + 50000 - p_pic->date );
- p_pic->pf_release( p_pic );
+ picture_Release( p_pic );
continue;
}
}
msg_Dbg( p_stream, "dropping frame (%i)",
(int)(i_video_drift - i_master_drift) );
#endif
- p_pic->pf_release( p_pic );
+ picture_Release( p_pic );
continue;
}
else if( i_video_drift > (i_master_drift + 50000) )
if( transcode_video_encoder_open( p_stream, id ) != VLC_SUCCESS )
{
- p_pic->pf_release( p_pic );
+ picture_Release( p_pic );
transcode_video_close( p_stream, id );
id->b_transcode = false;
return VLC_EGENERIC;
/* Check if we have a subpicture to overlay */
if( p_sys->p_spu )
{
- p_subpic = spu_SortSubpictures( p_sys->p_spu, p_pic->date,
- false /* Fixme: check if stream is paused */, false );
+ p_subpic = spu_SortSubpictures( p_sys->p_spu, p_pic->date, false );
/* TODO: get another pic */
}
{
video_format_t fmt;
- if( p_pic->i_refcount && !filter_chain_GetLength( id->p_f_chain ) )
+ if( picture_IsReferenced( p_pic ) && !filter_chain_GetLength( id->p_f_chain ) )
{
/* 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 )
{
picture_Copy( p_tmp, p_pic );
- p_pic->pf_release( p_pic );
+ picture_Release( p_pic );
p_pic = p_tmp;
}
}
fmt.i_sar_num = fmt.i_aspect * fmt.i_height / fmt.i_width;
fmt.i_sar_den = VOUT_ASPECT_FACTOR;
+ /* FIXME the mdate() seems highly suspicious */
spu_RenderSubpictures( p_sys->p_spu, p_pic, &fmt,
- p_subpic, &id->p_decoder->fmt_out.video, false );
+ p_subpic, &id->p_decoder->fmt_out.video, mdate() );
}
/* Run user specified filter chain */
if( p_sys->i_threads == 0 )
{
- p_pic->pf_release( p_pic );
+ picture_Release( p_pic );
}
else
{
block_ChainAppend( &p_sys->p_buffers, p_block );
vlc_mutex_unlock( &p_sys->lock_out );
- p_pic->pf_release( p_pic );
+ picture_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;
- p_pic->pf_release( p_pic );
+ picture_Release( p_pic );
}
block_ChainRelease( p_sys->p_buffers );
return NULL;
}
-struct picture_sys_t
-{
- 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_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( vlc_object_t *p_this, picture_t **pp_ring,
- sout_stream_sys_t *p_sys )
+static picture_t *video_new_buffer_decoder( decoder_t *p_dec )
{
- 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++ )
+ sout_stream_sys_t *p_ssys = p_dec->p_owner->p_sys;
+ if( p_ssys->i_threads >= 1 )
{
- if( pp_ring[i] != NULL && 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] == NULL ) break;
- }
+ int i_first_pic = p_ssys->i_first_pic;
- 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 )
+ if( p_ssys->i_first_pic != p_ssys->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] != NULL && pp_ring[i]->i_status == DESTROYED_PICTURE )
+ while( p_ssys->i_first_pic == i_first_pic )
{
- pp_ring[i]->i_status = RESERVED_PICTURE;
- return pp_ring[i];
+#warning THERE IS A DEFINITELY BUG! LOCKING IS INSUFFICIENT!
+ msleep( 10000 );
+ barrier ();
}
}
- for( i = 0; i < PICTURE_RING_SIZE; i++ )
- {
- if( pp_ring[i] == NULL ) 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 = picture_New( p_dec->fmt_out.video.i_chroma,
- p_dec->fmt_out.video.i_width,
- p_dec->fmt_out.video.i_height,
- p_dec->fmt_out.video.i_aspect );
- if( !p_pic ) return NULL;
p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
- p_pic->p_sys = calloc( 1, sizeof(picture_sys_t) );
- if( !p_pic->p_sys )
- {
- picture_Release( p_pic );
- return NULL;
- }
- p_pic->pf_release = video_release_buffer;
- p_pic->i_refcount = 0;
-
- pp_ring[i] = p_pic;
- return 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 )
-{
- 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 );
- }
+ return picture_New( p_dec->fmt_out.video.i_chroma,
+ p_dec->fmt_out.video.i_width,
+ p_dec->fmt_out.video.i_height,
+ p_dec->fmt_out.video.i_aspect );
}
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;
- 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 );
+ picture_Release( p_pic );
}
static void video_link_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
{
VLC_UNUSED(p_dec);
- p_pic->i_refcount++;
+ picture_Hold( p_pic );
}
static void video_unlink_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
{
VLC_UNUSED(p_dec);
- video_release_buffer( p_pic );
+ picture_Release( p_pic );
}
/*
/* Open encoder */
es_format_Init( &id->p_encoder->fmt_in, id->p_decoder->fmt_in.i_cat,
- VLC_FOURCC('Y','U','V','A') );
+ VLC_CODEC_YUVA );
id->p_encoder->fmt_in.psz_language = strdup( "osd" );
id->p_encoder->p_cfg = p_sys->p_osd_cfg;
/* 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, false );
+ p_subpic = spu_SortSubpictures( p_sys->p_spu, in->i_dts, false );
}
else
{
projects / vlc / blobdiff