#include <vlc_common.h>
#include <vlc_codec.h>
-#include <vlc_vout.h>
-#include <vlc_input.h> /* hmmm, just for INPUT_RATE_DEFAULT */
#include <vlc_codecs.h> /* BITMAPINFOHEADER */
+#include <vlc_avcodec.h>
+#include <assert.h>
/* ffmpeg header */
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
+# ifdef HAVE_AVCODEC_VAAPI
+# include <libavcodec/vaapi.h>
+# endif
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
#else
#endif
#include "avcodec.h"
-#include "chroma.h"
+#include "vaapi.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;
/* Hack to force display of still pictures */
bool b_first_frame;
- int i_buffer_orig, i_buffer;
- char *p_buffer_orig, *p_buffer;
+ /* */
+ AVPaletteControl palette;
+
+ /* */
+ bool b_flush;
+
+ /* VA API */
+ vlc_va_t *p_va;
};
/* FIXME (dummy palette for now) */
-static AVPaletteControl palette_control;
+static const AVPaletteControl palette_control;
/*****************************************************************************
* 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 * );
static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
+static void ffmpeg_NextPts( decoder_t * );
+
+#ifdef HAVE_AVCODEC_VAAPI
+static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *,
+ const enum PixelFormat * );
+#endif
static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc )
{
/*****************************************************************************
* Local Functions
*****************************************************************************/
-static uint32_t ffmpeg_PixFmtToChroma( int i_ff_chroma )
-{
- switch( i_ff_chroma )
- {
- case PIX_FMT_YUV420P:
- case PIX_FMT_YUVJ420P: /* Hacky but better then chroma conversion */
- return VLC_FOURCC('I','4','2','0');
- case PIX_FMT_YUV422P:
- case PIX_FMT_YUVJ422P: /* Hacky but better then chroma conversion */
- return VLC_FOURCC('I','4','2','2');
- case PIX_FMT_YUV444P:
- case PIX_FMT_YUVJ444P: /* Hacky but better then chroma conversion */
- return VLC_FOURCC('I','4','4','4');
-
- case PIX_FMT_YUV422:
- return VLC_FOURCC('Y','U','Y','2');
-
-#if defined(WORDS_BIGENDIAN)
- case PIX_FMT_BGR8:
- return VLC_FOURCC('R','G','B','8');
- case PIX_FMT_BGR555:
- return VLC_FOURCC('R','V','1','5');
- case PIX_FMT_BGR565:
- return VLC_FOURCC('R','V','1','6');
- case PIX_FMT_BGR24:
- return VLC_FOURCC('R','V','2','4');
-#else
-#if defined(PIX_FMT_RGB8)
- case PIX_FMT_RGB8:
- return VLC_FOURCC('R','G','B','8');
-#endif
- 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');
-#endif
- case PIX_FMT_RGBA32:
- return VLC_FOURCC('R','V','3','2');
-#ifdef PIX_FMT_RGBA
- case PIX_FMT_RGBA:
- return VLC_FOURCC('R','G','B','A');
-#endif
- case PIX_FMT_GRAY8:
- return VLC_FOURCC('G','R','E','Y');
-
- default:
-#if defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_FFMPEG_SWSCALE_H)
- if( GetVlcChroma( i_ff_chroma ) )
- return GetVlcChroma( i_ff_chroma );
-#endif
- return 0;
- }
-}
/* Returns a new picture buffer */
static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec,
AVCodecContext *p_context )
{
- picture_t *p_pic;
+ decoder_sys_t *p_sys = p_dec->p_sys;
p_dec->fmt_out.video.i_width = p_context->width;
p_dec->fmt_out.video.i_height = p_context->height;
- p_dec->fmt_out.i_codec = ffmpeg_PixFmtToChroma( p_context->pix_fmt );
if( !p_context->width || !p_context->height )
{
return NULL; /* invalid display size */
}
- if( !p_dec->fmt_out.i_codec )
+ if( !p_sys->p_va && GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) )
{
- /* we make conversion if possible*/
- p_dec->fmt_out.i_codec = VLC_FOURCC('I','4','2','0');
+ /* we are doomed, but not really, because most codecs set their pix_fmt
+ * much later
+ * FIXME does it make sense here ? */
+ p_dec->fmt_out.video.i_chroma = VLC_CODEC_I420;
}
+ p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma;
/* If an aspect-ratio was specified in the input format then force it */
if( p_dec->fmt_in.video.i_aspect )
}
}
- 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 );
-
- return p_pic;
+ return decoder_NewPicture( p_dec );
}
/*****************************************************************************
AVCodec *p_codec, int i_codec_id, const char *psz_namecodec )
{
decoder_sys_t *p_sys;
- vlc_value_t val;
+ int i_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_codec->type = CODEC_TYPE_VIDEO;
+ p_context->codec_type = CODEC_TYPE_VIDEO;
+ p_context->codec_id = i_codec_id;
+ 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;
+ p_sys->p_va = NULL;
/* ***** 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;
- p_sys->p_context->bits_per_sample = p_dec->fmt_in.video.i_bits_per_pixel;
+ p_sys->p_context->codec_tag = ffmpeg_CodecTag( p_dec->fmt_in.i_original_fourcc ?: p_dec->fmt_in.i_codec );
/* ***** Get configuration of ffmpeg plugin ***** */
p_sys->p_context->workaround_bugs =
config_GetInt( p_dec, "ffmpeg-workaround-bugs" );
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 52, 0, 0 )
p_sys->p_context->error_resilience =
config_GetInt( p_dec, "ffmpeg-error-resilience" );
+#else
+ p_sys->p_context->error_recognition =
+ config_GetInt( p_dec, "ffmpeg-error-resilience" );
+#endif
+
+ if( var_CreateGetBool( p_dec, "grayscale" ) )
+ p_sys->p_context->flags |= CODEC_FLAG_GRAY;
- var_Create( p_dec, "grayscale", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "grayscale", &val );
- if( val.b_bool ) p_sys->p_context->flags |= CODEC_FLAG_GRAY;
+ i_val = var_CreateGetInteger( p_dec, "ffmpeg-vismv" );
+ if( i_val ) p_sys->p_context->debug_mv = i_val;
- var_Create( p_dec, "ffmpeg-vismv", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "ffmpeg-vismv", &val );
- if( val.i_int ) p_sys->p_context->debug_mv = val.i_int;
+ i_val = var_CreateGetInteger( p_dec, "ffmpeg-lowres" );
+ if( i_val > 0 && i_val <= 2 ) p_sys->p_context->lowres = i_val;
- var_Create( p_dec, "ffmpeg-lowres", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "ffmpeg-lowres", &val );
- if( val.i_int > 0 && val.i_int <= 2 ) p_sys->p_context->lowres = val.i_int;
+ i_val = var_CreateGetInteger( p_dec, "ffmpeg-skiploopfilter" );
+ if( i_val >= 4 ) p_sys->p_context->skip_loop_filter = AVDISCARD_ALL;
+ else if( i_val == 3 ) p_sys->p_context->skip_loop_filter = AVDISCARD_NONKEY;
+ else if( i_val == 2 ) p_sys->p_context->skip_loop_filter = AVDISCARD_BIDIR;
+ else if( i_val == 1 ) p_sys->p_context->skip_loop_filter = AVDISCARD_NONREF;
- var_Create( p_dec, "ffmpeg-skiploopfilter",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "ffmpeg-skiploopfilter", &val );
- if( val.i_int > 0 ) p_sys->p_context->skip_loop_filter = AVDISCARD_NONREF;
- if( val.i_int > 1 ) p_sys->p_context->skip_loop_filter = AVDISCARD_BIDIR;
- 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;
+ if( var_CreateGetBool( p_dec, "ffmpeg-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->b_hurry_up = val.b_bool;
+ p_sys->b_hurry_up = var_CreateGetBool( p_dec, "ffmpeg-hurry-up" );
- var_Create( p_dec, "ffmpeg-skip-frame", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "ffmpeg-skip-frame", &val );
- switch( val.i_int )
+ switch( var_CreateGetInteger( p_dec, "ffmpeg-skip-frame" ) )
{
case -1:
p_sys->p_context->skip_frame = AVDISCARD_NONE;
}
p_sys->i_skip_frame = p_sys->p_context->skip_frame;
- var_Create( p_dec, "ffmpeg-skip-idct", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "ffmpeg-skip-idct", &val );
- switch( val.i_int )
+ switch( var_CreateGetInteger( p_dec, "ffmpeg-skip-idct" ) )
{
case -1:
p_sys->p_context->skip_idct = AVDISCARD_NONE;
p_sys->i_skip_idct = p_sys->p_context->skip_idct;
/* ***** ffmpeg direct rendering ***** */
- p_sys->b_direct_rendering = 0;
- 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->b_direct_rendering = false;
+ if( var_CreateGetBool( p_dec, "ffmpeg-dr" ) &&
+ (p_sys->p_codec->capabilities & CODEC_CAP_DR1) &&
/* Apparently direct rendering doesn't work with YUV422P */
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 );
+#ifdef HAVE_AVCODEC_VAAPI
+ if( var_CreateGetBool( p_dec, "ffmpeg-hw" ) )
+ p_sys->p_context->get_format = ffmpeg_GetFormat;
+#endif
/* ***** misc init ***** */
p_sys->input_pts = p_sys->input_dts = 0;
p_sys->i_pts = 0;
p_sys->b_has_b_frames = false;
p_sys->b_first_frame = true;
+ p_sys->b_flush = false;
p_sys->i_late_frames = 0;
- p_sys->i_buffer = 0;
- p_sys->i_buffer_orig = 1;
- p_sys->p_buffer_orig = p_sys->p_buffer = malloc( p_sys->i_buffer_orig );
- if( !p_sys->p_buffer_orig )
- {
- free( p_sys );
- return VLC_ENOMEM;
- }
/* Set output properties */
p_dec->fmt_out.i_cat = VIDEO_ES;
- p_dec->fmt_out.i_codec = ffmpeg_PixFmtToChroma( p_context->pix_fmt );
+ if( GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) != VLC_SUCCESS )
+ {
+ /* we are doomed. but not really, because most codecs set their pix_fmt later on */
+ p_dec->fmt_out.i_codec = VLC_CODEC_I420;
+ }
+ p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma;
/* Setup palette */
+ memset( &p_sys->palette, 0, sizeof(p_sys->palette) );
if( p_dec->fmt_in.video.p_palette )
- p_sys->p_context->palctrl =
- (AVPaletteControl *)p_dec->fmt_in.video.p_palette;
- else if( p_sys->i_codec_id != CODEC_ID_MSVIDEO1 && p_sys->i_codec_id != CODEC_ID_CINEPAK )
- p_sys->p_context->palctrl = &palette_control;
+ {
+ p_sys->palette.palette_changed = 1;
- /* ***** Open the codec ***** */
- vlc_mutex_t *lock = var_AcquireMutex( "avcodec" );
- if( lock == NULL )
+ for( int i = 0; i < __MIN( AVPALETTE_COUNT, p_dec->fmt_in.video.p_palette->i_entries ); i++ )
+ {
+ union {
+ uint32_t u;
+ uint8_t a[4];
+ } c;
+ c.a[0] = p_dec->fmt_in.video.p_palette->palette[i][0];
+ c.a[1] = p_dec->fmt_in.video.p_palette->palette[i][1];
+ c.a[2] = p_dec->fmt_in.video.p_palette->palette[i][2];
+ c.a[3] = p_dec->fmt_in.video.p_palette->palette[i][3];
+
+ p_sys->palette.palette[i] = c.u;
+ }
+ p_sys->p_context->palctrl = &p_sys->palette;
+
+ p_dec->fmt_out.video.p_palette = malloc( sizeof(video_palette_t) );
+ if( p_dec->fmt_out.video.p_palette )
+ *p_dec->fmt_out.video.p_palette = *p_dec->fmt_in.video.p_palette;
+ }
+ else if( p_sys->i_codec_id != CODEC_ID_MSVIDEO1 && p_sys->i_codec_id != CODEC_ID_CINEPAK )
{
- free( p_sys->p_buffer_orig );
- free( p_sys );
- return VLC_ENOMEM;
+ p_sys->p_context->palctrl = &p_sys->palette;
}
- if( avcodec_open( p_sys->p_context, p_sys->p_codec ) < 0 )
+ /* ***** init this codec with special data ***** */
+ ffmpeg_InitCodec( p_dec );
+
+ /* ***** Open the codec ***** */
+ if( ffmpeg_OpenCodec( p_dec ) < 0 )
{
- vlc_mutex_unlock( lock );
msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
- free( p_sys->p_buffer_orig );
+ av_free( p_sys->p_ff_pic );
free( p_sys );
return VLC_EGENERIC;
}
- vlc_mutex_unlock( 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->i_buffer = 0;
p_sys->i_pts = 0; /* To make sure we recover properly */
p_sys->input_pts = p_sys->input_dts = 0;
(p_sys->i_late_frames > 4) )
{
b_drawpicture = 0;
- if( p_sys->i_late_frames < 8 )
+ if( p_sys->i_late_frames < 12 )
{
p_sys->p_context->skip_frame =
(p_sys->i_skip_frame <= AVDISCARD_BIDIR) ?
* but break picture until a new I, and for mpeg4 ...*/
p_sys->i_late_frames--; /* needed else it will never be decrease */
block_Release( p_block );
- p_sys->i_buffer = 0;
return NULL;
}
}
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
* that the real frame size */
if( p_block->i_buffer > 0 )
{
- p_sys->i_buffer = p_block->i_buffer;
- if( p_sys->i_buffer + FF_INPUT_BUFFER_PADDING_SIZE >
- p_sys->i_buffer_orig )
- {
- free( p_sys->p_buffer_orig );
- p_sys->i_buffer_orig =
- p_block->i_buffer + FF_INPUT_BUFFER_PADDING_SIZE;
- p_sys->p_buffer_orig = malloc( p_sys->i_buffer_orig );
- }
- p_sys->p_buffer = p_sys->p_buffer_orig;
- p_sys->i_buffer = p_block->i_buffer;
- if( !p_sys->p_buffer )
- {
- block_Release( p_block );
+ p_sys->b_flush = ( p_block->i_flags & BLOCK_FLAG_END_OF_SEQUENCE ) != 0;
+
+ p_block = block_Realloc( p_block, 0,
+ p_block->i_buffer + FF_INPUT_BUFFER_PADDING_SIZE );
+ if( !p_block )
return NULL;
- }
- vlc_memcpy( p_sys->p_buffer, p_block->p_buffer, p_block->i_buffer );
- memset( p_sys->p_buffer + p_block->i_buffer, 0,
+ p_block->i_buffer -= FF_INPUT_BUFFER_PADDING_SIZE;
+ *pp_block = p_block;
+ memset( p_block->p_buffer + p_block->i_buffer, 0,
FF_INPUT_BUFFER_PADDING_SIZE );
-
- p_block->i_buffer = 0;
}
- while( p_sys->i_buffer > 0 )
+ while( p_block->i_buffer > 0 || p_sys->b_flush )
{
int i_used, b_gotpicture;
picture_t *p_pic;
i_used = avcodec_decode_video( p_sys->p_context, p_sys->p_ff_pic,
&b_gotpicture,
- (uint8_t*)p_sys->p_buffer, p_sys->i_buffer );
+ p_block->i_buffer <= 0 && p_sys->b_flush ? NULL : p_block->p_buffer, p_block->i_buffer );
+
if( b_null_size && p_sys->p_context->width > 0 &&
- p_sys->p_context->height > 0 )
+ p_sys->p_context->height > 0 &&
+ !p_sys->b_flush )
{
/* Reparse it to not drop the I frame */
b_null_size = false;
if( p_sys->b_hurry_up )
p_sys->p_context->skip_frame = p_sys->i_skip_frame;
i_used = avcodec_decode_video( p_sys->p_context, p_sys->p_ff_pic,
- &b_gotpicture,
- (uint8_t*)p_sys->p_buffer, p_sys->i_buffer );
+ &b_gotpicture, p_block->p_buffer,
+ p_block->i_buffer );
}
+ if( p_sys->b_flush )
+ p_sys->b_first_frame = true;
+
+ if( p_block->i_buffer <= 0 )
+ p_sys->b_flush = false;
+
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 (%zu bytes)",
+ p_block->i_buffer );
block_Release( p_block );
return NULL;
}
- else if( i_used > p_sys->i_buffer )
+ else if( i_used > p_block->i_buffer )
{
- i_used = p_sys->i_buffer;
+ i_used = p_block->i_buffer;
}
/* Consumed bytes */
- p_sys->i_buffer -= i_used;
- p_sys->p_buffer += i_used;
+ p_block->i_buffer -= i_used;
+ p_block->p_buffer += i_used;
/* Nothing to display */
if( !b_gotpicture )
continue;
}
+ /* Set the PTS */
+ if( p_sys->p_ff_pic->pts )
+ p_sys->i_pts = p_sys->p_ff_pic->pts;
+
/* Update frame late count (except when doing preroll) */
- if( p_sys->i_pts && decoder_GetDisplayDate(p_dec, p_sys->i_pts) <= mdate() &&
- !(p_block->i_flags & BLOCK_FLAG_PREROLL) )
+ mtime_t i_display_date = 0;
+ if( !(p_block->i_flags & BLOCK_FLAG_PREROLL) )
+ i_display_date = decoder_GetDisplayDate( p_dec, p_sys->i_pts );
+
+ if( i_display_date > 0 && i_display_date <= mdate() )
{
p_sys->i_late_frames++;
if( p_sys->i_late_frames == 1 )
p_sys->i_late_frames = 0;
}
- if( !b_drawpicture || !p_sys->p_ff_pic->linesize[0] )
+ if( !b_drawpicture || ( !p_sys->p_va && !p_sys->p_ff_pic->linesize[0] ) )
{
/* 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;
}
p_pic = (picture_t *)p_sys->p_ff_pic->opaque;
}
- /* 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_pic->date = p_sys->i_pts;
- /* interpolate the next PTS */
- if( p_dec->fmt_in.video.i_frame_rate > 0 &&
- p_dec->fmt_in.video.i_frame_rate_base > 0 )
- {
- p_sys->i_pts += INT64_C(1000000) *
- (2 + p_sys->p_ff_pic->repeat_pict) *
- p_dec->fmt_in.video.i_frame_rate_base *
- p_block->i_rate / INPUT_RATE_DEFAULT /
- (2 * p_dec->fmt_in.video.i_frame_rate);
- }
- else if( p_sys->p_context->time_base.den > 0 )
- {
- p_sys->i_pts += INT64_C(1000000) *
- (2 + p_sys->p_ff_pic->repeat_pict) *
- p_sys->p_context->time_base.num *
- p_block->i_rate / INPUT_RATE_DEFAULT /
- (2 * p_sys->p_context->time_base.den);
- }
+ ffmpeg_NextPts( p_dec );
if( p_sys->b_first_frame )
{
p_pic->b_progressive = !p_sys->p_ff_pic->interlaced_frame;
p_pic->b_top_field_first = p_sys->p_ff_pic->top_field_first;
+ p_pic->i_qstride = p_sys->p_ff_pic->qstride;
+ int i_mb_h = ( p_pic->format.i_height + 15 ) / 16;
+ p_pic->p_q = malloc( p_pic->i_qstride * i_mb_h );
+ memcpy( p_pic->p_q, p_sys->p_ff_pic->qscale_table,
+ p_pic->i_qstride * i_mb_h );
+ switch( p_sys->p_ff_pic->qscale_type )
+ {
+ case FF_QSCALE_TYPE_MPEG1:
+ p_pic->i_qtype = QTYPE_MPEG1;
+ break;
+ case FF_QSCALE_TYPE_MPEG2:
+ p_pic->i_qtype = QTYPE_MPEG2;
+ break;
+ case FF_QSCALE_TYPE_H264:
+ p_pic->i_qtype = QTYPE_H264;
+ break;
+ }
+
return p_pic;
}
else
{
- p_dec->pf_vout_buffer_del( p_dec, p_pic );
+ decoder_DeletePicture( p_dec, p_pic );
}
}
{
decoder_sys_t *p_sys = p_dec->p_sys;
+ /* do not flush buffers if codec hasn't been opened (theora/vorbis/VC1) */
+ if( p_sys->p_context->codec )
+ avcodec_flush_buffers( p_sys->p_context );
+
if( p_sys->p_ff_pic ) av_free( p_sys->p_ff_pic );
- free( p_sys->p_buffer_orig );
+
+ if( p_sys->p_va )
+ VaDelete( p_sys->p_va );
}
/*****************************************************************************
}
}
}
- 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 < AV_VERSION_INT(52, 0, 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;
+
+ if( p_sys->p_va )
+ {
+ char psz_version[128];
+
+ VaVersion( p_sys->p_va, psz_version, sizeof(psz_version) );
+ msg_Info( p_dec, "Using VA API version %s for hardware decoding.", psz_version );
+ }
+
+ return VLC_SUCCESS;
+}
/*****************************************************************************
* ffmpeg_CopyPicture: copy a picture from ffmpeg internal buffers to a
* picture_t structure (when not in direct rendering mode).
{
decoder_sys_t *p_sys = p_dec->p_sys;
- if( ffmpeg_PixFmtToChroma( p_sys->p_context->pix_fmt ) )
+ if( p_sys->p_va )
+ {
+ VaExtract( p_sys->p_va, p_pic, p_ff_pic );
+ }
+ else if( TestFfmpegChroma( p_sys->p_context->pix_fmt, -1 ) == VLC_SUCCESS )
{
int i_plane, i_size, i_line;
uint8_t *p_dst, *p_src;
}
else
{
- AVPicture dest_pic;
- int i;
-
- /* we need to convert to I420 */
- switch( p_sys->p_context->pix_fmt )
- {
- case PIX_FMT_YUV410P:
- case PIX_FMT_YUV411P:
- case PIX_FMT_RGB32:
- case PIX_FMT_RGB24:
-#if defined(PIX_FMT_RGB8)
- case PIX_FMT_RGB8:
-#endif
-#if defined(PIX_FMT_BRG32)
- case PIX_FMT_BGR32:
-#endif
- case PIX_FMT_BGR24:
-#if defined(PIX_FMT_BGR8)
- case PIX_FMT_BGR8:
-#endif
- case PIX_FMT_PAL8:
- for( i = 0; i < p_pic->i_planes; i++ )
- {
- dest_pic.data[i] = p_pic->p[i].p_pixels;
- dest_pic.linesize[i] = p_pic->p[i].i_pitch;
- }
-#if !defined(HAVE_LIBSWSCALE_SWSCALE_H) && !defined(HAVE_FFMPEG_SWSCALE_H)
- img_convert( &dest_pic, PIX_FMT_YUV420P,
- (AVPicture *)p_ff_pic,
- p_sys->p_context->pix_fmt,
- p_sys->p_context->width,
- p_sys->p_context->height );
-#endif
- break;
- default:
- msg_Err( p_dec, "don't know how to convert chroma %i",
- p_sys->p_context->pix_fmt );
- p_dec->b_error = 1;
- break;
- }
+ msg_Err( p_dec, "don't know how to convert chroma %i",
+ p_sys->p_context->pix_fmt );
+ p_dec->b_error = 1;
}
}
ffmpeg_SetFrameBufferPts( p_dec, p_ff_pic );
/* */
- p_ff_pic->opaque = 0;
+ p_ff_pic->opaque = NULL;
+
+ if( p_sys->p_va )
+ {
+#ifdef HAVE_AVCODEC_VAAPI
+ /* hwaccel_context is not present in old fffmpeg version */
+ if( VaSetup( p_sys->p_va,
+ &p_sys->p_context->hwaccel_context, &p_dec->fmt_out.video.i_chroma,
+ p_sys->p_context->width, p_sys->p_context->height ) )
+ {
+ msg_Err( p_dec, "VaSetup failed" );
+ return -1;
+ }
+#else
+ assert(0);
+#endif
- /* Not much to do in indirect rendering mode */
- if( !p_sys->b_direct_rendering )
+ /* */
+ p_ff_pic->type = FF_BUFFER_TYPE_USER;
+ /* FIXME what is that, should give good value */
+ p_ff_pic->age = 256*256*256*64; // FIXME FIXME from ffmpeg
+
+ if( VaGrabSurface( p_sys->p_va, p_ff_pic ) )
+ {
+ msg_Err( p_dec, "VaGrabSurface failed" );
+ return -1;
+ }
+ return 0;
+ }
+ else if( !p_sys->b_direct_rendering )
{
+ /* Not much to do in indirect rendering mode */
return avcodec_default_get_buffer( p_context, p_ff_pic );
}
/* Some codecs set pix_fmt only after the 1st frame has been decoded,
- * so this check is necessary. */
- if( !ffmpeg_PixFmtToChroma( p_context->pix_fmt ) ||
- p_sys->p_context->width % 16 || p_sys->p_context->height % 16 )
- {
- msg_Dbg( p_dec, "disabling direct rendering" );
- p_sys->b_direct_rendering = 0;
+ * so we need to check for direct rendering again. */
+
+ int i_width = p_sys->p_context->width;
+ int i_height = p_sys->p_context->height;
+ avcodec_align_dimensions( p_sys->p_context, &i_width, &i_height );
+
+ if( GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) != VLC_SUCCESS ||
+ p_sys->p_context->width % 16 || p_sys->p_context->height % 16 ||
+ /* We only pad picture up to 16 */
+ PAD(p_sys->p_context->width,16) < i_width || PAD(p_sys->p_context->height,16) < i_height ||
+ p_context->pix_fmt == PIX_FMT_PAL8 )
return avcodec_default_get_buffer( p_context, p_ff_pic );
- }
+
+ p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma;
/* Get a new picture */
- //p_sys->p_vout->render.b_allow_modify_pics = 0;
p_pic = ffmpeg_NewPictBuf( p_dec, p_sys->p_context );
if( !p_pic )
- {
- p_sys->b_direct_rendering = 0;
return avcodec_default_get_buffer( p_context, p_ff_pic );
- }
+
p_sys->p_context->draw_horiz_band = NULL;
p_ff_pic->opaque = (void*)p_pic;
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
static int ffmpeg_ReGetFrameBuf( struct AVCodecContext *p_context, AVFrame *p_ff_pic )
{
decoder_t *p_dec = (decoder_t *)p_context->opaque;
+ int i_ret;
- /* Set picture PTS */
- ffmpeg_SetFrameBufferPts( p_dec, p_ff_pic );
+ /* */
+ p_ff_pic->pts = AV_NOPTS_VALUE;
/* We always use default reget function, it works perfectly fine */
- return avcodec_default_reget_buffer( p_context, p_ff_pic );
+ i_ret = avcodec_default_reget_buffer( p_context, p_ff_pic );
+
+ /* Set picture PTS if avcodec_default_reget_buffer didn't set it (through a
+ * ffmpeg_GetFrameBuf call) */
+ if( !i_ret && p_ff_pic->pts == AV_NOPTS_VALUE )
+ ffmpeg_SetFrameBufferPts( p_dec, p_ff_pic );
+
+ return i_ret;
}
static void ffmpeg_SetFrameBufferPts( decoder_t *p_dec, AVFrame *p_ff_pic )
{
p_ff_pic->pts = p_sys->input_dts;
}
- else p_ff_pic->pts = 0;
+ else
+ {
+ p_ff_pic->pts = 0;
+ }
+ }
+ else
+ {
+ p_ff_pic->pts = 0;
}
- else p_ff_pic->pts = 0;
if( p_sys->i_pts ) /* make sure 1st frame has a pts > 0 */
{
AVFrame *p_ff_pic )
{
decoder_t *p_dec = (decoder_t *)p_context->opaque;
- picture_t *p_pic;
+ decoder_sys_t *p_sys = p_dec->p_sys;
- if( !p_ff_pic->opaque )
+ if( p_sys->p_va )
+ {
+ VaUngrabSurface( p_sys->p_va, p_ff_pic );
+
+ /* */
+ for( int i = 0; i < 4; i++ )
+ p_ff_pic->data[i] = NULL;
+ }
+ else if( !p_ff_pic->opaque )
{
avcodec_default_release_buffer( p_context, p_ff_pic );
+ }
+ else
+ {
+ picture_t *p_pic = (picture_t*)p_ff_pic->opaque;
+
+ decoder_UnlinkPicture( p_dec, p_pic );
+
+ /* */
+ for( int i = 0; i < 4; i++ )
+ p_ff_pic->data[i] = NULL;
+ }
+}
+
+static void ffmpeg_NextPts( decoder_t *p_dec )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ if( p_sys->i_pts <= 0 )
return;
+
+ /* interpolate the next PTS */
+ if( p_dec->fmt_in.video.i_frame_rate > 0 &&
+ p_dec->fmt_in.video.i_frame_rate_base > 0 )
+ {
+ p_sys->i_pts += INT64_C(1000000) *
+ (2 + p_sys->p_ff_pic->repeat_pict) *
+ p_dec->fmt_in.video.i_frame_rate_base /
+ (2 * p_dec->fmt_in.video.i_frame_rate);
+ }
+ else if( p_sys->p_context->time_base.den > 0 )
+ {
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,20,0)
+ int i_tick = p_sys->p_context->ticks_per_frame;
+ if( i_tick <= 0 )
+ i_tick = 1;
+#else
+ int i_tick = 1;
+#endif
+
+ p_sys->i_pts += INT64_C(1000000) *
+ (2 + p_sys->p_ff_pic->repeat_pict) *
+ i_tick * p_sys->p_context->time_base.num /
+ (2 * p_sys->p_context->time_base.den);
}
+}
- p_pic = (picture_t*)p_ff_pic->opaque;
+#ifdef HAVE_AVCODEC_VAAPI
+static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_codec,
+ const enum PixelFormat *pi_fmt )
+{
+ decoder_t *p_dec = p_codec->opaque;
+ decoder_sys_t *p_sys = p_dec->p_sys;
- 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_sys->p_va )
+ {
+ VaDelete( p_sys->p_va );
+ p_sys->p_va = NULL;
+ }
- if( p_ff_pic->reference != 0 )
+ /* Try too look for a supported hw acceleration */
+ for( int i = 0; pi_fmt[i] != PIX_FMT_NONE; i++ )
{
- p_dec->pf_picture_unlink( p_dec, p_pic );
+ static const char *ppsz_name[PIX_FMT_NB] = {
+ [PIX_FMT_VDPAU_H264] = "PIX_FMT_VDPAU_H264",
+ [PIX_FMT_VAAPI_IDCT] = "PIX_FMT_VAAPI_IDCT",
+ [PIX_FMT_VAAPI_VLD] = "PIX_FMT_VAAPI_VLD",
+ [PIX_FMT_VAAPI_MOCO] = "PIX_FMT_VAAPI_MOCO",
+ [PIX_FMT_YUYV422] = "PIX_FMT_YUYV422",
+ [PIX_FMT_YUV420P] = "PIX_FMT_YUV420P",
+ };
+ msg_Dbg( p_dec, "Available decoder output format %d (%s)", pi_fmt[i], ppsz_name[pi_fmt[i]] ?: "Unknown" );
+
+ /* Only VLD supported */
+ if( pi_fmt[i] == PIX_FMT_VAAPI_VLD )
+ {
+ msg_Dbg( p_dec, "Trying VA API" );
+ p_sys->p_va = VaNew( p_sys->i_codec_id );
+ if( p_sys->p_va )
+ {
+ /* FIXME this will disabled direct rendering
+ * even if a new pixel format is renegociated
+ *
+ * FIXME Try to call VaSetup when possible
+ * to detect errors when possible (later is too late) */
+ p_sys->b_direct_rendering = false;
+ p_sys->p_context->draw_horiz_band = NULL;
+ return pi_fmt[i];
+ }
+ msg_Warn( p_dec, "Failed to open VA API" );
+ }
}
+
+ /* Fallback to default behaviour */
+ return avcodec_default_get_format( p_codec, pi_fmt );
}
+#endif
+
projects / vlc / blobdiff