static int Del ( sout_stream_t *, sout_stream_id_t * );
static int Send( sout_stream_t *, sout_stream_id_t *, block_t* );
-static int transcode_audio_ffmpeg_new ( sout_stream_t *, sout_stream_id_t * );
-static void transcode_audio_ffmpeg_close ( sout_stream_t *, sout_stream_id_t * );
-static int transcode_audio_ffmpeg_process( sout_stream_t *, sout_stream_id_t *, block_t *, block_t ** );
-
-static int transcode_video_ffmpeg_new ( sout_stream_t *, sout_stream_id_t * );
-static void transcode_video_ffmpeg_close ( sout_stream_t *, sout_stream_id_t * );
-static int transcode_video_ffmpeg_process( sout_stream_t *, sout_stream_id_t *, block_t *, block_t ** );
-
-static int transcode_video_ffmpeg_getframebuf( struct AVCodecContext *, AVFrame *);
+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 int transcode_audio_process( sout_stream_t *, sout_stream_id_t *,
+ block_t *, block_t ** );
+
+static int transcode_video_new ( sout_stream_t *, sout_stream_id_t * );
+static void transcode_video_close ( sout_stream_t *, sout_stream_id_t * );
+static int transcode_video_encoder_open( sout_stream_t *, sout_stream_id_t *);
+static int transcode_video_process( sout_stream_t *, sout_stream_id_t *,
+ block_t *, block_t ** );
+
+static picture_t *video_new_buffer( decoder_t * );
+static void video_del_buffer( decoder_t *, picture_t * );
+static void video_link_picture( decoder_t *, picture_t * );
+static void video_unlink_picture( decoder_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 * );
{
VLC_COMMON_MEMBERS
- sout_stream_t * p_out;
- sout_stream_id_t * id_video;
- block_t * p_buffers;
+ sout_stream_t *p_out;
+ sout_stream_id_t *id_video;
+ block_t *p_buffers;
vlc_mutex_t lock_out;
vlc_cond_t cond;
picture_t * pp_pics[PICTURE_RING_SIZE];
int i_crop_right;
int i_crop_left;
- mtime_t i_input_dts;
- mtime_t i_input_pts;
- vlc_bool_t b_input_has_b_frames;
-
- mtime_t i_output_pts;
-
/* SPU */
vlc_fourcc_t i_scodec; /* codec spu (0 if not transcode) */
char *psz_senc;
return VLC_EGENERIC;
}
- p_sys->b_input_has_b_frames = VLC_FALSE;
- p_sys->i_output_pts = 0;
p_sys->i_master_drift = 0;
sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
struct sout_stream_id_t
{
vlc_fourcc_t b_transcode;
- es_format_t f_src; /* only if transcoding */
- es_format_t f_dst; /* " " " */
+
unsigned int i_inter_pixfmt; /* intermediary format when transcoding */
/* id of the out stream */
/* Decoder */
decoder_t *p_decoder;
+ /* Filters */
+ filter_t *pp_filter[10];
+ int i_filter;
+
/* Encoder */
encoder_t *p_encoder;
- vlc_fourcc_t b_enc_inited;
/* ffmpeg part */
AVCodec *ff_dec;
id->p_decoder = NULL;
id->p_encoder = NULL;
- /* Get source format */
- id->f_src = *p_fmt;
+ /* 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;
+ id->p_decoder->fmt_out = *p_fmt;
+ id->p_decoder->fmt_out.i_extra = 0;
+ id->p_decoder->fmt_out.p_extra = 0;
+ id->p_decoder->b_pace_control = VLC_TRUE;
+
+ /* 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 destination format */
- es_format_Init( &id->f_dst, p_fmt->i_cat, 0 );
- id->f_dst.i_id = id->f_src.i_id;
- id->f_dst.i_group = id->f_src.i_group;
- if( id->f_src.psz_language )
- id->f_dst.psz_language = strdup( id->f_src.psz_language );
+ es_format_Init( &id->p_encoder->fmt_out, p_fmt->i_cat, 0 );
+ id->p_encoder->fmt_out.i_id = p_fmt->i_id;
+ id->p_encoder->fmt_out.i_group = p_fmt->i_group;
+ if( p_fmt->psz_language )
+ id->p_encoder->fmt_out.psz_language = strdup( p_fmt->psz_language );
if( p_fmt->i_cat == AUDIO_ES && (p_sys->i_acodec || p_sys->psz_aenc) )
{
(char*)&p_fmt->i_codec, (char*)&p_sys->i_acodec );
/* Complete destination format */
- id->f_dst.i_codec = p_sys->i_acodec;
- id->f_dst.audio.i_rate = p_sys->i_sample_rate > 0 ?
- p_sys->i_sample_rate : id->f_src.audio.i_rate;
- id->f_dst.audio.i_channels = p_sys->i_channels > 0 ?
- p_sys->i_channels : id->f_src.audio.i_channels;
- id->f_dst.i_bitrate = p_sys->i_abitrate;
- id->f_dst.audio.i_bitspersample = id->f_src.audio.i_bitspersample;
-
- /* build decoder -> filter -> encoder */
- if( transcode_audio_ffmpeg_new( p_stream, id ) )
+ 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;
+ id->p_encoder->fmt_out.audio.i_channels = p_sys->i_channels > 0 ?
+ p_sys->i_channels : p_fmt->audio.i_channels;
+ id->p_encoder->fmt_out.i_bitrate = p_sys->i_abitrate;
+ id->p_encoder->fmt_out.audio.i_bitspersample =
+ p_fmt->audio.i_bitspersample;
+
+ /* Build decoder -> filter -> encoder chain */
+ if( transcode_audio_new( p_stream, id ) )
{
msg_Err( p_stream, "cannot create audio chain" );
- free( id );
- return NULL;
+ goto error;
}
- /* open output stream */
- id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->f_dst );
+ /* 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 == NULL )
- {
- free( id );
- return NULL;
- }
+ if( !id->id ) goto error;
date_Init( &id->interpolated_pts, p_fmt->audio.i_rate, 1 );
}
(char*)&p_fmt->i_codec, (char*)&p_sys->i_vcodec );
/* Complete destination format */
- id->f_dst.i_codec = p_sys->i_vcodec;
- id->f_dst.video.i_width = p_sys->i_width;
- id->f_dst.video.i_height = p_sys->i_height;
- id->f_dst.i_bitrate = p_sys->i_vbitrate;
+ id->p_encoder->fmt_out.i_codec = p_sys->i_vcodec;
+ id->p_encoder->fmt_out.video.i_width = p_sys->i_width;
+ id->p_encoder->fmt_out.video.i_height = p_sys->i_height;
+ id->p_encoder->fmt_out.i_bitrate = p_sys->i_vbitrate;
- /* build decoder -> filter -> encoder */
- if( transcode_video_ffmpeg_new( p_stream, id ) )
+ /* Build decoder -> filter -> encoder chain */
+ if( transcode_video_new( p_stream, id ) )
{
msg_Err( p_stream, "cannot create video chain" );
- free( id );
- return NULL;
+ goto error;
}
-#if 0
- /* open output stream */
- id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->f_dst );
-#endif
+
+ /* Stream will be added later on because we don't know
+ * all the characteristics of the decoded stream yet */
id->b_transcode = VLC_TRUE;
- if( id->f_dst.video.i_frame_rate && id->f_dst.video.i_frame_rate_base )
+ if( p_sys->f_fps > 0 )
{
- date_Init( &id->interpolated_pts, id->f_dst.video.i_frame_rate,
- id->f_dst.video.i_frame_rate_base );
- }
- else if( p_sys->b_audio_sync )
- {
- msg_Warn( p_stream, "no video frame rate available, disabling "
- "audio sync" );
- p_sys->b_audio_sync = VLC_FALSE;
+ id->p_encoder->fmt_out.video.i_frame_rate = p_sys->f_fps * 1000;
+ id->p_encoder->fmt_out.video.i_frame_rate_base = 1000;
}
}
else if( p_fmt->i_cat == SPU_ES && (p_sys->i_scodec || p_sys->psz_senc) )
(char*)&p_sys->i_scodec );
/* Complete destination format */
- id->f_dst.i_codec = p_sys->i_scodec;
+ id->p_encoder->fmt_out.i_codec = p_sys->i_scodec;
/* build decoder -> filter -> encoder */
if( transcode_spu_new( p_stream, id ) )
{
msg_Err( p_stream, "cannot create subtitles chain" );
- free( id );
- return NULL;
+ goto error;
}
/* open output stream */
- id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->f_dst );
+ 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 == NULL )
- {
- free( id );
- return NULL;
- }
+ if( !id->id ) goto error;
}
else if( p_fmt->i_cat == SPU_ES && p_sys->b_soverlay )
{
id->b_transcode = VLC_TRUE;
- /* build decoder -> filter -> encoder */
+ /* Build decoder -> filter -> overlaying chain */
if( transcode_spu_new( p_stream, id ) )
{
msg_Err( p_stream, "cannot create subtitles chain" );
- free( id );
- return NULL;
+ goto error;
}
}
else
id->id = p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
id->b_transcode = VLC_FALSE;
- if( id->id == NULL )
- {
- free( id );
- return NULL;
- }
+ if( !id->id ) goto error;
}
return id;
+
+ error:
+ if( id->p_decoder )
+ {
+ vlc_object_detach( id->p_decoder );
+ vlc_object_destroy( id->p_decoder );
+ }
+
+ if( id->p_encoder )
+ {
+ vlc_object_detach( id->p_encoder );
+ vlc_object_destroy( id->p_encoder );
+ }
+
+ free( id );
+ return NULL;
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
{
- sout_stream_sys_t *p_sys = p_stream->p_sys;
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
if( id->b_transcode )
{
- if( id->f_src.i_cat == AUDIO_ES )
- {
- transcode_audio_ffmpeg_close( p_stream, id );
- }
- else if( id->f_src.i_cat == VIDEO_ES )
- {
- transcode_video_ffmpeg_close( p_stream, id );
- }
- else if( id->f_src.i_cat == SPU_ES )
+ switch( id->p_decoder->fmt_in.i_cat )
{
+ case AUDIO_ES:
+ transcode_audio_close( p_stream, id );
+ break;
+ case VIDEO_ES:
+ transcode_video_close( p_stream, id );
+ break;
+ case SPU_ES:
transcode_spu_close( p_stream, id );
+ break;
}
}
if( id->id ) p_sys->p_out->pf_del( p_sys->p_out, id->id );
+
+ if( id->p_decoder )
+ {
+ vlc_object_detach( id->p_decoder );
+ vlc_object_destroy( id->p_decoder );
+ }
+
+ if( id->p_encoder )
+ {
+ vlc_object_detach( id->p_encoder );
+ vlc_object_destroy( id->p_encoder );
+ }
+
free( id );
return VLC_SUCCESS;
block_t *p_buffer )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
+ block_t *p_out;
- if( id->b_transcode )
+ 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 )
+ {
+ block_Release( p_buffer );
+ return VLC_EGENERIC;
+ }
+
+ switch( id->p_decoder->fmt_in.i_cat )
{
- block_t *p_buffer_out;
+ case AUDIO_ES:
+ transcode_audio_process( p_stream, id, p_buffer, &p_out );
+ block_Release( p_buffer );
+ break;
- /* Be sure to have padding */
- p_buffer = block_Realloc( p_buffer, 0, p_buffer->i_buffer + FF_INPUT_BUFFER_PADDING_SIZE );
- if( p_buffer == NULL )
+ case VIDEO_ES:
+ if( transcode_video_process( p_stream, id, p_buffer, &p_out )
+ != VLC_SUCCESS )
{
return VLC_EGENERIC;
}
- p_buffer->i_buffer -= FF_INPUT_BUFFER_PADDING_SIZE;
- memset( &p_buffer->p_buffer[p_buffer->i_buffer], 0, FF_INPUT_BUFFER_PADDING_SIZE );
+ break;
- if( id->f_src.i_cat == AUDIO_ES )
- {
- transcode_audio_ffmpeg_process( p_stream, id, p_buffer,
- &p_buffer_out );
- block_Release( p_buffer );
- }
- else if( id->f_src.i_cat == VIDEO_ES )
+ case SPU_ES:
+ if( transcode_spu_process( p_stream, id, p_buffer, &p_out ) !=
+ VLC_SUCCESS )
{
- if( transcode_video_ffmpeg_process( p_stream, id, p_buffer,
- &p_buffer_out ) != VLC_SUCCESS )
- {
- block_Release( p_buffer );
- return VLC_EGENERIC;
- }
- block_Release( p_buffer );
- }
- else if( id->f_src.i_cat == SPU_ES )
- {
- if( transcode_spu_process( p_stream, id, p_buffer,
- &p_buffer_out ) != VLC_SUCCESS )
- {
- return VLC_EGENERIC;
- }
- }
- else
- {
- block_Release( p_buffer );
+ return VLC_EGENERIC;
}
+ break;
- if( p_buffer_out )
- {
- return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer_out );
- }
- return VLC_SUCCESS;
- }
- else if( id->id != NULL )
- {
- return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer );
- }
- else
- {
+ default:
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 );
+ return VLC_SUCCESS;
}
/****************************************************************************
{
vlc_fourcc_t i_fcc;
int i_ff_codec;
+
} fourcc_to_ff_code[] =
{
/* audio */
{ VLC_FOURCC( 'v', 'o', 'r', 'b' ), CODEC_ID_VORBIS },
{ VLC_FOURCC( 'a', 'l', 'a', 'w' ), CODEC_ID_PCM_ALAW },
- /* video */
- { VLC_FOURCC( 'm', 'p', 'g', 'v' ), CODEC_ID_MPEG1VIDEO },
- { VLC_FOURCC( 'm', 'p', '1', 'v' ), CODEC_ID_MPEG1VIDEO },
-#if LIBAVCODEC_BUILD >= 4676
- { VLC_FOURCC( 'm', 'p', '2', 'v' ), CODEC_ID_MPEG2VIDEO },
-#endif
- { VLC_FOURCC( 'm', 'p', '4', 'v'), CODEC_ID_MPEG4 },
- { VLC_FOURCC( 'D', 'I', 'V', '1' ), CODEC_ID_MSMPEG4V1 },
- { VLC_FOURCC( 'D', 'I', 'V', '2' ), CODEC_ID_MSMPEG4V2 },
- { VLC_FOURCC( 'D', 'I', 'V', '3' ), CODEC_ID_MSMPEG4V3 },
- { VLC_FOURCC( 'H', '2', '6', '3' ), CODEC_ID_H263 },
- { VLC_FOURCC( 'I', '2', '6', '3' ), CODEC_ID_H263I },
- { VLC_FOURCC( 'h', 'u', 'f', 'f' ), CODEC_ID_HUFFYUV },
- { VLC_FOURCC( 'W', 'M', 'V', '1' ), CODEC_ID_WMV1 },
- { VLC_FOURCC( 'W', 'M', 'V', '2' ), CODEC_ID_WMV2 },
- { VLC_FOURCC( 'M', 'J', 'P', 'G' ), CODEC_ID_MJPEG },
- { VLC_FOURCC( 'm', 'j', 'p', 'b' ), CODEC_ID_MJPEGB },
- { VLC_FOURCC( 'd', 'v', 's', 'l' ), CODEC_ID_DVVIDEO },
- { VLC_FOURCC( 'S', 'V', 'Q', '1' ), CODEC_ID_SVQ1 },
-#if LIBAVCODEC_BUILD >= 4666
- { VLC_FOURCC( 'S', 'V', 'Q', '3' ), CODEC_ID_SVQ3 },
- { VLC_FOURCC( 'h', '2', '6', '4' ), CODEC_ID_H264 },
-#endif
-#if LIBAVCODEC_BUILD >= 4719
- { VLC_FOURCC( 'S', 'N', 'O', 'W' ), CODEC_ID_SNOW },
-#endif
-
- /* raw video code, only used for 'encoding' */
- { VLC_FOURCC( 'I', '4', '2', '0' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'I', '4', '2', '2' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'I', '4', '4', '4' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'R', 'V', '1', '5' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'R', 'V', '1', '6' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'R', 'V', '2', '4' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'R', 'V', '3', '2' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'Y', 'U', 'Y', '2' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'Y', 'V', '1', '2' ), CODEC_ID_RAWVIDEO },
- { VLC_FOURCC( 'I', 'Y', 'U', 'V' ), CODEC_ID_RAWVIDEO },
-
{ VLC_FOURCC( 0, 0, 0, 0 ), 0 }
};
return 0;
}
-static inline int get_ff_chroma( vlc_fourcc_t i_chroma )
-{
- switch( i_chroma )
- {
- case VLC_FOURCC( 'Y', 'V', '1', '2' ):
- case VLC_FOURCC( 'I', 'Y', 'U', 'V' ):
- case VLC_FOURCC( 'I', '4', '2', '0' ):
- return PIX_FMT_YUV420P;
- case VLC_FOURCC( 'I', '4', '2', '2' ):
- return PIX_FMT_YUV422P;
- case VLC_FOURCC( 'I', '4', '4', '4' ):
- return PIX_FMT_YUV444P;
- case VLC_FOURCC( 'R', 'V', '1', '5' ):
- return PIX_FMT_RGB555;
- case VLC_FOURCC( 'R', 'V', '1', '6' ):
- return PIX_FMT_RGB565;
- case VLC_FOURCC( 'R', 'V', '2', '4' ):
- return PIX_FMT_BGR24;
- case VLC_FOURCC( 'R', 'V', '3', '2' ):
- return PIX_FMT_RGBA32;
- case VLC_FOURCC( 'G', 'R', 'E', 'Y' ):
- return PIX_FMT_GRAY8;
- case VLC_FOURCC( 'Y', 'U', 'Y', '2' ):
- return PIX_FMT_YUV422;
- default:
- return 0;
- }
-}
-
-static inline vlc_fourcc_t get_vlc_chroma( int i_pix_fmt )
-{
- switch( i_pix_fmt )
- {
- case PIX_FMT_YUV420P:
- return VLC_FOURCC('I','4','2','0');
- case PIX_FMT_YUV422P:
- return VLC_FOURCC('I','4','2','2');
- case PIX_FMT_YUV444P:
- return VLC_FOURCC('I','4','4','4');
-
- case PIX_FMT_YUV422:
- return VLC_FOURCC('Y','U','Y','2');
-
- case PIX_FMT_RGB555:
- return VLC_FOURCC('R','V','1','5');
- case PIX_FMT_RGB565:
- return VLC_FOURCC('R','V','1','6');
- case PIX_FMT_RGB24:
- return VLC_FOURCC('R','V','2','4');
- case PIX_FMT_RGBA32:
- return VLC_FOURCC('R','V','3','2');
- case PIX_FMT_GRAY8:
- return VLC_FOURCC('G','R','E','Y');
-
- case PIX_FMT_YUV410P:
- case PIX_FMT_YUV411P:
- case PIX_FMT_BGR24:
- default:
- return 0;
- }
-}
-
-static int transcode_audio_ffmpeg_new( sout_stream_t *p_stream,
- sout_stream_id_t *id )
+static int transcode_audio_new( sout_stream_t *p_stream,
+ sout_stream_id_t *id )
{
int i_ff_codec;
- if( id->f_src.i_codec == VLC_FOURCC('s','1','6','l') ||
- id->f_src.i_codec == VLC_FOURCC('s','1','6','b') ||
- id->f_src.i_codec == VLC_FOURCC('s','8',' ',' ') ||
- id->f_src.i_codec == VLC_FOURCC('u','8',' ',' ') )
+ if( id->p_decoder->fmt_in.i_codec == VLC_FOURCC('s','1','6','l') ||
+ id->p_decoder->fmt_in.i_codec == VLC_FOURCC('s','1','6','b') ||
+ id->p_decoder->fmt_in.i_codec == VLC_FOURCC('s','8',' ',' ') ||
+ id->p_decoder->fmt_in.i_codec == VLC_FOURCC('u','8',' ',' ') )
{
id->ff_dec = NULL;
id->ff_dec_c = avcodec_alloc_context();
- id->ff_dec_c->sample_rate = id->f_src.audio.i_rate;
- id->ff_dec_c->channels = id->f_src.audio.i_channels;
- id->ff_dec_c->block_align = id->f_src.audio.i_blockalign;
- id->ff_dec_c->bit_rate = id->f_src.i_bitrate;
+ id->ff_dec_c->sample_rate = id->p_decoder->fmt_in.audio.i_rate;
+ id->ff_dec_c->channels = id->p_decoder->fmt_in.audio.i_channels;
+ id->ff_dec_c->block_align = id->p_decoder->fmt_in.audio.i_blockalign;
+ id->ff_dec_c->bit_rate = id->p_decoder->fmt_in.i_bitrate;
}
else
{
/* find decoder */
- i_ff_codec = get_ff_codec( id->f_src.i_codec );
+ i_ff_codec = get_ff_codec( id->p_decoder->fmt_in.i_codec );
if( i_ff_codec == 0 )
{
msg_Err( p_stream, "cannot find decoder id" );
}
id->ff_dec_c = avcodec_alloc_context();
- id->ff_dec_c->sample_rate = id->f_src.audio.i_rate;
- id->ff_dec_c->channels = id->f_src.audio.i_channels;
- id->ff_dec_c->block_align = id->f_src.audio.i_blockalign;
- id->ff_dec_c->bit_rate = id->f_src.i_bitrate;
+ id->ff_dec_c->sample_rate = id->p_decoder->fmt_in.audio.i_rate;
+ id->ff_dec_c->channels = id->p_decoder->fmt_in.audio.i_channels;
+ id->ff_dec_c->block_align = id->p_decoder->fmt_in.audio.i_blockalign;
+ id->ff_dec_c->bit_rate = id->p_decoder->fmt_in.i_bitrate;
- id->ff_dec_c->extradata_size = id->f_src.i_extra;
- id->ff_dec_c->extradata = id->f_src.p_extra;
+ id->ff_dec_c->extradata_size = id->p_decoder->fmt_in.i_extra;
+ id->ff_dec_c->extradata = id->p_decoder->fmt_in.p_extra;
if( avcodec_open( id->ff_dec_c, id->ff_dec ) )
{
msg_Err( p_stream, "cannot open decoder" );
id->p_buffer = malloc( id->i_buffer );
/* Sanity check for audio channels */
- id->f_dst.audio.i_channels =
- __MIN( id->f_dst.audio.i_channels, id->f_src.audio.i_channels );
-
- /* find encoder */
- id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
+ id->p_encoder->fmt_out.audio.i_channels =
+ __MIN( id->p_encoder->fmt_out.audio.i_channels,
+ id->p_decoder->fmt_in.audio.i_channels );
/* Initialization of encoder format structures */
es_format_Init( &id->p_encoder->fmt_in, AUDIO_ES, AOUT_FMT_S16_NE );
id->p_encoder->fmt_in.audio.i_format = AOUT_FMT_S16_NE;
- id->p_encoder->fmt_in.audio.i_rate = id->f_dst.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_in.audio.i_original_channels =
- pi_channels_maps[id->f_dst.audio.i_channels];
- id->p_encoder->fmt_in.audio.i_channels = id->f_dst.audio.i_channels;
+ pi_channels_maps[id->p_encoder->fmt_out.audio.i_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 = 16;
- id->p_encoder->fmt_out = id->f_dst;
-
id->p_encoder->p_cfg = p_stream->p_sys->p_audio_cfg;
- /* Attach object to parent so object variables inheritance works */
- vlc_object_attach( id->p_encoder, p_stream );
-
id->p_encoder->p_module =
module_Need( id->p_encoder, "encoder",
p_stream->p_sys->psz_aenc, VLC_TRUE );
return VLC_EGENERIC;
}
- id->b_enc_inited = VLC_FALSE;
-
- id->f_dst = id->p_encoder->fmt_out;
-
- /* Hack for mp3 transcoding support */
- if( id->f_dst.i_codec == VLC_FOURCC( 'm','p','3',' ' ) )
- {
- id->f_dst.i_codec = VLC_FOURCC( 'm','p','g','a' );
- }
+ /* 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' );
return VLC_SUCCESS;
}
-static void transcode_audio_ffmpeg_close( sout_stream_t *p_stream,
- sout_stream_id_t *id )
+static void transcode_audio_close( sout_stream_t *p_stream,
+ sout_stream_id_t *id )
{
if( id->ff_dec ) avcodec_close( id->ff_dec_c );
av_free( id->ff_dec_c );
free( id->p_buffer );
}
-static int transcode_audio_ffmpeg_process( sout_stream_t *p_stream,
- sout_stream_id_t *id,
- block_t *in,
- block_t **out )
+static int transcode_audio_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;
aout_buffer_t aout_buf;
else
{
int16_t *sout = (int16_t*)id->p_buffer;
+ vlc_fourcc_t i_codec = id->p_decoder->fmt_in.i_codec;
- if( id->f_src.i_codec == VLC_FOURCC( 's', '8', ' ', ' ' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'u', '8', ' ', ' ' ) )
+ if( i_codec == VLC_FOURCC('s','8',' ',' ') ||
+ i_codec == VLC_FOURCC('u','8',' ',' ') )
{
int8_t *sin = (int8_t*)p_buffer;
int i_used = __MIN( id->i_buffer/2, i_buffer );
int i_samples = i_used;
- if( id->f_src.i_codec == VLC_FOURCC( 's', '8', ' ', ' ' ) )
+ if( i_codec == VLC_FOURCC('s','8',' ',' ') )
while( i_samples > 0 )
{
*sout++ = ( *sin++ ) << 8;
p_buffer += i_used;
id->i_buffer_pos = i_used * 2;
}
- else if( id->f_src.i_codec == VLC_FOURCC( 's', '1', '6', 'l' ) ||
- id->f_src.i_codec == VLC_FOURCC( 's', '1', '6', 'b' ) )
+ else if( i_codec == VLC_FOURCC('s','1','6','l') ||
+ i_codec == VLC_FOURCC('s','1','6','b') )
{
int16_t *sin = (int16_t*)p_buffer;
int i_used = __MIN( id->i_buffer, i_buffer );
memcpy( sout, sin, i_used );
#ifdef WORDS_BIGENDIAN
- if( id->f_src.i_codec == VLC_FOURCC( 's', '1', '6', 'l' ) )
+ if( i_codec == VLC_FOURCC('s','1','6','l') )
#else
- if( id->f_src.i_codec == VLC_FOURCC( 's', '1', '6', 'b' ) )
+ if( i_codec == VLC_FOURCC('s','1','6','b') )
#endif
{
uint8_t *dat = (uint8_t*)sout;
if( id->i_buffer_pos == 0 ) continue;
- /* Encode as much data as possible */
- if( !id->b_enc_inited && id->p_encoder->pf_header )
- {
- block_t *p_block_tmp;
-
- p_block = id->p_encoder->pf_header( id->p_encoder );
- p_block_tmp = p_block;
- while( p_block_tmp )
- {
- p_block_tmp->i_dts = p_block_tmp->i_pts = in->i_dts;
- p_block_tmp = p_block_tmp->p_next;
- }
- block_ChainAppend( out, p_block );
-
- id->b_enc_inited = VLC_TRUE;
- }
-
aout_buf.p_buffer = id->p_buffer;
aout_buf.i_nb_bytes = id->i_buffer_pos;
- aout_buf.i_nb_samples = id->i_buffer_pos/2/id->f_src.audio.i_channels;
+ aout_buf.i_nb_samples = id->i_buffer_pos / 2 /
+ id->p_decoder->fmt_in.audio.i_channels;
aout_buf.start_date = id->i_dts;
aout_buf.end_date = id->i_dts;
}
id->i_dts += ( I64C(1000000) * id->i_buffer_pos / 2 /
- id->f_src.audio.i_channels / id->f_src.audio.i_rate );
+ id->p_decoder->fmt_in.audio.i_channels /
+ id->p_decoder->fmt_in.audio.i_rate );
if( id->p_encoder->fmt_in.audio.i_channels == 1 &&
- id->f_src.audio.i_channels > 1 )
+ id->p_decoder->fmt_in.audio.i_channels > 1 )
{
int16_t *p_sample = (int16_t *)aout_buf.p_buffer;
- int i_src_c = id->f_src.audio.i_channels;
+ int i_src_c = id->p_decoder->fmt_in.audio.i_channels;
unsigned int i;
for( i = 0; i < aout_buf.i_nb_samples; i++ )
aout_buf.i_nb_bytes = i * 2;
}
else if( id->p_encoder->fmt_in.audio.i_channels == 2 &&
- id->f_src.audio.i_channels > 2 )
+ id->p_decoder->fmt_in.audio.i_channels > 2 )
{
- int i_src_c = id->f_src.audio.i_channels;
+ int i_src_c = id->p_decoder->fmt_in.audio.i_channels;
unsigned int i;
- static const float mixf_l[4][6] = /* [i_src_c - 3][channel index] */
+ static const float mixf_l[4][6] =/* [i_src_c - 3][channel index] */
{
{ 0.00, 1.00, 0.00, 0.00, 0.00, 0.00 }, /* 3 channels */
{ 0.00, 0.50, 0.50, 0.00, 0.00, 0.00 }, /* 4 channels */
{ 0.00, 0.50, 0.00, 0.50, 0.00, 0.00 }, /* 5 channels */
{ 0.00, 0.34, 0.33, 0.00, 0.33, 0.00 }, /* 6 channels */
};
- static const float mixf_r[4][6] = /* [i_src_c - 3][channel index] */
+ static const float mixf_r[4][6] =/* [i_src_c - 3][channel index] */
{
{ 0.00, 1.00, 0.00, 0.00, 0.00, 0.00 }, /* 3 channels */
{ 0.00, 0.00, 0.50, 0.50, 0.00, 0.00 }, /* 4 channels */
}
aout_buf.i_nb_bytes = i * 2 * 2;
}
- else if( id->f_src.audio.i_channels !=
+ else if( id->p_decoder->fmt_in.audio.i_channels !=
id->p_encoder->fmt_in.audio.i_channels )
{
unsigned int i;
for( j = 0 ; j < id->p_encoder->fmt_in.audio.i_channels; j++ )
{
p_buffer[i*id->p_encoder->fmt_in.audio.i_channels+j] =
- p_buffer[i*id->f_src.audio.i_channels+
- translation[id->f_src.audio.i_channels][j]];
+ p_buffer[i*id->p_decoder->fmt_in.audio.i_channels +
+ translation[id->p_decoder->fmt_in.audio.i_channels][j]];
}
}
aout_buf.i_nb_bytes = i*id->p_encoder->fmt_in.audio.i_channels * 2;
/*
* video
*/
-static int transcode_video_ffmpeg_new( sout_stream_t *p_stream,
- sout_stream_id_t *id )
+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_ff_codec;
- /* Open decoder */
- if( id->f_src.i_codec == VLC_FOURCC( 'I', '4', '2', '0' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'I', '4', '2', '2' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'I', '4', '4', '4' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'Y', 'V', '1', '2' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'Y', 'U', 'Y', '2' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'I', 'Y', 'U', 'V' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'R', 'V', '1', '5' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'R', 'V', '1', '6' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'R', 'V', '2', '4' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'R', 'V', '3', '2' ) ||
- id->f_src.i_codec == VLC_FOURCC( 'G', 'R', 'E', 'Y' ) )
- {
- id->ff_dec = NULL;
- id->ff_dec_c = avcodec_alloc_context();
- id->ff_dec_c->width = id->f_src.video.i_width;
- id->ff_dec_c->height = id->f_src.video.i_height;
- id->ff_dec_c->pix_fmt = get_ff_chroma( id->f_src.i_codec );
-
-#if LIBAVCODEC_BUILD >= 4687
- if( id->ff_dec_c->width )
- id->ff_dec_c->sample_aspect_ratio =
- av_d2q( id->f_src.video.i_aspect / (double)VOUT_ASPECT_FACTOR *
- id->ff_dec_c->height / id->ff_dec_c->width, 255 );
-#else
- id->ff_dec_c->aspect_ratio =
- id->f_src.video.i_aspect / (float)VOUT_ASPECT_FACTOR;
-#endif
- }
- else
- {
- /* find decoder */
- i_ff_codec = get_ff_codec( id->f_src.i_codec );
- if( i_ff_codec == 0 )
- {
- msg_Err( p_stream, "cannot find decoder" );
- return VLC_EGENERIC;
- }
+ /*
+ * Open decoder
+ */
- id->ff_dec = avcodec_find_decoder( i_ff_codec );
- if( !id->ff_dec )
- {
- msg_Err( p_stream, "cannot find decoder" );
- return VLC_EGENERIC;
- }
+ /* Initialization of decoder structures */
+ id->p_decoder->pf_decode_video = 0;
+ id->p_decoder->pf_vout_buffer_new = video_new_buffer;
+ id->p_decoder->pf_vout_buffer_del = video_del_buffer;
+ id->p_decoder->pf_picture_link = video_link_picture;
+ id->p_decoder->pf_picture_unlink = video_unlink_picture;
+ //id->p_decoder->p_cfg = p_sys->p_video_cfg;
- id->ff_dec_c = avcodec_alloc_context();
- id->ff_dec_c->width = id->f_src.video.i_width;
- id->ff_dec_c->height = id->f_src.video.i_height;
- id->ff_dec_c->bits_per_sample=id->f_src.video.i_bits_per_pixel;
- /* id->ff_dec_c->bit_rate = id->f_src.i_bitrate; */
-
- if( id->f_src.i_extra > 0 )
- {
- if( i_ff_codec == CODEC_ID_SVQ3 )
- {
- int i_size = id->f_src.i_extra;
- uint8_t *p;
-
- id->ff_dec_c->extradata_size = i_size + 12;
- p = id->ff_dec_c->extradata = malloc( i_size + 12 );
-
- memcpy( &p[0], "SVQ3", 4 );
- memset( &p[4], 0, 8 );
- memcpy( &p[12], id->f_src.p_extra, i_size );
-
- /* Now remove all atoms before the SMI one */
- if( id->ff_dec_c->extradata_size > 0x5a && strncmp( &p[0x56], "SMI ", 4 ) )
- {
- uint8_t *psz = &p[0x52];
-
- while( psz < &p[id->ff_dec_c->extradata_size - 8] )
- {
- int i_size = GetDWBE( psz );
- if( i_size <= 1 )
- {
- /* FIXME handle 1 as long size */
- break;
- }
- if( !strncmp( &psz[4], "SMI ", 4 ) )
- {
- memmove( &p[0x52], psz, &p[id->ff_dec_c->extradata_size] - psz );
- break;
- }
- psz += i_size;
- }
- }
- }
- else
- {
- id->ff_dec_c->extradata_size= id->f_src.i_extra;
- id->ff_dec_c->extradata = malloc( id->f_src.i_extra + FF_INPUT_BUFFER_PADDING_SIZE );
-
- memcpy( id->ff_dec_c->extradata, id->f_src.p_extra, id->f_src.i_extra );
- memset( (uint8_t*)id->ff_dec_c->extradata + id->f_src.i_extra, 0, FF_INPUT_BUFFER_PADDING_SIZE );
- }
- }
- id->ff_dec_c->workaround_bugs = FF_BUG_AUTODETECT;
- id->ff_dec_c->error_resilience= -1;
- id->ff_dec_c->get_buffer = transcode_video_ffmpeg_getframebuf;
- id->ff_dec_c->opaque = p_sys;
+ id->p_decoder->p_module =
+ module_Need( id->p_decoder, "decoder", "$codec", 0 );
- if( avcodec_open( id->ff_dec_c, id->ff_dec ) < 0 )
- {
- msg_Err( p_stream, "cannot open decoder" );
- av_free( id->ff_dec_c );
- return VLC_EGENERIC;
- }
+ if( !id->p_decoder->p_module )
+ {
+ msg_Err( p_stream, "cannot find decoder" );
+ return VLC_EGENERIC;
}
- /* Open encoder */
- id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
+ /*
+ * Open encoder.
+ * Because some info about the decoded input will only be available
+ * once the first frame is decoded, we actually only test the availability
+ * of the encoder here.
+ */
/* Initialization of encoder format structures */
- es_format_Init( &id->p_encoder->fmt_in,
- id->f_src.i_cat, get_vlc_chroma(id->ff_dec_c->pix_fmt) );
+ es_format_Init( &id->p_encoder->fmt_in, id->p_decoder->fmt_in.i_cat,
+ id->p_decoder->fmt_out.i_codec );
+ id->p_encoder->fmt_in.video.i_chroma = id->p_decoder->fmt_out.i_codec;
/* The dimensions will be set properly later on.
- * Just put sensible values so we can test if there is an encoder. */
+ * Just put sensible values so we can test an encoder is available. */
id->p_encoder->fmt_in.video.i_width =
- id->f_src.video.i_width ? id->f_src.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->f_src.video.i_height ? id->f_src.video.i_height : 16;
-
- id->p_encoder->fmt_in.video.i_frame_rate = 25; /* FIXME as it break mpeg */
- id->p_encoder->fmt_in.video.i_frame_rate_base= 1;
- if( id->ff_dec )
- {
- id->p_encoder->fmt_in.video.i_frame_rate = id->ff_dec_c->frame_rate;
-#if LIBAVCODEC_BUILD >= 4662
- id->p_encoder->fmt_in.video.i_frame_rate_base =
- id->ff_dec_c->frame_rate_base;
-#endif
-
-#if LIBAVCODEC_BUILD >= 4687
- if( id->ff_dec_c->height )
- id->p_encoder->fmt_in.video.i_aspect = VOUT_ASPECT_FACTOR *
- ( av_q2d(id->ff_dec_c->sample_aspect_ratio) *
- id->ff_dec_c->width / id->ff_dec_c->height );
-#else
- id->p_encoder->fmt_in.video.i_aspect = VOUT_ASPECT_FACTOR *
- id->ff_dec_c->aspect_ratio;
-#endif
- }
-
- /* Override with user settings */
- if( p_sys->f_fps > 0 )
- {
- id->p_encoder->fmt_in.video.i_frame_rate = p_sys->f_fps * 1000;
- id->p_encoder->fmt_in.video.i_frame_rate_base = 1000;
- }
-
- id->f_dst.video.i_frame_rate = id->p_encoder->fmt_in.video.i_frame_rate;
- id->f_dst.video.i_frame_rate_base =
- id->p_encoder->fmt_in.video.i_frame_rate_base;
-
- /* Check whether a particular aspect ratio was requested */
- if( id->f_src.video.i_aspect )
- {
- id->p_encoder->fmt_in.video.i_aspect = id->f_src.video.i_aspect;
- id->f_dst.video.i_aspect = id->f_src.video.i_aspect;
- }
-
- id->p_encoder->fmt_out = id->p_encoder->fmt_in;
- id->p_encoder->fmt_out.i_codec = id->f_dst.i_codec;
- id->p_encoder->fmt_out.i_bitrate = id->f_dst.i_bitrate;
+ 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 = 25;
+ id->p_encoder->fmt_in.video.i_frame_rate_base = 1;
id->p_encoder->i_threads = p_sys->i_threads;
-
- id->p_ff_pic = avcodec_alloc_frame();
- id->p_ff_pic_tmp0 = NULL;
- id->p_ff_pic_tmp1 = NULL;
- id->p_ff_pic_tmp2 = NULL;
- id->p_ff_pic_tmp3 = NULL;
- id->p_vresample = NULL;
-
id->p_encoder->p_cfg = p_sys->p_video_cfg;
- /* Attach object to parent so object variables inheritance works */
- vlc_object_attach( id->p_encoder, p_stream );
-
id->p_encoder->p_module =
module_Need( id->p_encoder, "encoder", p_sys->psz_venc, VLC_TRUE );
-
if( !id->p_encoder->p_module )
{
- vlc_object_detach( id->p_encoder );
- vlc_object_destroy( id->p_encoder );
- av_free( id->ff_dec_c );
msg_Err( p_stream, "cannot find encoder" );
+ module_Unneed( id->p_decoder, id->p_decoder->p_module );
+ id->p_decoder->p_module = 0;
return VLC_EGENERIC;
}
/* Close the encoder.
- * We'll open it only when we have the first frame */
+ * We'll open it only when we have the first frame. */
module_Unneed( id->p_encoder, id->p_encoder->p_module );
id->p_encoder->p_module = NULL;
- id->b_enc_inited = VLC_FALSE;
-
- if ( p_sys->i_threads >= 1 )
+ if( p_sys->i_threads >= 1 )
{
p_sys->id_video = id;
vlc_mutex_init( p_stream, &p_sys->lock_out );
if( vlc_thread_create( p_sys, "encoder", EncoderThread,
VLC_THREAD_PRIORITY_VIDEO, VLC_FALSE ) )
{
- vlc_object_detach( id->p_encoder );
- vlc_object_destroy( id->p_encoder );
- av_free( id->ff_dec_c );
msg_Err( p_stream, "cannot spawn encoder thread" );
+ module_Unneed( id->p_decoder, id->p_decoder->p_module );
+ id->p_decoder->p_module = 0;
return VLC_EGENERIC;
}
}
return VLC_SUCCESS;
}
-static void transcode_video_ffmpeg_close ( sout_stream_t *p_stream,
- sout_stream_id_t *id )
+static int transcode_video_encoder_open( sout_stream_t *p_stream,
+ sout_stream_id_t *id )
{
- if ( p_stream->p_sys->i_threads >= 1 )
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+
+ /* Hack because of the copy packetizer which can fail to detect the
+ * proper size (which forces us to wait until the 1st frame
+ * is decoded) */
+ int i_width = id->p_decoder->fmt_out.video.i_width -
+ p_sys->i_crop_left - p_sys->i_crop_right;
+ int i_height = id->p_decoder->fmt_out.video.i_height -
+ p_sys->i_crop_top - p_sys->i_crop_bottom;
+
+ if( id->p_encoder->fmt_out.video.i_width <= 0 &&
+ id->p_encoder->fmt_out.video.i_height <= 0 && p_sys->f_scale )
+ {
+ /* Apply the scaling */
+ id->p_encoder->fmt_out.video.i_width = i_width * p_sys->f_scale;
+ id->p_encoder->fmt_out.video.i_height = i_height * p_sys->f_scale;
+ }
+ else if( id->p_encoder->fmt_out.video.i_width > 0 &&
+ id->p_encoder->fmt_out.video.i_height <= 0 )
+ {
+ id->p_encoder->fmt_out.video.i_height =
+ id->p_encoder->fmt_out.video.i_width / (double)i_width * i_height;
+ }
+ else if( id->p_encoder->fmt_out.video.i_width <= 0 &&
+ id->p_encoder->fmt_out.video.i_height > 0 )
{
- vlc_mutex_lock( &p_stream->p_sys->lock_out );
- p_stream->p_sys->b_die = 1;
- vlc_cond_signal( &p_stream->p_sys->cond );
- vlc_mutex_unlock( &p_stream->p_sys->lock_out );
- vlc_thread_join( p_stream->p_sys );
- vlc_mutex_destroy( &p_stream->p_sys->lock_out );
- vlc_cond_destroy( &p_stream->p_sys->cond );
+ id->p_encoder->fmt_out.video.i_width =
+ id->p_encoder->fmt_out.video.i_height / (double)i_height * i_width;
}
- /* Close decoder */
- if( id->ff_dec ) avcodec_close( id->ff_dec_c );
- av_free( id->ff_dec_c );
+ id->p_encoder->fmt_in.video.i_width =
+ id->p_encoder->fmt_out.video.i_width;
+ id->p_encoder->fmt_in.video.i_height =
+ id->p_encoder->fmt_out.video.i_height;
- /* Close encoder */
- if( id->p_encoder->p_module )
- module_Unneed( id->p_encoder, id->p_encoder->p_module );
- vlc_object_detach( id->p_encoder );
- vlc_object_destroy( id->p_encoder );
+ if( !id->p_encoder->fmt_out.video.i_frame_rate ||
+ !id->p_encoder->fmt_out.video.i_frame_rate_base )
+ {
+ if( id->p_decoder->fmt_out.video.i_frame_rate &&
+ id->p_decoder->fmt_out.video.i_frame_rate_base )
+ {
+ id->p_encoder->fmt_out.video.i_frame_rate =
+ id->p_decoder->fmt_out.video.i_frame_rate;
+ id->p_encoder->fmt_out.video.i_frame_rate_base =
+ id->p_decoder->fmt_out.video.i_frame_rate_base;
+ }
+ else
+ {
+ /* Pick a sensible default value */
+ id->p_encoder->fmt_out.video.i_frame_rate = 25;
+ id->p_encoder->fmt_out.video.i_frame_rate_base = 1;
+ }
+ }
- /* Misc cleanup */
- if( id->p_ff_pic)
+ id->p_encoder->fmt_in.video.i_frame_rate =
+ id->p_encoder->fmt_out.video.i_frame_rate;
+ id->p_encoder->fmt_in.video.i_frame_rate_base =
+ id->p_encoder->fmt_out.video.i_frame_rate_base;
+
+ date_Init( &id->interpolated_pts,
+ id->p_encoder->fmt_out.video.i_frame_rate,
+ id->p_encoder->fmt_out.video.i_frame_rate_base );
+
+ /* Check whether a particular aspect ratio was requested */
+ if( !id->p_encoder->fmt_out.video.i_aspect )
{
- free( id->p_ff_pic );
+ id->p_encoder->fmt_out.video.i_aspect =
+ id->p_decoder->fmt_out.video.i_aspect;
}
+ id->p_encoder->fmt_in.video.i_aspect =
+ id->p_encoder->fmt_out.video.i_aspect;
- if( id->p_ff_pic_tmp0 )
+ id->p_encoder->p_module =
+ module_Need( id->p_encoder, "encoder", p_sys->psz_venc, VLC_TRUE );
+ if( !id->p_encoder->p_module )
{
- free( id->p_ff_pic_tmp0->data[0] );
- free( id->p_ff_pic_tmp0 );
+ msg_Err( p_stream, "cannot find encoder" );
+ return VLC_EGENERIC;
}
- if( id->p_ff_pic_tmp1 )
+
+ 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') )
{
- free( id->p_ff_pic_tmp1->data[0] );
- free( id->p_ff_pic_tmp1 );
+ id->p_encoder->fmt_out.i_codec = VLC_FOURCC('m','p','g','v');
}
- if( id->p_ff_pic_tmp2 )
+
+ id->id = p_stream->p_sys->p_out->pf_add( p_stream->p_sys->p_out,
+ &id->p_encoder->fmt_out );
+ if( !id->id )
{
- free( id->p_ff_pic_tmp2->data[0] );
- free( id->p_ff_pic_tmp2 );
+ msg_Err( p_stream, "cannot add this stream" );
+ return VLC_EGENERIC;
}
- if( id->p_ff_pic_tmp3 )
+
+ return VLC_SUCCESS;
+}
+
+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 )
{
- free( id->p_ff_pic_tmp3->data[0] );
- free( id->p_ff_pic_tmp3 );
+ vlc_mutex_lock( &p_stream->p_sys->lock_out );
+ p_stream->p_sys->b_die = 1;
+ vlc_cond_signal( &p_stream->p_sys->cond );
+ vlc_mutex_unlock( &p_stream->p_sys->lock_out );
+ vlc_thread_join( p_stream->p_sys );
+ vlc_mutex_destroy( &p_stream->p_sys->lock_out );
+ vlc_cond_destroy( &p_stream->p_sys->cond );
}
- if( id->p_vresample )
+
+ /* Close decoder */
+ if( id->p_decoder->p_module )
+ module_Unneed( id->p_decoder, id->p_decoder->p_module );
+
+ /* Close encoder */
+ if( id->p_encoder->p_module )
+ module_Unneed( id->p_encoder, id->p_encoder->p_module );
+
+ /* Close filters */
+ for( i = 0; i < id->i_filter; i++ )
{
- img_resample_close( id->p_vresample );
+ 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] );
}
}
-static int transcode_video_ffmpeg_process( sout_stream_t *p_stream,
- sout_stream_id_t *id, block_t *in, block_t **out )
+static int transcode_video_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;
- int i_used, b_gotpicture, i_duplicate = 1;
- AVFrame *frame;
- mtime_t i_pts;
-
- int i_data;
- uint8_t *p_data;
-
+ int i_duplicate = 1, i;
+ picture_t *p_pic;
*out = NULL;
- i_data = in->i_buffer;
- p_data = in->p_buffer;
-
- for( ;; )
+ while( (p_pic = id->p_decoder->pf_decode_video( id->p_decoder, &in )) )
{
- block_t *p_block;
- picture_t * p_pic;
- int i_plane;
subpicture_t *p_subpic = 0;
- /* decode frame */
- frame = id->p_ff_pic;
- p_sys->i_input_pts = in->i_pts;
- p_sys->i_input_dts = in->i_dts;
- if( id->ff_dec )
- {
- i_used = avcodec_decode_video( id->ff_dec_c, frame,
- &b_gotpicture,
- p_data, i_data );
- }
- else
- {
- /* raw video */
- avpicture_fill( (AVPicture*)frame, p_data,
- id->ff_dec_c->pix_fmt,
- id->ff_dec_c->width, id->ff_dec_c->height );
- i_used = i_data;
- b_gotpicture = 1;
-
- /* Set PTS */
- frame->pts = p_sys->i_input_pts ? p_sys->i_input_pts :
- AV_NOPTS_VALUE;
-
- frame->pict_type = FF_I_TYPE;
- }
-
- if( i_used < 0 )
- {
- msg_Warn( p_stream, "error");
- return VLC_EGENERIC;
- }
- i_data -= i_used;
- p_data += i_used;
-
- if( !b_gotpicture )
- {
- return VLC_SUCCESS;
- }
-
- /* Get the pts of the decoded frame if any, otherwise keep the
- * interpolated one */
- if( frame->pts != AV_NOPTS_VALUE )
- {
- p_sys->i_output_pts = frame->pts;
- }
- i_pts = p_sys->i_output_pts;
-
- /* Sanity check (seems to be needed for some streams ) */
- if( frame->pict_type == FF_B_TYPE )
- {
- p_sys->b_input_has_b_frames = VLC_TRUE;
- }
-
if( p_sys->b_audio_sync )
{
mtime_t i_video_drift;
mtime_t i_master_drift = p_sys->i_master_drift;
+ mtime_t i_pts;
- if( !id->i_initial_pts ) id->i_initial_pts = p_sys->i_output_pts;
+ if( !id->i_initial_pts ) id->i_initial_pts = p_pic->date;
if( !i_master_drift )
{
}
i_pts = date_Get( &id->interpolated_pts ) + 1;
- i_video_drift = p_sys->i_output_pts - i_pts;
+ i_video_drift = p_pic->date - i_pts;
i_duplicate = 1;
+ /* Set the pts of the frame being encoded */
+ p_pic->date = i_pts;
+
if( i_video_drift < i_master_drift - 50000 )
{
msg_Dbg( p_stream, "dropping frame (%i)",
date_Increment( &id->interpolated_pts, 1 );
}
- if( !id->b_enc_inited )
+ if( !id->p_encoder->p_module )
{
- /* Hack because of the copy packetizer which can fail to detect the
- * proper size (which forces us to wait until the 1st frame
- * is decoded) */
- int i_width = id->ff_dec_c->width - p_sys->i_crop_left -
- p_sys->i_crop_right;
- int i_height = id->ff_dec_c->height - p_sys->i_crop_top -
- p_sys->i_crop_bottom;
-
- if( id->f_dst.video.i_width <= 0 && id->f_dst.video.i_height <= 0
- && p_sys->f_scale )
+ if( transcode_video_encoder_open( p_stream, id ) != VLC_SUCCESS )
{
- /* Apply the scaling */
- id->f_dst.video.i_width = i_width * p_sys->f_scale;
- id->f_dst.video.i_height = i_height * p_sys->f_scale;
- }
- else if( id->f_dst.video.i_width > 0 &&
- id->f_dst.video.i_height <= 0 )
- {
- id->f_dst.video.i_height =
- id->f_dst.video.i_width / (double)i_width * i_height;
- }
- else if( id->f_dst.video.i_width <= 0 &&
- id->f_dst.video.i_height > 0 )
- {
- id->f_dst.video.i_width =
- id->f_dst.video.i_height / (double)i_height * i_width;
- }
-
- id->p_encoder->fmt_in.video.i_width = id->f_dst.video.i_width;
- id->p_encoder->fmt_in.video.i_height = id->f_dst.video.i_height;
- id->p_encoder->fmt_out = id->f_dst;
-
- id->p_encoder->p_module =
- module_Need( id->p_encoder, "encoder",
- p_sys->psz_venc, VLC_TRUE );
- if( !id->p_encoder->p_module )
- {
- vlc_object_destroy( id->p_encoder );
- msg_Err( p_stream, "cannot find encoder" );
+ transcode_video_close( p_stream, id );
id->b_transcode = VLC_FALSE;
- return VLC_EGENERIC;
- }
-
- id->f_dst = id->p_encoder->fmt_out;
-
- /* Hack for mp2v/mp1v transcoding support */
- if( id->f_dst.i_codec == VLC_FOURCC( 'm','p','1','v' ) ||
- id->f_dst.i_codec == VLC_FOURCC( 'm','p','2','v' ) )
- {
- id->f_dst.i_codec = VLC_FOURCC( 'm','p','g','v' );
}
- if( !( id->id =
- p_stream->p_sys->p_out->pf_add( p_stream->p_sys->p_out,
- &id->f_dst ) ) )
+ /* Check if we need a filter for chroma conversion or resizing */
+ if( id->p_decoder->fmt_out.video.i_chroma !=
+ id->p_encoder->fmt_in.video.i_chroma ||
+ id->p_decoder->fmt_out.video.i_width !=
+ id->p_encoder->fmt_out.video.i_width ||
+ id->p_decoder->fmt_out.video.i_height !=
+ id->p_encoder->fmt_out.video.i_height ||
+ p_sys->i_crop_top > 0 || p_sys->i_crop_bottom > 0 ||
+ p_sys->i_crop_left > 0 || p_sys->i_crop_right > 0 )
{
- msg_Err( p_stream, "cannot add this stream" );
- transcode_video_ffmpeg_close( p_stream, id );
- id->b_transcode = VLC_FALSE;
- return VLC_EGENERIC;
- }
-
- if( id->p_encoder->pf_header )
- {
- block_t *p_block_tmp;
-
- p_block = id->p_encoder->pf_header( id->p_encoder );
- p_block_tmp = p_block;
- while( p_block_tmp )
+ id->pp_filter[0] =
+ vlc_object_create( p_stream, VLC_OBJECT_FILTER );
+ vlc_object_attach( id->pp_filter[0], p_stream );
+
+ id->pp_filter[0]->pf_vout_buffer_new = video_new_buffer;
+ id->pp_filter[0]->pf_vout_buffer_del = video_del_buffer;
+
+ id->pp_filter[0]->fmt_in = id->p_decoder->fmt_out;
+ id->pp_filter[0]->fmt_out = id->p_encoder->fmt_in;
+ id->pp_filter[0]->p_module =
+ module_Need( id->pp_filter[0], "video filter2", 0, 0 );
+ if( id->pp_filter[0]->p_module ) id->i_filter++;
+ else
{
- p_block_tmp->i_dts = p_block_tmp->i_pts = in->i_dts;
- p_block_tmp = p_block_tmp->p_next;
+ msg_Dbg( p_stream, "no video filter found" );
+ vlc_object_detach( id->pp_filter[0] );
+ vlc_object_destroy( id->pp_filter[0] );
}
- block_ChainAppend( out, p_block );
}
-
- id->i_inter_pixfmt =
- get_ff_chroma( id->p_encoder->fmt_in.i_codec );
-
- id->b_enc_inited = VLC_TRUE;
}
- /* deinterlace */
+ /* Deinterlace */
if( p_stream->p_sys->b_deinterlace )
{
- if( id->p_ff_pic_tmp0 == NULL )
- {
- int i_size;
- uint8_t *buf;
- id->p_ff_pic_tmp0 = avcodec_alloc_frame();
- i_size = avpicture_get_size( id->ff_dec_c->pix_fmt,
- id->ff_dec_c->width,
- id->ff_dec_c->height );
-
- buf = malloc( i_size );
-
- avpicture_fill( (AVPicture*)id->p_ff_pic_tmp0, buf,
- id->i_inter_pixfmt,
- id->ff_dec_c->width, id->ff_dec_c->height );
- }
-
- avpicture_deinterlace( (AVPicture*)id->p_ff_pic_tmp0,
- (AVPicture*)frame, id->ff_dec_c->pix_fmt,
- id->ff_dec_c->width, id->ff_dec_c->height );
-
-#if LIBAVCODEC_BUILD >= 4685
- id->p_ff_pic_tmp0->interlaced_frame = 0;
-#endif
- id->p_ff_pic_tmp0->repeat_pict = frame->repeat_pict;
- frame = id->p_ff_pic_tmp0;
- }
-
- /* convert pix format */
- if( id->ff_dec_c->pix_fmt != id->i_inter_pixfmt )
- {
- if( id->p_ff_pic_tmp1 == NULL )
- {
- int i_size;
- uint8_t *buf;
- id->p_ff_pic_tmp1 = avcodec_alloc_frame();
- i_size = avpicture_get_size( id->i_inter_pixfmt,
- id->ff_dec_c->width,
- id->ff_dec_c->height );
-
- buf = malloc( i_size );
-
- avpicture_fill( (AVPicture*)id->p_ff_pic_tmp1, buf,
- id->i_inter_pixfmt,
- id->ff_dec_c->width, id->ff_dec_c->height );
- }
-
- img_convert( (AVPicture*)id->p_ff_pic_tmp1, id->i_inter_pixfmt,
- (AVPicture*)frame, id->ff_dec_c->pix_fmt,
- id->ff_dec_c->width, id->ff_dec_c->height );
-
- id->p_ff_pic_tmp1->repeat_pict = frame->repeat_pict;
-#if LIBAVCODEC_BUILD >= 4685
- id->p_ff_pic_tmp1->interlaced_frame = frame->interlaced_frame;
- id->p_ff_pic_tmp1->top_field_first = frame->top_field_first;
-#endif
- frame = id->p_ff_pic_tmp1;
}
- /* convert size and crop */
- if( id->ff_dec_c->width != id->f_dst.video.i_width ||
- id->ff_dec_c->height != id->f_dst.video.i_height ||
- p_sys->i_crop_top > 0 || p_sys->i_crop_bottom > 0 ||
- p_sys->i_crop_left > 0 || p_sys->i_crop_right > 0 )
+ /* Run filter chain */
+ for( i = 0; i < id->i_filter; i++ )
{
- if( id->p_ff_pic_tmp2 == NULL )
- {
- int i_size;
- uint8_t *buf;
- id->p_ff_pic_tmp2 = avcodec_alloc_frame();
- i_size = avpicture_get_size( id->i_inter_pixfmt,
- id->f_dst.video.i_width,
- id->f_dst.video.i_height );
-
- buf = malloc( i_size );
-
- avpicture_fill( (AVPicture*)id->p_ff_pic_tmp2, buf,
- id->i_inter_pixfmt,
- id->f_dst.video.i_width,
- id->f_dst.video.i_height );
-
- id->p_vresample =
- img_resample_full_init( id->f_dst.video.i_width,
- id->f_dst.video.i_height,
- id->ff_dec_c->width,
- id->ff_dec_c->height,
- p_stream->p_sys->i_crop_top,
- p_stream->p_sys->i_crop_bottom,
- p_stream->p_sys->i_crop_left,
- p_stream->p_sys->i_crop_right
-#if LIBAVCODEC_BUILD >= 4708
- ,0, 0, 0, 0 );
-#else
- );
-#endif
- }
-
- img_resample( id->p_vresample, (AVPicture*)id->p_ff_pic_tmp2,
- (AVPicture*)frame );
-
- id->p_ff_pic_tmp2->repeat_pict = frame->repeat_pict;
-#if LIBAVCODEC_BUILD >= 4685
- id->p_ff_pic_tmp2->interlaced_frame = frame->interlaced_frame;
- id->p_ff_pic_tmp2->top_field_first = frame->top_field_first;
-#endif
- frame = id->p_ff_pic_tmp2;
+ p_pic = id->pp_filter[i]->pf_video_filter(id->pp_filter[i], p_pic);
}
- /* Encoding */
- p_pic = malloc(sizeof(picture_t));
- vout_InitPicture( VLC_OBJECT(p_stream), p_pic,
- id->p_encoder->fmt_in.i_codec,
- id->f_dst.video.i_width, id->f_dst.video.i_height,
- id->f_dst.video.i_width * VOUT_ASPECT_FACTOR /
- id->f_dst.video.i_height );
+ /*
+ * Encoding
+ */
/* Check if we have a subpicture to overlay */
if( p_sys->p_filter_blend )
{
- p_subpic = transcode_spu_get( p_stream, id, p_sys->i_output_pts );
-
- if( p_subpic && frame != id->p_ff_pic_tmp0 &&
- frame != id->p_ff_pic_tmp1 && frame != id->p_ff_pic_tmp2 )
- {
- if( id->p_ff_pic_tmp3 == NULL )
- {
- uint8_t *buf = malloc( frame->linesize[0] *
- p_pic->p[0].i_lines * 3 );
- id->p_ff_pic_tmp3 = avcodec_alloc_frame();
- *id->p_ff_pic_tmp3 = *frame;
- id->p_ff_pic_tmp3->data[0] = buf;
- id->p_ff_pic_tmp3->data[1] = id->p_ff_pic_tmp3->data[0] +
- frame->linesize[0] * p_pic->p[0].i_lines;
- id->p_ff_pic_tmp3->data[2] = id->p_ff_pic_tmp3->data[1] +
- frame->linesize[1] * p_pic->p[1].i_lines;
- }
-
- for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
- {
- p_stream->p_vlc->pf_memcpy(
- id->p_ff_pic_tmp3->data[i_plane],
- frame->data[i_plane],
- p_pic->p[i_plane].i_lines * frame->linesize[i_plane] );
- }
-
- id->p_ff_pic_tmp3->repeat_pict = frame->repeat_pict;
-#if LIBAVCODEC_BUILD >= 4685
- id->p_ff_pic_tmp3->interlaced_frame = frame->interlaced_frame;
- id->p_ff_pic_tmp3->top_field_first = frame->top_field_first;
-#endif
- frame = id->p_ff_pic_tmp3;
- }
- }
-
- for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
- {
- p_pic->p[i_plane].i_pitch = frame->linesize[i_plane];
- if ( p_sys->i_threads >= 1 )
- {
- p_pic->p[i_plane].p_pixels = malloc(p_pic->p[i_plane].i_lines *
- p_pic->p[i_plane].i_pitch);
- p_stream->p_vlc->pf_memcpy( p_pic->p[i_plane].p_pixels,
- frame->data[i_plane], p_pic->p[i_plane].i_lines *
- p_pic->p[i_plane].i_pitch );
- }
- else
- {
- p_pic->p[i_plane].p_pixels = frame->data[i_plane];
- }
- }
-
- /* Set the pts of the frame being encoded */
- p_pic->date = i_pts;
-
- p_pic->i_nb_fields = frame->repeat_pict;
-#if LIBAVCODEC_BUILD >= 4685
- p_pic->b_progressive = !frame->interlaced_frame;
- p_pic->b_top_field_first = frame->top_field_first;
-#endif
-
- /* Interpolate the next PTS
- * (needed by the mpeg video packetizer which can send pts <= 0 ) */
- if( id->ff_dec_c && id->ff_dec_c->frame_rate > 0 )
- {
- p_sys->i_output_pts += I64C(1000000) * (2 + frame->repeat_pict) *
- id->ff_dec_c->frame_rate_base / (2 * id->ff_dec_c->frame_rate);
+ p_subpic = transcode_spu_get( p_stream, id, p_pic->date );
+ /* TODO: get another pic */
}
/* Overlay subpicture */
}
}
- if ( p_sys->i_threads >= 1 )
+ if( p_sys->i_threads >= 1 )
{
vlc_mutex_lock( &p_sys->lock_out );
p_sys->pp_pics[p_sys->i_last_pic++] = p_pic;
if( p_sys->b_audio_sync && i_duplicate > 1 )
{
- i_pts = date_Get( &id->interpolated_pts ) + 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 );
+ p_block = id->p_encoder->pf_encode_video(id->p_encoder, p_pic);
block_ChainAppend( out, p_block );
}
- free( p_pic );
- }
-
- if( i_data <= 0 )
- {
- return VLC_SUCCESS;
+ p_pic->pf_release( p_pic );
}
}
return VLC_SUCCESS;
}
-static int EncoderThread( sout_stream_sys_t * p_sys )
+static int EncoderThread( sout_stream_sys_t *p_sys )
{
- sout_stream_id_t * id = p_sys->id_video;
- picture_t * p_pic;
+ sout_stream_id_t *id = p_sys->id_video;
+ picture_t *p_pic;
int i_plane;
- while ( !p_sys->b_die && !p_sys->b_error )
+ while( !p_sys->b_die && !p_sys->b_error )
{
block_t *p_block;
vlc_mutex_lock( &p_sys->lock_out );
- while ( p_sys->i_last_pic == p_sys->i_first_pic )
+ 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( p_sys->b_die || p_sys->b_error ) break;
}
- if ( p_sys->b_die || p_sys->b_error )
+ if( p_sys->b_die || p_sys->b_error )
{
vlc_mutex_unlock( &p_sys->lock_out );
break;
free( p_pic );
}
- while ( p_sys->i_last_pic != p_sys->i_first_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;
return 0;
}
-/*****************************************************************************
- * transcode_video_ffmpeg_getframebuf:
- *
- * Callback used by ffmpeg to get a frame buffer.
- * We use it to get the right PTS for each decoded picture.
- *****************************************************************************/
-static int transcode_video_ffmpeg_getframebuf(struct AVCodecContext *p_context,
- AVFrame *p_frame)
+struct picture_sys_t
{
- sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_context->opaque;
+ decoder_t *p_dec;
+};
- /* Set PTS */
- if( p_sys->i_input_pts )
- {
- p_frame->pts = p_sys->i_input_pts;
- }
- else if( p_sys->i_input_dts )
+static void video_release_buffer( picture_t *p_pic )
+{
+ if( p_pic && !p_pic->i_refcount && p_pic->pf_release && p_pic->p_sys )
{
- /* Some demuxers/packetizers only set the dts so let's try to find a
- * useful timestamp from this */
- if( !p_context->has_b_frames || !p_sys->b_input_has_b_frames ||
- !p_frame->reference || !p_sys->i_output_pts )
- {
- p_frame->pts = p_sys->i_input_dts +
- /* Hack: ffmpeg encoding doesn't like frames with identical pts */
- (p_sys->i_output_pts ? 0 : 50000);
- }
- else p_frame->pts = AV_NOPTS_VALUE;
+ video_del_buffer( p_pic->p_sys->p_dec, p_pic );
}
- else p_frame->pts = AV_NOPTS_VALUE;
+ else if( p_pic && p_pic->i_refcount > 0 ) p_pic->i_refcount--;
+}
- if( p_sys->i_output_pts ) /* make sure 1st frame has a pts > 0 */
+static picture_t *video_new_buffer( decoder_t *p_dec )
+{
+ picture_t *p_pic = malloc( sizeof(picture_t) );
+
+ p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
+ vout_AllocatePicture( VLC_OBJECT(p_dec), p_pic,
+ 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->i_planes )
{
- p_sys->i_input_pts = 0;
- p_sys->i_input_dts = 0;
+ free( p_pic );
+ return 0;
}
- return avcodec_default_get_buffer( p_context, p_frame );
+ p_pic->pf_release = video_release_buffer;
+ p_pic->p_sys = malloc( sizeof(picture_sys_t) );
+ p_pic->p_sys->p_dec = p_dec;
+
+ return p_pic;
+}
+
+static void video_del_buffer( decoder_t *p_dec, picture_t *p_pic )
+{
+ if( p_pic && p_pic->p_data ) free( p_pic->p_data );
+ if( p_pic && p_pic->p_sys ) free( p_pic->p_sys );
+ if( p_pic ) free( p_pic );
+}
+
+static void video_link_picture( decoder_t *p_dec, picture_t *p_pic )
+{
+ p_pic->i_refcount++;
+}
+
+static void video_unlink_picture( decoder_t *p_dec, picture_t *p_pic )
+{
+ video_release_buffer( p_pic );
}
/*
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- /* Open decoder */
- id->p_decoder = vlc_object_create( p_stream, VLC_OBJECT_DECODER );
+ /*
+ * Open decoder
+ */
- /* Initialization of decoder format structures */
- id->p_decoder->fmt_in = id->f_src;
+ /* Initialization of decoder structures */
id->p_decoder->pf_spu_buffer_new = spu_new_buffer;
id->p_decoder->pf_spu_buffer_del = spu_del_buffer;
//id->p_decoder->p_cfg = p_sys->p_spu_cfg;
- /* Attach object to parent so object variables inheritance works */
- vlc_object_attach( id->p_decoder, p_stream );
-
id->p_decoder->p_module =
- module_Need( id->p_decoder, "decoder", "$codec", VLC_TRUE );
+ module_Need( id->p_decoder, "decoder", "$codec", 0 );
if( !id->p_decoder->p_module )
{
- vlc_object_detach( id->p_decoder );
- vlc_object_destroy( id->p_decoder );
msg_Err( p_stream, "cannot find decoder" );
return VLC_EGENERIC;
}
if( !p_sys->b_soverlay )
{
- /* Open encoder */
- id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
+ /*
+ * Open encoder
+ */
/* Initialization of encoder format structures */
- es_format_Init( &id->p_encoder->fmt_in,
- id->f_src.i_cat, id->f_src.i_codec );
-
- id->p_encoder->fmt_out = id->f_dst;
+ es_format_Init( &id->p_encoder->fmt_in, id->p_decoder->fmt_in.i_cat,
+ id->p_decoder->fmt_in.i_codec );
id->p_encoder->p_cfg = p_sys->p_spu_cfg;
- /* Attach object to parent so object variables inheritance works */
- vlc_object_attach( id->p_encoder, p_stream );
-
id->p_encoder->p_module =
module_Need( id->p_encoder, "encoder", p_sys->psz_senc, VLC_TRUE );
if( !id->p_encoder->p_module )
{
module_Unneed( id->p_decoder, id->p_decoder->p_module );
- vlc_object_detach( id->p_decoder );
- vlc_object_destroy( id->p_decoder );
-
- vlc_object_detach( id->p_encoder );
- vlc_object_destroy( id->p_encoder );
msg_Err( p_stream, "cannot find encoder" );
return VLC_EGENERIC;
}
-
- id->f_dst = id->p_encoder->fmt_out;
}
else
{
p_sys->p_filter_blend =
- vlc_object_create( p_stream, sizeof(filter_t) );
+ vlc_object_create( p_stream, VLC_OBJECT_FILTER );
vlc_object_attach( p_sys->p_filter_blend, p_stream );
p_sys->p_filter_blend->fmt_out.video.i_chroma =
VLC_FOURCC('I','4','2','0');
/* Close decoder */
if( id->p_decoder->p_module )
module_Unneed( id->p_decoder, id->p_decoder->p_module );
- vlc_object_detach( id->p_decoder );
- vlc_object_destroy( id->p_decoder );
/* Close encoder */
- if( id->p_encoder )
- {
- if( id->p_encoder->p_module )
- module_Unneed( id->p_encoder, id->p_encoder->p_module );
- vlc_object_detach( id->p_encoder );
- vlc_object_destroy( id->p_encoder );
- }
+ if( id->p_encoder->p_module )
+ module_Unneed( id->p_encoder, id->p_encoder->p_module );
/* Free subpictures */
for( i = 0; i < SUBPICTURE_RING_SIZE; i++ )
projects / vlc / blobdiff