#include <vlc_common.h>
#include <vlc_codec.h>
-#include <vlc_codecs.h> /* BITMAPINFOHEADER */
#include <vlc_avcodec.h>
#include <assert.h>
# ifdef HAVE_AVCODEC_VAAPI
# include <libavcodec/vaapi.h>
# endif
+# ifdef HAVE_AVCODEC_DXVA2
+# include <libavcodec/dxva2.h>
+# endif
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
#else
#endif
#include "avcodec.h"
-#include "vaapi.h"
+#include "va.h"
+#if defined(HAVE_AVCODEC_VAAPI) || defined(HAVE_AVCODEC_DXVA2)
+# define HAVE_AVCODEC_VA
+#endif
/*****************************************************************************
* decoder_sys_t : decoder descriptor
/* for direct rendering */
bool b_direct_rendering;
+ int i_direct_rendering_used;
bool b_has_b_frames;
static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
static void ffmpeg_NextPts( decoder_t * );
-#ifdef HAVE_AVCODEC_VAAPI
+#ifdef HAVE_AVCODEC_VA
static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *,
const enum PixelFormat * );
#endif
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_in.video.i_sar_num > 0 && p_dec->fmt_in.video.i_sar_den > 0 )
{
- p_dec->fmt_out.video.i_aspect = p_dec->fmt_in.video.i_aspect;
+ p_dec->fmt_out.video.i_sar_num = p_dec->fmt_in.video.i_sar_num;
+ p_dec->fmt_out.video.i_sar_den = p_dec->fmt_in.video.i_sar_den;
}
else
{
- 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_sar_num = p_context->sample_aspect_ratio.num;
p_dec->fmt_out.video.i_sar_den = p_context->sample_aspect_ratio.den;
- if( p_dec->fmt_out.video.i_aspect == 0 )
+ if( !p_dec->fmt_out.video.i_sar_num || !p_dec->fmt_out.video.i_sar_den )
{
- p_dec->fmt_out.video.i_aspect =
- VOUT_ASPECT_FACTOR * p_context->width / p_context->height;
+ p_dec->fmt_out.video.i_sar_num = 1;
+ p_dec->fmt_out.video.i_sar_den = 1;
}
}
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 = calloc( 1, sizeof(decoder_sys_t) ) ) == NULL )
return VLC_ENOMEM;
+ 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;
/* ***** Get configuration of ffmpeg plugin ***** */
p_sys->p_context->workaround_bugs =
- config_GetInt( p_dec, "ffmpeg-workaround-bugs" );
-#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ var_InheritInteger( 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" );
+ var_InheritInteger( p_dec, "ffmpeg-error-resilience" );
#else
p_sys->p_context->error_recognition =
- config_GetInt( p_dec, "ffmpeg-error-resilience" );
+ var_InheritInteger( p_dec, "ffmpeg-error-resilience" );
#endif
- 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;
+ if( var_CreateGetBool( p_dec, "grayscale" ) )
+ p_sys->p_context->flags |= CODEC_FLAG_GRAY;
- 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-vismv" );
+ if( i_val ) p_sys->p_context->debug_mv = 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-lowres" );
+ if( i_val > 0 && i_val <= 2 ) p_sys->p_context->lowres = i_val;
- 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;
+ 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;
- bool b_fast = var_CreateGetBool( p_dec, "ffmpeg-fast" );
- if( b_fast ) p_sys->p_context->flags2 |= CODEC_FLAG2_FAST;
+ 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;
/* ***** ffmpeg direct rendering ***** */
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) &&
- /* 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 &&
+ p_sys->i_direct_rendering_used = -1;
+ if( var_CreateGetBool( p_dec, "ffmpeg-dr" ) &&
+ (p_sys->p_codec->capabilities & CODEC_CAP_DR1) &&
/* 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 )
//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" );
+ msg_Dbg( p_dec, "trying to use direct rendering" );
p_sys->p_context->flags |= CODEC_FLAG_EMU_EDGE;
}
+ else
+ {
+ msg_Dbg( p_dec, "direct rendering is disabled" );
+ }
/* Always use our get_buffer wrapper so we can calculate the
* PTS correctly */
p_sys->p_context->release_buffer = ffmpeg_ReleaseFrameBuf;
p_sys->p_context->opaque = p_dec;
-#ifdef HAVE_AVCODEC_VAAPI
+#ifdef HAVE_AVCODEC_VA
if( var_CreateGetBool( p_dec, "ffmpeg-hw" ) )
p_sys->p_context->get_format = ffmpeg_GetFormat;
#endif
p_block->i_buffer + FF_INPUT_BUFFER_PADDING_SIZE );
if( !p_block )
return NULL;
+ 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_sys->b_has_b_frames = true;
}
- if( !p_dec->fmt_in.video.i_aspect )
+ if( !p_dec->fmt_in.video.i_sar_num || !p_dec->fmt_in.video.i_sar_den )
{
/* Fetch again the aspect ratio in case it changed */
- p_dec->fmt_out.video.i_aspect =
- VOUT_ASPECT_FACTOR
- * ( av_q2d(p_sys->p_context->sample_aspect_ratio)
- * p_sys->p_context->width / p_sys->p_context->height );
p_dec->fmt_out.video.i_sar_num
= p_sys->p_context->sample_aspect_ratio.num;
p_dec->fmt_out.video.i_sar_den
= p_sys->p_context->sample_aspect_ratio.den;
- if( p_dec->fmt_out.video.i_aspect == 0 )
+ if( !p_dec->fmt_out.video.i_sar_num || !p_dec->fmt_out.video.i_sar_den )
{
- p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR
- * p_sys->p_context->width / p_sys->p_context->height;
+ p_dec->fmt_out.video.i_sar_num = 1;
+ p_dec->fmt_out.video.i_sar_den = 1;
}
}
{
decoder_sys_t *p_sys = p_dec->p_sys;
- avcodec_flush_buffers( p_sys->p_context );
+ /* 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 );
if( p_sys->p_va )
- VaDelete( p_sys->p_va );
+ vlc_va_Delete( p_sys->p_va );
}
/*****************************************************************************
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;
}
/*****************************************************************************
if( p_sys->p_va )
{
- VaExtract( p_sys->p_va, p_pic, p_ff_pic );
+ vlc_va_Extract( p_sys->p_va, p_pic, p_ff_pic );
}
else if( TestFfmpegChroma( p_sys->p_context->pix_fmt, -1 ) == VLC_SUCCESS )
{
if( p_sys->p_va )
{
-#ifdef HAVE_AVCODEC_VAAPI
+#ifdef HAVE_AVCODEC_VA
/* 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 ) )
+ if( vlc_va_Setup( 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" );
+ msg_Err( p_dec, "vlc_va_Setup failed" );
return -1;
}
#else
/* 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 ) )
+ if( vlc_va_Get( p_sys->p_va, p_ff_pic ) )
{
msg_Err( p_dec, "VaGrabSurface failed" );
return -1;
}
else if( !p_sys->b_direct_rendering )
{
- /* Not much to do in indirect rendering mode */
+ /* Not much to do in indirect rendering mode. */
return avcodec_default_get_buffer( p_context, p_ff_pic );
}
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 );
+ goto no_dr;
p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma;
/* Get a new picture */
p_pic = ffmpeg_NewPictBuf( p_dec, p_sys->p_context );
if( !p_pic )
- return avcodec_default_get_buffer( p_context, p_ff_pic );
+ goto no_dr;
+ bool b_compatible = true;
+ if( p_pic->p[0].i_pitch / p_pic->p[0].i_pixel_pitch < i_width ||
+ p_pic->p[0].i_lines < i_height )
+ b_compatible = false;
+ for( int i = 0; i < p_pic->i_planes && b_compatible; i++ )
+ {
+ unsigned i_align;
+ switch( p_sys->i_codec_id )
+ {
+ case CODEC_ID_SVQ1:
+ case CODEC_ID_VP5:
+ case CODEC_ID_VP6:
+ case CODEC_ID_VP6F:
+ case CODEC_ID_VP6A:
+ i_align = 16;
+ break;
+ default:
+ i_align = i == 0 ? 16 : 8;
+ break;
+ }
+ if( p_pic->p[i].i_pitch % i_align )
+ b_compatible = false;
+ if( (intptr_t)p_pic->p[i].p_pixels % i_align )
+ b_compatible = false;
+ }
+ if( p_context->pix_fmt == PIX_FMT_YUV422P && b_compatible )
+ {
+ if( 2 * p_pic->p[1].i_pitch != p_pic->p[0].i_pitch ||
+ 2 * p_pic->p[2].i_pitch != p_pic->p[0].i_pitch )
+ b_compatible = false;
+ }
+ if( !b_compatible )
+ {
+ decoder_DeletePicture( p_dec, p_pic );
+ goto no_dr;
+ }
+
+ if( p_sys->i_direct_rendering_used != 1 )
+ {
+ msg_Dbg( p_dec, "using direct rendering" );
+ p_sys->i_direct_rendering_used = 1;
+ }
p_sys->p_context->draw_horiz_band = NULL;
p_ff_pic->age = 256*256*256*64; // FIXME FIXME from ffmpeg
return 0;
+
+no_dr:
+ if( p_sys->i_direct_rendering_used != 0 )
+ {
+ msg_Warn( p_dec, "disabling direct rendering" );
+ p_sys->i_direct_rendering_used = 0;
+ }
+ return avcodec_default_get_buffer( p_context, p_ff_pic );
}
static int ffmpeg_ReGetFrameBuf( struct AVCodecContext *p_context, AVFrame *p_ff_pic )
{
if( p_sys->p_va )
{
- VaUngrabSurface( p_sys->p_va, p_ff_pic );
+ vlc_va_Release( p_sys->p_va, p_ff_pic );
/* */
for( int i = 0; i < 4; i++ )
}
}
-#ifdef HAVE_AVCODEC_VAAPI
+#ifdef HAVE_AVCODEC_VA
static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_codec,
const enum PixelFormat *pi_fmt )
{
if( p_sys->p_va )
{
- VaDelete( p_sys->p_va );
+ vlc_va_Delete( p_sys->p_va );
p_sys->p_va = NULL;
}
[PIX_FMT_VAAPI_IDCT] = "PIX_FMT_VAAPI_IDCT",
[PIX_FMT_VAAPI_VLD] = "PIX_FMT_VAAPI_VLD",
[PIX_FMT_VAAPI_MOCO] = "PIX_FMT_VAAPI_MOCO",
+#ifdef HAVE_AVCODEC_DXVA2
+ [PIX_FMT_DXVA2_VLD] = "PIX_FMT_DXVA2_VLD",
+#endif
[PIX_FMT_YUYV422] = "PIX_FMT_YUYV422",
[PIX_FMT_YUV420P] = "PIX_FMT_YUV420P",
};
/* Only VLD supported */
if( pi_fmt[i] == PIX_FMT_VAAPI_VLD )
{
+#ifdef HAVE_AVCODEC_VAAPI
msg_Dbg( p_dec, "Trying VA API" );
- p_sys->p_va = VaNew( p_sys->i_codec_id );
- if( p_sys->p_va )
+ p_sys->p_va = vlc_va_NewVaapi( p_sys->i_codec_id );
+ if( !p_sys->p_va )
+ msg_Warn( p_dec, "Failed to open VA API" );
+#else
+ continue;
+#endif
+ }
+#ifdef HAVE_AVCODEC_DXVA2
+ if( pi_fmt[i] == PIX_FMT_DXVA2_VLD )
+ {
+ msg_Dbg( p_dec, "Trying DXVA2" );
+ p_sys->p_va = vlc_va_NewDxva2( VLC_OBJECT(p_dec), p_sys->i_codec_id );
+ if( !p_sys->p_va )
+ msg_Warn( p_dec, "Failed to open DXVA2" );
+ }
+#endif
+
+ if( p_sys->p_va &&
+ p_sys->p_context->width > 0 && p_sys->p_context->height > 0 )
+ {
+ /* We try to call vlc_va_Setup when possible to detect errors when
+ * possible (later is too late) */
+ if( vlc_va_Setup( 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 ) )
{
- /* 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_Err( p_dec, "vlc_va_Setup failed" );
+ vlc_va_Delete( p_sys->p_va );
+ p_sys->p_va = NULL;
}
- msg_Warn( p_dec, "Failed to open VA API" );
+ }
+
+ if( p_sys->p_va )
+ {
+ if( p_sys->p_va->description )
+ msg_Info( p_dec, "Using %s for hardware decoding.", p_sys->p_va->description );
+
+ /* FIXME this will disabled direct rendering
+ * even if a new pixel format is renegociated
+ */
+ p_sys->b_direct_rendering = false;
+ p_sys->p_context->draw_horiz_band = NULL;
+ return pi_fmt[i];
}
}