#include <vlc_codec.h>
#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 "vaapi.h"
/*****************************************************************************
* decoder_sys_t : decoder descriptor
/* */
bool b_flush;
+
+ /* VA API */
+ vlc_va_t *p_va;
};
/* FIXME (dummy palette for now) */
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 )
{
uint8_t *p = (uint8_t*)&fcc;
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;
return NULL; /* invalid display size */
}
- if( GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) != VLC_SUCCESS )
+ if( !p_sys->p_va && GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) )
{
- /* we are doomed, but not really, because most codecs set their pix_fmt much later */
- p_dec->fmt_out.i_codec = VLC_CODEC_I420;
+ /* 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;
p_dec->fmt_out.video.i_frame_rate_base = p_context->time_base.num;
}
- p_pic = decoder_NewPicture( p_dec );
-
- return p_pic;
+ return decoder_NewPicture( p_dec );
}
/*****************************************************************************
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_original_fourcc ?: p_dec->fmt_in.i_codec );
p_sys->p_context->release_buffer = ffmpeg_ReleaseFrameBuf;
p_sys->p_context->opaque = 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->p_buffer_orig = p_sys->p_buffer = malloc( p_sys->i_buffer_orig );
if( !p_sys->p_buffer_orig )
{
+ av_free( p_sys->p_ff_pic );
free( p_sys );
return VLC_ENOMEM;
}
if( ffmpeg_OpenCodec( p_dec ) < 0 )
{
msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
+ av_free( p_sys->p_ff_pic );
free( p_sys->p_buffer_orig );
free( p_sys );
return VLC_EGENERIC;
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;
{
decoder_sys_t *p_sys = p_dec->p_sys;
+ 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 );
}
/*****************************************************************************
}
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)
+#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;
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;
}
/*****************************************************************************
{
decoder_sys_t *p_sys = p_dec->p_sys;
- if( TestFfmpegChroma( p_sys->p_context->pix_fmt, -1 ) == VLC_SUCCESS )
+ 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;
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
+
+ /* */
+ 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
- /* Not much to do in indirect rendering mode */
- if( !p_sys->b_direct_rendering )
+ 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 );
}
/* 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 )
- {
- msg_Dbg( p_dec, "disabling direct rendering" );
- 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;
/* 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 = false;
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;
AVFrame *p_ff_pic )
{
decoder_t *p_dec = (decoder_t *)p_context->opaque;
+ 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 );
- return;
}
+ else
+ {
+ picture_t *p_pic = (picture_t*)p_ff_pic->opaque;
- picture_t *p_pic = (picture_t*)p_ff_pic->opaque;
- decoder_UnlinkPicture( p_dec, p_pic );
+ 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;
+ /* */
+ for( int i = 0; i < 4; i++ )
+ p_ff_pic->data[i] = NULL;
+ }
}
static void ffmpeg_NextPts( decoder_t *p_dec )
}
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) *
- p_sys->p_context->time_base.num /
+ i_tick * p_sys->p_context->time_base.num /
(2 * p_sys->p_context->time_base.den);
}
}
+
+#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;
+
+ if( p_sys->p_va )
+ {
+ VaDelete( p_sys->p_va );
+ p_sys->p_va = NULL;
+ }
+
+ /* Try too look for a supported hw acceleration */
+ for( int i = 0; pi_fmt[i] != PIX_FMT_NONE; i++ )
+ {
+ 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