/*****************************************************************************
- * video.c: video decoder using the ffmpeg library
+ * video.c: video decoder using the libavcodec library
*****************************************************************************
- * Copyright (C) 1999-2001 the VideoLAN team
+ * Copyright (C) 1999-2001 VLC authors and VideoLAN
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <vlc_codec.h>
#include <vlc_avcodec.h>
#include <vlc_cpu.h>
+#include <vlc_modules.h>
#include <assert.h>
-/* ffmpeg header */
-#ifdef HAVE_LIBAVCODEC_AVCODEC_H
-# include <libavcodec/avcodec.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
-# include <avcodec.h>
-#endif
+#include <libavcodec/avcodec.h>
+#include <libavutil/mem.h>
+#include <libavutil/pixdesc.h>
#include "avcodec.h"
#include "va.h"
-#if defined(HAVE_AVCODEC_VAAPI) || defined(HAVE_AVCODEC_DXVA2)
-# define HAVE_AVCODEC_VA
-#endif
/*****************************************************************************
* decoder_sys_t : decoder descriptor
/* Hack to force display of still pictures */
bool b_first_frame;
+
/* */
- AVPaletteControl palette;
+ //AVPaletteControl palette;
+#warning FIXME
/* */
bool b_flush;
# define post_mt(s)
#endif
-/* FIXME (dummy palette for now) */
-static const AVPaletteControl palette_control;
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int ffmpeg_GetFrameBuf ( struct AVCodecContext *, AVFrame * );
static int ffmpeg_ReGetFrameBuf( struct AVCodecContext *, AVFrame * );
static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
-
-#ifdef HAVE_AVCODEC_VA
static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *,
const enum PixelFormat * );
-#endif
+static void vlc_va_Delete( vlc_va_t * );
static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc )
{
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_codec->type = AVMEDIA_TYPE_VIDEO;
+ p_context->codec_type = AVMEDIA_TYPE_VIDEO;
p_context->codec_id = i_codec_id;
p_sys->p_context = p_context;
p_sys->p_codec = p_codec;
/* ***** Get configuration of ffmpeg plugin ***** */
p_sys->p_context->workaround_bugs =
- var_InheritInteger( p_dec, "ffmpeg-workaround-bugs" );
- p_sys->p_context->error_recognition =
- var_InheritInteger( p_dec, "ffmpeg-error-resilience" );
+ var_InheritInteger( p_dec, "avcodec-workaround-bugs" );
+ p_sys->p_context->err_recognition =
+ var_InheritInteger( p_dec, "avcodec-error-resilience" );
if( var_CreateGetBool( p_dec, "grayscale" ) )
p_sys->p_context->flags |= CODEC_FLAG_GRAY;
- i_val = var_CreateGetInteger( p_dec, "ffmpeg-vismv" );
+ i_val = var_CreateGetInteger( p_dec, "avcodec-vismv" );
if( i_val ) p_sys->p_context->debug_mv = i_val;
- i_val = var_CreateGetInteger( p_dec, "ffmpeg-lowres" );
- if( i_val > 0 && i_val <= 2 ) p_sys->p_context->lowres = i_val;
-
- i_val = var_CreateGetInteger( p_dec, "ffmpeg-skiploopfilter" );
+ i_val = var_CreateGetInteger( p_dec, "avcodec-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;
- if( var_CreateGetBool( p_dec, "ffmpeg-fast" ) )
+ if( var_CreateGetBool( p_dec, "avcodec-fast" ) )
p_sys->p_context->flags2 |= CODEC_FLAG2_FAST;
- /* ***** ffmpeg frame skipping ***** */
- p_sys->b_hurry_up = var_CreateGetBool( p_dec, "ffmpeg-hurry-up" );
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 54, 41, 0 )
+ if( var_InheritBool( p_dec, "avcodec-ignorecrop" ) )
+ p_sys->p_context->flags2 |= CODEC_FLAG2_IGNORE_CROP;
+#endif
- switch( var_CreateGetInteger( p_dec, "ffmpeg-skip-frame" ) )
+ /* ***** libavcodec frame skipping ***** */
+ p_sys->b_hurry_up = var_CreateGetBool( p_dec, "avcodec-hurry-up" );
+
+ switch( var_CreateGetInteger( p_dec, "avcodec-skip-frame" ) )
{
case -1:
p_sys->p_context->skip_frame = AVDISCARD_NONE;
}
p_sys->i_skip_frame = p_sys->p_context->skip_frame;
- switch( var_CreateGetInteger( p_dec, "ffmpeg-skip-idct" ) )
+ switch( var_CreateGetInteger( p_dec, "avcodec-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 ***** */
+ /* ***** libavcodec direct rendering ***** */
p_sys->b_direct_rendering = false;
p_sys->i_direct_rendering_used = -1;
- if( var_CreateGetBool( p_dec, "ffmpeg-dr" ) &&
+ if( var_CreateGetBool( p_dec, "avcodec-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 &&
-#if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 68, 2 ) ) && (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 52, 100, 1 ) )
- /* avcodec native vp8 decode doesn't handle EMU_EDGE flag, and I
- don't have idea howto implement fallback to libvpx decoder */
- p_sys->i_codec_id != CODEC_ID_VP8 &&
-#endif
+ p_sys->i_codec_id != AV_CODEC_ID_TSCC && p_sys->i_codec_id != AV_CODEC_ID_CSCD &&
+ p_sys->i_codec_id != AV_CODEC_ID_CINEPAK &&
!p_sys->p_context->debug_mv )
{
/* Some codecs set pix_fmt only after the 1st frame has been decoded,
p_sys->b_direct_rendering = true;
}
- /* ffmpeg doesn't properly release old pictures when frames are skipped */
+ /* libavcodec doesn't properly release old pictures when frames are skipped */
//if( p_sys->b_hurry_up ) p_sys->b_direct_rendering = false;
if( p_sys->b_direct_rendering )
{
p_sys->p_context->opaque = p_dec;
#ifdef HAVE_AVCODEC_MT
- int i_thread_count = var_InheritInteger( p_dec, "ffmpeg-threads" );
+ int i_thread_count = var_InheritInteger( p_dec, "avcodec-threads" );
if( i_thread_count <= 0 )
+ {
i_thread_count = vlc_GetCPUCount();
+ if( i_thread_count > 1 )
+ i_thread_count++;
+
+ //FIXME: take in count the decoding time
+ i_thread_count = __MIN( i_thread_count, 4 );
+ }
+ i_thread_count = __MIN( i_thread_count, 16 );
msg_Dbg( p_dec, "allowing %d thread(s) for decoding", i_thread_count );
p_sys->p_context->thread_count = i_thread_count;
#endif
-#ifdef HAVE_AVCODEC_VA
- const bool b_use_hw = var_CreateGetBool( p_dec, "ffmpeg-hw" );
- if( b_use_hw )
+ char *hw = var_CreateGetString( p_dec, "avcodec-hw" ); /* FIXME */
+ if( (hw == NULL || strcasecmp( hw, "none" )) &&
+ (i_codec_id == AV_CODEC_ID_MPEG1VIDEO || i_codec_id == AV_CODEC_ID_MPEG2VIDEO ||
+ i_codec_id == AV_CODEC_ID_MPEG4 ||
+ i_codec_id == AV_CODEC_ID_H264 ||
+ i_codec_id == AV_CODEC_ID_VC1 || i_codec_id == AV_CODEC_ID_WMV3) )
{
#ifdef HAVE_AVCODEC_MT
- msg_Err( p_dec, "ffmpeg-hw is not compatible with ffmpeg-mt" );
-#else
- p_sys->p_context->get_format = ffmpeg_GetFormat;
+ if( p_sys->p_context->thread_type & FF_THREAD_FRAME )
+ {
+ msg_Warn( p_dec, "threaded frame decoding is not compatible with libavcodec-hw, disabled" );
+ p_sys->p_context->thread_type &= ~FF_THREAD_FRAME;
+ }
+ if( ( p_sys->p_context->thread_type & FF_THREAD_SLICE ) &&
+ ( i_codec_id == AV_CODEC_ID_MPEG1VIDEO || i_codec_id == AV_CODEC_ID_MPEG2VIDEO ) )
+ {
+ msg_Warn( p_dec, "threaded slice decoding is not compatible with libavcodec-hw, disabled" );
+ p_sys->p_context->thread_type &= ~FF_THREAD_SLICE;
+ }
#endif
+ p_sys->p_context->get_format = ffmpeg_GetFormat;
}
+ free( hw );
+#ifdef HAVE_AVCODEC_MT
+ if( p_sys->p_context->thread_type & FF_THREAD_FRAME )
+ p_dec->i_extra_picture_buffers = 2 * p_sys->p_context->thread_count;
#endif
+
/* ***** misc init ***** */
p_sys->i_pts = VLC_TS_INVALID;
p_sys->b_has_b_frames = false;
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->palette.palette_changed = 1;
-
- 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 )
- {
- p_sys->p_context->palctrl = &p_sys->palette;
- }
+# warning FIXME: palette
/* ***** init this codec with special data ***** */
ffmpeg_InitCodec( p_dec );
/*
* Do the actual decoding now */
- /* Don't forget that ffmpeg requires a little more bytes
+ /* Don't forget that libavcodec requires a little more bytes
* that the real frame size */
if( p_block->i_buffer > 0 )
{
{
int i_used, b_gotpicture;
picture_t *p_pic;
+ AVPacket pkt;
/* Set the PTS/DTS in the context reordered_opaque field */
if( p_block->i_pts > VLC_TS_INVALID )
post_mt( p_sys );
- i_used = avcodec_decode_video( p_context, p_sys->p_ff_pic,
- &b_gotpicture,
- p_block->i_buffer <= 0 && p_sys->b_flush ? NULL : p_block->p_buffer, p_block->i_buffer );
+ av_init_packet( &pkt );
+ pkt.data = p_block->p_buffer;
+ pkt.size = p_block->i_buffer;
+ i_used = avcodec_decode_video2( p_context, p_sys->p_ff_pic,
+ &b_gotpicture, &pkt );
if( b_null_size && !p_sys->b_flush &&
p_context->width > 0 && p_context->height > 0 )
b_null_size = false;
if( p_sys->b_hurry_up )
p_context->skip_frame = p_sys->i_skip_frame;
- i_used = avcodec_decode_video( p_context, p_sys->p_ff_pic,
- &b_gotpicture, p_block->p_buffer,
- p_block->i_buffer );
+ i_used = avcodec_decode_video2( p_context, p_sys->p_ff_pic,
+ &b_gotpicture, &pkt );
}
wait_mt( p_sys );
}
/* Sanity check (seems to be needed for some streams) */
- if( p_sys->p_ff_pic->pict_type == FF_B_TYPE )
+ if( p_sys->p_ff_pic->pict_type == AV_PICTURE_TYPE_B)
{
p_sys->b_has_b_frames = true;
}
if( !b_drawpicture || ( !p_sys->p_va && !p_sys->p_ff_pic->linesize[0] ) )
continue;
- if( !p_sys->p_ff_pic->opaque )
+ if( p_sys->p_va != NULL || p_sys->p_ff_pic->opaque == NULL )
{
/* Get a new picture */
p_pic = ffmpeg_NewPictBuf( p_dec, p_context );
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
if( !i_size ) return;
- if( p_sys->i_codec_id == CODEC_ID_SVQ3 )
+ if( p_sys->i_codec_id == AV_CODEC_ID_SVQ3 )
{
uint8_t *p;
{
vlc_va_Extract( p_sys->p_va, p_pic, p_ff_pic );
}
- else if( TestFfmpegChroma( p_sys->p_context->pix_fmt, -1 ) == VLC_SUCCESS )
+ else if( FindVlcChroma( p_sys->p_context->pix_fmt ) )
{
int i_plane, i_size, i_line;
uint8_t *p_dst, *p_src;
for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines;
i_line++ )
{
- vlc_memcpy( p_dst, p_src, i_size );
+ memcpy( p_dst, p_src, i_size );
p_src += i_src_stride;
p_dst += i_dst_stride;
}
}
else
{
- msg_Err( p_dec, "don't know how to convert chroma %i",
- p_sys->p_context->pix_fmt );
+ const char *name = av_get_pix_fmt_name( p_sys->p_context->pix_fmt );
+ msg_Err( p_dec, "Unsupported decoded output format %d (%s)",
+ p_sys->p_context->pix_fmt, name ? name : "unknown" );
p_dec->b_error = 1;
}
}
if( p_sys->p_va )
{
-#ifdef HAVE_AVCODEC_VA
- /* hwaccel_context is not present in old fffmpeg version */
+ /* hwaccel_context is not present in old ffmpeg version */
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 ) )
+ &p_context->hwaccel_context, &p_dec->fmt_out.video.i_chroma,
+ p_context->width, p_context->height ) )
{
msg_Err( p_dec, "vlc_va_Setup 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
if( vlc_va_Get( p_sys->p_va, p_ff_pic ) )
{
}
wait_mt( p_sys );
-
/* Some codecs set pix_fmt only after the 1st frame has been decoded,
* 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 );
+ int i_width = p_context->width;
+ int i_height = p_context->height;
+ avcodec_align_dimensions( p_context, &i_width, &i_height );
if( GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) != VLC_SUCCESS ||
p_context->pix_fmt == PIX_FMT_PAL8 )
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 );
+ p_pic = ffmpeg_NewPictBuf( p_dec, p_context );
if( !p_pic )
goto no_dr;
bool b_compatible = true;
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:
+ case AV_CODEC_ID_SVQ1:
+ case AV_CODEC_ID_VP5:
+ case AV_CODEC_ID_VP6:
+ case AV_CODEC_ID_VP6F:
+ case AV_CODEC_ID_VP6A:
i_align = 16;
break;
default:
p_sys->i_direct_rendering_used = 1;
}
- p_sys->p_context->draw_horiz_band = NULL;
+ p_context->draw_horiz_band = NULL;
p_ff_pic->opaque = (void*)p_pic;
p_ff_pic->type = FF_BUFFER_TYPE_USER;
p_ff_pic->linesize[2] = p_pic->p[2].i_pitch;
p_ff_pic->linesize[3] = 0;
- /* FIXME what is that, should give good value */
- p_ff_pic->age = 256*256*256*64; // FIXME FIXME from ffmpeg
-
post_mt( p_sys );
return 0;
p_ff_pic->data[i] = NULL;
}
-#ifdef HAVE_AVCODEC_VA
-static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_codec,
- const enum PixelFormat *pi_fmt )
+static int ffmpeg_va_Start( void *func, va_list ap )
{
- decoder_t *p_dec = p_codec->opaque;
- decoder_sys_t *p_sys = p_dec->p_sys;
+ vlc_va_t *va = va_arg( ap, vlc_va_t * );
+ int codec = va_arg( ap, int );
+ const es_format_t *fmt = va_arg( ap, const es_format_t * );
+ int (*open)( vlc_va_t *, int, const es_format_t * ) = func;
- if( p_sys->p_va )
+ return open( va, codec, fmt );
+}
+
+static vlc_va_t *vlc_va_New( vlc_object_t *parent, int codec_id,
+ const es_format_t *fmt )
+{
+ vlc_va_t *p_va = vlc_object_create( parent, sizeof( *p_va ) );
+ if( unlikely(p_va == NULL) )
+ return NULL;
+
+ p_va->module = vlc_module_load( p_va, "hw decoder", "$avcodec-hw",
+ true, ffmpeg_va_Start, p_va,
+ codec_id, fmt );
+ if( p_va->module == NULL )
{
- vlc_va_Delete( p_sys->p_va );
- p_sys->p_va = NULL;
+ vlc_object_release( p_va );
+ p_va = NULL;
}
+ return p_va;
+}
- /* 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",
-#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",
- };
- msg_Dbg( p_dec, "Available decoder output format %d (%s)", pi_fmt[i], ppsz_name[pi_fmt[i]] ?: "Unknown" );
+static void ffmpeg_va_Stop( void *func, va_list ap )
+{
+ vlc_va_t *va = va_arg( ap, vlc_va_t * );
+ void (*close)( vlc_va_t * ) = func;
+
+ close( va );
+}
- /* Only VLD supported */
- if( pi_fmt[i] == PIX_FMT_VAAPI_VLD )
+static void vlc_va_Delete( vlc_va_t *va )
+{
+ vlc_module_unload( va->module, ffmpeg_va_Stop, va );
+ vlc_object_release( va );
+}
+
+static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
+ const enum PixelFormat *pi_fmt )
+{
+ decoder_t *p_dec = p_context->opaque;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ vlc_va_t *p_va = p_sys->p_va;
+
+ if( p_va != NULL )
+ vlc_va_Delete( p_va );
+
+ p_va = vlc_va_New( VLC_OBJECT(p_dec), p_sys->i_codec_id, &p_dec->fmt_in );
+ if( p_va != NULL )
+ {
+ /* Try too look for a supported hw acceleration */
+ for( size_t i = 0; pi_fmt[i] != PIX_FMT_NONE; i++ )
{
- if( !var_InheritBool( p_dec, "xlib" ) )
- {
- msg_Warn( p_dec, "Ignoring VA API" );
+ const char *name = av_get_pix_fmt_name(pi_fmt[i]);
+ msg_Dbg( p_dec, "Available decoder output format %d (%s)",
+ pi_fmt[i], name ? name : "unknown" );
+ if( p_va->pix_fmt != pi_fmt[i] )
continue;
- }
-#ifdef HAVE_AVCODEC_VAAPI
- msg_Dbg( p_dec, "Trying VA API" );
- p_sys->p_va = vlc_va_NewVaapi( VLC_OBJECT(p_dec), 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,
+ if( p_context->width > 0 && p_context->height > 0
+ && vlc_va_Setup( p_va, &p_context->hwaccel_context,
&p_dec->fmt_out.video.i_chroma,
- p_sys->p_context->width, p_sys->p_context->height ) )
+ p_context->width, p_context->height ) )
{
- msg_Err( p_dec, "vlc_va_Setup failed" );
- vlc_va_Delete( p_sys->p_va );
- p_sys->p_va = NULL;
+ msg_Err( p_dec, "acceleration setup failure" );
+ break;
}
- }
- 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 );
+ if( p_va->description )
+ msg_Info( p_dec, "Using %s for hardware decoding.",
+ p_va->description );
- /* FIXME this will disabled direct rendering
- * even if a new pixel format is renegociated
+ /* FIXME this will disable direct rendering
+ * even if a new pixel format is renegotiated
*/
p_sys->b_direct_rendering = false;
- p_sys->p_context->draw_horiz_band = NULL;
+ p_sys->p_va = p_va;
+ p_context->draw_horiz_band = NULL;
return pi_fmt[i];
}
+
+ msg_Err( p_dec, "acceleration not available" );
+ vlc_va_Delete( p_va );
}
+ p_sys->p_va = NULL;
/* Fallback to default behaviour */
- return avcodec_default_get_format( p_codec, pi_fmt );
+ return avcodec_default_get_format( p_context, pi_fmt );
}
-#endif
-
projects / vlc / blobdiff