#include <vlc_codec.h>
#include <vlc_vout.h>
#include <vlc_codecs.h> /* BITMAPINFOHEADER */
+#include <vlc_avcodec.h>
/* ffmpeg header */
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
#endif
#include "avcodec.h"
-#include "chroma.h"
/*****************************************************************************
* decoder_sys_t : decoder descriptor
mtime_t i_pts;
AVFrame *p_ff_pic;
- BITMAPINFOHEADER *p_format;
/* for frame skipping algo */
- int b_hurry_up;
+ bool b_hurry_up;
enum AVDiscard i_skip_frame;
enum AVDiscard i_skip_idct;
mtime_t i_late_frames_start;
/* for direct rendering */
- int b_direct_rendering;
+ bool b_direct_rendering;
bool b_has_b_frames;
* Local prototypes
*****************************************************************************/
static void ffmpeg_InitCodec ( decoder_t * );
+static int ffmpeg_OpenCodec ( decoder_t * );
static void ffmpeg_CopyPicture ( decoder_t *, picture_t *, AVFrame * );
static int ffmpeg_GetFrameBuf ( struct AVCodecContext *, AVFrame * );
static int ffmpeg_ReGetFrameBuf( struct AVCodecContext *, AVFrame * );
}
}
- if( p_dec->fmt_out.video.i_frame_rate > 0 &&
- p_dec->fmt_out.video.i_frame_rate_base > 0 )
+ if( p_dec->fmt_in.video.i_frame_rate > 0 &&
+ p_dec->fmt_in.video.i_frame_rate_base > 0 )
{
p_dec->fmt_out.video.i_frame_rate =
p_dec->fmt_in.video.i_frame_rate;
p_dec->fmt_out.video.i_frame_rate_base = p_context->time_base.num;
}
- p_pic = p_dec->pf_vout_buffer_new( p_dec );
+ p_pic = decoder_NewPicture( p_dec );
return p_pic;
}
vlc_value_t val;
/* 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 )
- {
+ if( ( p_dec->p_sys = p_sys = calloc( 1, sizeof(decoder_sys_t) ) ) == NULL )
return VLC_ENOMEM;
- }
- memset( p_sys, 0, sizeof(decoder_sys_t) );
- p_dec->p_sys->p_context = p_context;
- p_dec->p_sys->p_codec = p_codec;
- p_dec->p_sys->i_codec_id = i_codec_id;
- p_dec->p_sys->psz_namecodec = psz_namecodec;
+ p_sys->p_context = p_context;
+ p_sys->p_codec = p_codec;
+ p_sys->i_codec_id = i_codec_id;
+ p_sys->psz_namecodec = psz_namecodec;
p_sys->p_ff_pic = avcodec_alloc_frame();
+ p_sys->b_delayed_open = true;
/* ***** Fill p_context with init values ***** */
p_sys->p_context->codec_tag = ffmpeg_CodecTag( p_dec->fmt_in.i_codec );
- p_sys->p_context->width = p_dec->fmt_in.video.i_width;
- p_sys->p_context->height = p_dec->fmt_in.video.i_height;
-#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- p_sys->p_context->bits_per_sample = p_dec->fmt_in.video.i_bits_per_pixel;
-#else
- p_sys->p_context->bits_per_coded_sample = p_dec->fmt_in.video.i_bits_per_pixel;
-#endif
/* ***** Get configuration of ffmpeg plugin ***** */
p_sys->p_context->workaround_bugs =
if( val.i_int > 2 ) p_sys->p_context->skip_loop_filter = AVDISCARD_NONKEY;
if( val.i_int > 3 ) p_sys->p_context->skip_loop_filter = AVDISCARD_ALL;
+ bool b_fast = var_CreateGetBool( p_dec, "ffmpeg-fast" );
+ if( b_fast ) p_sys->p_context->flags2 |= CODEC_FLAG2_FAST;
+
/* ***** ffmpeg frame skipping ***** */
var_Create( p_dec, "ffmpeg-hurry-up", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Get( p_dec, "ffmpeg-hurry-up", &val );
p_sys->i_skip_idct = p_sys->p_context->skip_idct;
/* ***** ffmpeg direct rendering ***** */
- p_sys->b_direct_rendering = 0;
+ p_sys->b_direct_rendering = false;
var_Create( p_dec, "ffmpeg-dr", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Get( p_dec, "ffmpeg-dr", &val );
if( val.b_bool && (p_sys->p_codec->capabilities & CODEC_CAP_DR1) &&
p_sys->p_context->pix_fmt != PIX_FMT_YUV422P &&
/* H264 uses too many reference frames */
p_sys->i_codec_id != CODEC_ID_H264 &&
+ /* No idea why ... but this fixes flickering on some TSCC streams */
+ p_sys->i_codec_id != CODEC_ID_TSCC &&
!p_sys->p_context->debug_mv )
{
/* Some codecs set pix_fmt only after the 1st frame has been decoded,
* so we need to do another check in ffmpeg_GetFrameBuf() */
- p_sys->b_direct_rendering = 1;
+ p_sys->b_direct_rendering = true;
}
/* 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 = false;
if( p_sys->b_direct_rendering )
{
msg_Dbg( p_dec, "using direct rendering" );
p_sys->p_context->release_buffer = ffmpeg_ReleaseFrameBuf;
p_sys->p_context->opaque = p_dec;
- /* ***** init this codec with special data ***** */
- ffmpeg_InitCodec( p_dec );
-
/* ***** misc init ***** */
p_sys->input_pts = p_sys->input_dts = 0;
p_sys->i_pts = 0;
p_sys->p_context->palctrl = &p_sys->palette;
}
+ /* ***** init this codec with special data ***** */
+ ffmpeg_InitCodec( p_dec );
+
/* ***** Open the codec ***** */
- vlc_mutex_lock( &avcodec_lock );
- if( avcodec_open( p_sys->p_context, p_sys->p_codec ) < 0 )
+ if( ffmpeg_OpenCodec( p_dec ) < 0 )
{
- vlc_mutex_unlock( &avcodec_lock );
msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
free( p_sys->p_buffer_orig );
free( p_sys );
return VLC_EGENERIC;
}
- vlc_mutex_unlock( &avcodec_lock );
- msg_Dbg( p_dec, "ffmpeg codec (%s) started", p_sys->psz_namecodec );
-
return VLC_SUCCESS;
}
int b_null_size = false;
block_t *p_block;
- if( !pp_block || !*pp_block ) return NULL;
+ if( !pp_block || !*pp_block )
+ return NULL;
if( !p_sys->p_context->extradata_size && p_dec->fmt_in.i_extra )
+ {
ffmpeg_InitCodec( p_dec );
+ if( p_sys->b_delayed_open )
+ {
+ if( ffmpeg_OpenCodec( p_dec ) )
+ msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
+ }
+ }
p_block = *pp_block;
+ if( p_sys->b_delayed_open )
+ {
+ block_Release( p_block );
+ return NULL;
+ }
if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
p_sys->p_context->skip_frame = p_sys->i_skip_frame;
b_null_size = true;
}
+ else if( !b_drawpicture )
+ {
+ /* It creates broken picture
+ * FIXME either our parser or ffmpeg is broken */
+#if 0
+ if( p_sys->b_hurry_up )
+ p_sys->p_context->skip_frame = __MAX( p_sys->p_context->skip_frame,
+ AVDISCARD_NONREF );
+#endif
+ }
/*
* Do the actual decoding now
if( i_used < 0 )
{
- msg_Warn( p_dec, "cannot decode one frame (%d bytes)",
- p_sys->i_buffer );
+ if( b_drawpicture )
+ msg_Warn( p_dec, "cannot decode one frame (%d bytes)",
+ p_sys->i_buffer );
block_Release( p_block );
return NULL;
}
/* Do not display the picture */
p_pic = (picture_t *)p_sys->p_ff_pic->opaque;
if( !b_drawpicture && p_pic )
- p_dec->pf_vout_buffer_del( p_dec, p_pic );
+ decoder_DeletePicture( p_dec, p_pic );
ffmpeg_NextPts( p_dec );
continue;
/* Send decoded frame to vout */
if( p_sys->i_pts )
{
- int i;
p_pic->date = p_sys->i_pts;
ffmpeg_NextPts( p_dec );
}
else
{
- p_dec->pf_vout_buffer_del( p_dec, p_pic );
+ decoder_DeletePicture( p_dec, p_pic );
}
}
}
}
}
- 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 );
- if( p_sys->p_context->extradata )
- {
- 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;
}
}
+/*****************************************************************************
+ * ffmpeg_OpenCodec:
+ *****************************************************************************/
+static int ffmpeg_OpenCodec( decoder_t *p_dec )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ if( p_sys->p_context->extradata_size <= 0 )
+ {
+ if( p_sys->i_codec_id == CODEC_ID_VC1 ||
+ p_sys->i_codec_id == CODEC_ID_VORBIS ||
+ p_sys->i_codec_id == CODEC_ID_THEORA )
+ {
+ msg_Warn( p_dec, "waiting for extra data for codec %s",
+ p_sys->psz_namecodec );
+ return 1;
+ }
+ }
+ p_sys->p_context->width = p_dec->fmt_in.video.i_width;
+ p_sys->p_context->height = p_dec->fmt_in.video.i_height;
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ p_sys->p_context->bits_per_sample = p_dec->fmt_in.video.i_bits_per_pixel;
+#else
+ p_sys->p_context->bits_per_coded_sample = p_dec->fmt_in.video.i_bits_per_pixel;
+#endif
+
+ int ret;
+ vlc_avcodec_lock();
+ ret = avcodec_open( p_sys->p_context, p_sys->p_codec );
+ vlc_avcodec_unlock();
+ if( ret < 0 )
+ return VLC_EGENERIC;
+ msg_Dbg( p_dec, "ffmpeg codec (%s) started", p_sys->psz_namecodec );
+
+ p_sys->b_delayed_open = false;
+
+ return VLC_SUCCESS;
+}
/*****************************************************************************
* ffmpeg_CopyPicture: copy a picture from ffmpeg internal buffers to a
* picture_t structure (when not in direct rendering mode).
p_context->pix_fmt == PIX_FMT_PAL8 )
{
msg_Dbg( p_dec, "disabling direct rendering" );
- p_sys->b_direct_rendering = 0;
+ p_sys->b_direct_rendering = false;
return avcodec_default_get_buffer( p_context, p_ff_pic );
}
p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma;
p_pic = ffmpeg_NewPictBuf( p_dec, p_sys->p_context );
if( !p_pic )
{
- p_sys->b_direct_rendering = 0;
+ p_sys->b_direct_rendering = false;
return avcodec_default_get_buffer( p_context, p_ff_pic );
}
p_sys->p_context->draw_horiz_band = NULL;
p_ff_pic->linesize[2] = p_pic->p[2].i_pitch;
p_ff_pic->linesize[3] = 0;
- if( p_ff_pic->reference != 0 )
- {
- p_dec->pf_picture_link( p_dec, p_pic );
- }
+ decoder_LinkPicture( p_dec, p_pic );
/* FIXME what is that, should give good value */
p_ff_pic->age = 256*256*256*64; // FIXME FIXME from ffmpeg
AVFrame *p_ff_pic )
{
decoder_t *p_dec = (decoder_t *)p_context->opaque;
- picture_t *p_pic;
if( !p_ff_pic->opaque )
{
return;
}
- p_pic = (picture_t*)p_ff_pic->opaque;
+ picture_t *p_pic = (picture_t*)p_ff_pic->opaque;
+ decoder_UnlinkPicture( p_dec, p_pic );
p_ff_pic->data[0] = NULL;
p_ff_pic->data[1] = NULL;
p_ff_pic->data[2] = NULL;
p_ff_pic->data[3] = NULL;
-
- if( p_ff_pic->reference != 0 )
- {
- p_dec->pf_picture_unlink( p_dec, p_pic );
- }
}
static void ffmpeg_NextPts( decoder_t *p_dec )
projects / vlc / blobdiff