* video.c: video decoder using the ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: video.c,v 1.48 2003/11/22 23:39:14 fenrir Exp $
+ * $Id: video.c,v 1.67 2004/02/25 17:48:52 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
/* Video decoder specific part */
mtime_t input_pts;
+ mtime_t input_dts;
mtime_t i_pts;
AVFrame *p_ff_pic;
/* Postprocessing handle */
void *p_pp;
+ vlc_bool_t b_pp;
+ vlc_bool_t b_pp_async;
vlc_bool_t b_pp_init;
};
+/* FIXME (dummy palette for now) */
+static AVPaletteControl palette_control;
+
/*****************************************************************************
* Local prototypes
*****************************************************************************/
p_dec->fmt_out.i_codec = VLC_FOURCC('I','4','2','0');
}
+ /* If an aspect-ratio was specified in the input format then force it */
+ if( p_dec->fmt_in.video.i_aspect )
+ {
+ p_dec->fmt_out.video.i_aspect = p_dec->fmt_in.video.i_aspect;
+ }
+ else
+ {
#if LIBAVCODEC_BUILD >= 4687
- p_dec->fmt_out.video.i_aspect =
- VOUT_ASPECT_FACTOR * ( av_q2d(p_context->sample_aspect_ratio) *
- p_context->width / p_context->height );
+ p_dec->fmt_out.video.i_aspect =
+ VOUT_ASPECT_FACTOR * ( av_q2d(p_context->sample_aspect_ratio) *
+ p_context->width / p_context->height );
#else
- p_dec->fmt_out.video.i_aspect =
- VOUT_ASPECT_FACTOR * p_context->aspect_ratio;
-#endif
- if( p_dec->fmt_out.video.i_aspect == 0 )
- {
p_dec->fmt_out.video.i_aspect =
- VOUT_ASPECT_FACTOR * p_context->width / p_context->height;
+ VOUT_ASPECT_FACTOR * p_context->aspect_ratio;
+#endif
+ if( p_dec->fmt_out.video.i_aspect == 0 )
+ {
+ p_dec->fmt_out.video.i_aspect =
+ VOUT_ASPECT_FACTOR * p_context->width / p_context->height;
+ }
}
p_pic = p_dec->pf_vout_buffer_new( p_dec );
#ifdef LIBAVCODEC_PP
- if( p_sys->p_pp && !p_sys->b_pp_init )
+ if( p_sys->p_pp && p_sys->b_pp && !p_sys->b_pp_init )
{
E_(InitPostproc)( p_dec, p_sys->p_pp, p_context->width,
p_context->height, p_context->pix_fmt );
AVCodec *p_codec, int i_codec_id, char *psz_namecodec )
{
decoder_sys_t *p_sys;
+ vlc_value_t lockval;
vlc_value_t val;
int i_tmp;
+
+ var_Get( p_dec->p_libvlc, "avcodec", &lockval );
+
/* Allocate the memory needed to store the decoder's structure */
if( ( p_dec->p_sys = p_sys =
(decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
/* ***** Fill p_context with init values ***** */
p_sys->p_context->width = p_dec->fmt_in.video.i_width;
p_sys->p_context->height = p_dec->fmt_in.video.i_height;
+ p_sys->p_context->bits_per_sample = p_dec->fmt_in.video.i_bits_per_pixel;
/* ***** Get configuration of ffmpeg plugin ***** */
i_tmp = config_GetInt( p_dec, "ffmpeg-workaround-bugs" );
if( val.b_bool ) p_sys->p_context->flags |= CODEC_FLAG_GRAY;
/* Decide if we set CODEC_FLAG_TRUNCATED */
-#if LIBAVCODEC_BUILD >= 4662
var_Create( p_dec, "ffmpeg-truncated", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
var_Get( p_dec, "ffmpeg-truncated", &val );
if( val.i_int > 0 ) p_sys->p_context->flags |= CODEC_FLAG_TRUNCATED;
-#endif
-
- /* ***** Open the codec ***** */
- if( avcodec_open( p_sys->p_context, p_sys->p_codec ) < 0 )
- {
- msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
- return VLC_EGENERIC;
- }
- else
- {
- msg_Dbg( p_dec, "ffmpeg codec (%s) started", p_sys->psz_namecodec );
- }
/* ***** ffmpeg frame skipping ***** */
var_Create( p_dec, "ffmpeg-hurry-up", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
#ifdef LIBAVCODEC_PP
p_sys->p_pp = NULL;
- p_dec->p_sys->b_pp_init = VLC_FALSE;
- if( E_(OpenPostproc)( p_dec, &p_sys->p_pp ) == VLC_SUCCESS )
- {
- /* for now we cannot do postproc and dr */
- p_sys->b_direct_rendering = 0;
- }
+ p_sys->b_pp = p_sys->b_pp_async = p_sys->b_pp_init = VLC_FALSE;
+ p_sys->p_pp = E_(OpenPostproc)( p_dec, &p_sys->b_pp_async );
#endif
/* ffmpeg doesn't properly release old pictures when frames are skipped */
- if( p_sys->b_hurry_up ) p_sys->b_direct_rendering = 0;
+ //if( p_sys->b_hurry_up ) p_sys->b_direct_rendering = 0;
if( p_sys->b_direct_rendering )
{
msg_Dbg( p_dec, "using direct rendering" );
/* ***** init this codec with special data ***** */
if( p_dec->fmt_in.i_extra )
{
- int b_gotpicture;
int i_size = p_dec->fmt_in.i_extra;
- if( p_sys->i_codec_id == CODEC_ID_MPEG4 )
- {
- uint8_t *p_vol = malloc( i_size + FF_INPUT_BUFFER_PADDING_SIZE );
- memcpy( p_vol, p_dec->fmt_in.p_extra, i_size );
- memset( &p_vol[i_size], 0, FF_INPUT_BUFFER_PADDING_SIZE );
-
- avcodec_decode_video( p_sys->p_context, p_sys->p_ff_pic,
- &b_gotpicture, p_vol, i_size );
- free( p_vol );
- }
-#if LIBAVCODEC_BUILD >= 4666
- else if( p_sys->i_codec_id == CODEC_ID_SVQ3 )
+ if( p_sys->i_codec_id == CODEC_ID_SVQ3 )
{
uint8_t *p;
memset( &p[4], 0, 8 );
memcpy( &p[12], p_dec->fmt_in.p_extra, i_size );
}
-#endif
+ else if( p_dec->fmt_in.i_codec == VLC_FOURCC( 'R', 'V', '1', '0' ) ||
+ p_dec->fmt_in.i_codec == VLC_FOURCC( 'R', 'V', '1', '3' ) ||
+ p_dec->fmt_in.i_codec == VLC_FOURCC( 'R', 'V', '2', '0' ) )
+ {
+ if( p_dec->fmt_in.i_extra == 8 )
+ {
+ p_sys->p_context->extradata_size = 8;
+ p_sys->p_context->extradata = malloc( 8 );
+
+ memcpy( p_sys->p_context->extradata,
+ p_dec->fmt_in.p_extra,
+ p_dec->fmt_in.i_extra );
+ p_sys->p_context->sub_id= ((uint32_t*)p_dec->fmt_in.p_extra)[1];
+
+ msg_Warn( p_dec, "using extra data for RV codec sub_id=%08x", p_sys->p_context->sub_id );
+ }
+ }
else
{
p_sys->p_context->extradata_size = i_size;
}
/* ***** misc init ***** */
- p_sys->input_pts = 0;
+ p_sys->input_pts = p_sys->input_dts = 0;
p_sys->i_pts = 0;
p_sys->b_has_b_frames = VLC_FALSE;
p_sys->i_late_frames = 0;
p_dec->fmt_out.i_cat = VIDEO_ES;
p_dec->fmt_out.i_codec = ffmpeg_PixFmtToChroma( p_context->pix_fmt );
+ /* Setup palette */
+#if LIBAVCODEC_BUILD >= 4688
+ if( p_dec->fmt_in.video.p_palette )
+ p_sys->p_context->palctrl =
+ (AVPaletteControl *)p_dec->fmt_in.video.p_palette;
+ else
+ p_sys->p_context->palctrl = &palette_control;
+#endif
+
+ /* ***** Open the codec ***** */
+ vlc_mutex_lock( lockval.p_address );
+ if( avcodec_open( p_sys->p_context, p_sys->p_codec ) < 0 )
+ {
+ vlc_mutex_unlock( lockval.p_address );
+ msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
+ return VLC_EGENERIC;
+ }
+ vlc_mutex_unlock( lockval.p_address );
+ msg_Dbg( p_dec, "ffmpeg codec (%s) started", p_sys->psz_namecodec );
+
+
return VLC_SUCCESS;
}
p_block = *pp_block;
- if( p_block->i_pts > 0 )
+ if( p_block->i_flags&BLOCK_FLAG_DISCONTINUITY )
+ {
+ p_sys->i_buffer = 0;
+ p_sys->i_pts = 0; /* To make sure we recover properly */
+
+ block_Release( p_block );
+ return NULL;
+ }
+
+ if( p_sys->i_late_frames > 0 &&
+ mdate() - p_sys->i_late_frames_start > I64C(5000000) )
+ {
+ if( p_sys->i_pts )
+ {
+ msg_Err( p_dec, "more than 5 seconds of late video -> "
+ "dropping frame (computer too slow ?)" );
+ p_sys->i_pts = 0; /* To make sure we recover properly */
+ }
+ block_Release( p_block );
+ p_sys->i_late_frames--;
+ return NULL;
+ }
+
+ if( p_block->i_pts > 0 || p_block->i_dts > 0 )
{
p_sys->input_pts = p_block->i_pts;
- p_block->i_pts = 0; /* Make sure we don't reuse the same pts twice */
+ p_sys->input_dts = p_block->i_dts;
+
+ /* Make sure we don't reuse the same timestamps twice */
+ p_block->i_pts = p_block->i_dts = 0;
}
/* TODO implement it in a better way */
p_sys->p_context->hurry_up = 0;
}
- if( p_sys->i_late_frames > 0 &&
- mdate() - p_sys->i_late_frames_start > I64C(5000000) )
- {
- msg_Err( p_dec, "more than 5 seconds of late video -> "
- "dropping frame (computer too slow ?)" );
- block_Release( p_block );
- p_sys->i_pts = 0; /* To make sure we recover properly */
- p_sys->i_late_frames--;
- return VLC_SUCCESS;
- }
if( p_sys->p_context->width <= 0 || p_sys->p_context->height <= 0 )
{
* Do the actual decoding now
*/
+ /* Check if post-processing was enabled */
+ p_sys->b_pp = p_sys->b_pp_async;
+
/* Don't forget that ffmpeg requires a little more bytes
* that the real frame size */
if( p_block->i_buffer > 0 )
p_sys->p_buffer += i_used;
/* Nothing to display */
- if( !b_gotpicture ) continue;
+ if( !b_gotpicture )
+ {
+ if( i_used == 0 )
+ {
+ break;
+ }
+ continue;
+ }
/* Update frame late count*/
if( p_sys->i_pts && p_sys->i_pts <= mdate() )
continue;
}
- if( !p_sys->b_direct_rendering )
+ if( !p_sys->p_ff_pic->opaque )
{
/* Get a new picture */
p_pic = ffmpeg_NewPictBuf( p_dec, p_sys->p_context );
p_pic = (picture_t *)p_sys->p_ff_pic->opaque;
}
- /* Set the PTS
- * There is an ugly hack here because some demuxers pass us a dts
- * instead of a pts so this screw up things for streams with
- * B frames. */
+ /* Set the PTS */
+ if( p_sys->p_ff_pic->pts ) p_sys->i_pts = p_sys->p_ff_pic->pts;
+
+ /* Sanity check (seems to be needed for some streams ) */
if( p_sys->p_ff_pic->pict_type == FF_B_TYPE )
- p_sys->b_has_b_frames = VLC_TRUE;
- if( p_sys->p_ff_pic->pts &&
- ( !p_sys->p_context->has_b_frames || !p_sys->b_has_b_frames ||
- p_sys->p_ff_pic->pict_type == FF_B_TYPE ) )
{
- p_sys->i_pts = p_sys->p_ff_pic->pts;
+ p_sys->b_has_b_frames = VLC_TRUE;
}
/* Send decoded frame to vout */
int i_src_stride, i_dst_stride;
#ifdef LIBAVCODEC_PP
- if( p_sys->p_pp )
+ if( p_sys->p_pp && p_sys->b_pp )
E_(PostprocPict)( p_dec, p_sys->p_pp, p_pic, p_ff_pic );
else
#endif
/* we need to convert to I420 */
switch( p_sys->p_context->pix_fmt )
{
- case( PIX_FMT_YUV410P ):
- case( PIX_FMT_YUV411P ):
+ case PIX_FMT_YUV410P:
+ case PIX_FMT_YUV411P:
+ case PIX_FMT_PAL8:
for( i = 0; i < p_pic->i_planes; i++ )
{
dest_pic.data[i] = p_pic->p[i].p_pixels;
default:
msg_Err( p_dec, "don't know how to convert chroma %i",
p_sys->p_context->pix_fmt );
- p_dec->p_fifo->b_error = 1;
+ p_dec->b_error = 1;
break;
}
}
picture_t *p_pic;
/* Set picture PTS */
- p_ff_pic->pts = p_sys->input_pts;
- p_sys->input_pts = 0;
+ if( p_sys->input_pts )
+ {
+ p_ff_pic->pts = p_sys->input_pts;
+ }
+ else if( p_sys->input_dts )
+ {
+ /* Some demuxers only set the dts so let's try to find a useful
+ * timestamp from this */
+ if( !p_context->has_b_frames || !p_sys->b_has_b_frames ||
+ !p_ff_pic->reference )
+ {
+ p_ff_pic->pts = p_sys->input_dts;
+ }
+ else p_ff_pic->pts = 0;
+ }
+ else p_ff_pic->pts = 0;
+
+ p_sys->input_pts = p_sys->input_dts = 0;
+ p_ff_pic->opaque = 0;
/* Not much to do in indirect rendering mode */
- if( !p_sys->b_direct_rendering )
+ if( !p_sys->b_direct_rendering || p_sys->b_pp )
{
return avcodec_default_get_buffer( p_context, p_ff_pic );
}
if( p_ff_pic->reference != 0 )
{
- //vout_LinkPicture( p_sys->p_vout, p_pic );
+ p_dec->pf_picture_link( p_dec, p_pic );
}
/* FIXME what is that, should give good value */
decoder_t *p_dec = (decoder_t *)p_context->opaque;
picture_t *p_pic;
- if( p_ff_pic->type != FF_BUFFER_TYPE_USER )
+ if( !p_ff_pic->opaque )
{
avcodec_default_release_buffer( p_context, p_ff_pic );
return;
if( p_ff_pic->reference != 0 )
{
- //vout_UnlinkPicture( p_sys->p_vout, p_pic );
+ p_dec->pf_picture_unlink( p_dec, p_pic );
}
}
projects / vlc / blobdiff