/*****************************************************************************
- * 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_common.h>
#include <vlc_codec.h>
-#include <vlc_codecs.h> /* BITMAPINFOHEADER */
#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
*****************************************************************************/
struct decoder_sys_t
{
- FFMPEG_COMMON_MEMBERS
+ AVCODEC_COMMON_MEMBERS
/* Video decoder specific part */
- mtime_t input_pts;
- mtime_t input_dts;
mtime_t i_pts;
AVFrame *p_ff_pic;
/* Hack to force display of still pictures */
bool b_first_frame;
+
/* */
+#if LIBAVCODEC_VERSION_MAJOR < 54
AVPaletteControl palette;
+#else
+# warning FIXME
+#endif
/* */
bool b_flush;
/* VA API */
vlc_va_t *p_va;
+
+ vlc_sem_t sem_mt;
};
-/* FIXME (dummy palette for now) */
-static const AVPaletteControl palette_control;
+#ifdef HAVE_AVCODEC_MT
+# define wait_mt(s) vlc_sem_wait( &s->sem_mt )
+# define post_mt(s) vlc_sem_post( &s->sem_mt )
+#else
+# define wait_mt(s)
+# define post_mt(s)
+#endif
/*****************************************************************************
* 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_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 )
{
else if( p_context->time_base.num > 0 && p_context->time_base.den > 0 )
{
p_dec->fmt_out.video.i_frame_rate = p_context->time_base.den;
- p_dec->fmt_out.video.i_frame_rate_base = p_context->time_base.num;
+ p_dec->fmt_out.video.i_frame_rate_base = p_context->time_base.num * __MAX( p_context->ticks_per_frame, 1 );
}
return decoder_NewPicture( p_dec );
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;
p_sys->p_ff_pic = avcodec_alloc_frame();
p_sys->b_delayed_open = true;
p_sys->p_va = NULL;
+ vlc_sem_init( &p_sys->sem_mt, 0 );
/* ***** 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 );
/* ***** Get configuration of ffmpeg plugin ***** */
p_sys->p_context->workaround_bugs =
- var_InheritInteger( p_dec, "ffmpeg-workaround-bugs" );
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 52, 0, 0 )
- p_sys->p_context->error_resilience =
- var_InheritInteger( p_dec, "ffmpeg-error-resilience" );
-#else
- p_sys->p_context->error_recognition =
- var_InheritInteger( p_dec, "ffmpeg-error-resilience" );
-#endif
+ 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_CHECK( 54, 41, 0, 91, 100 )
+ if( var_InheritBool( p_dec, "avcodec-ignorecrop" ) )
+ p_sys->p_context->flags2 |= CODEC_FLAG2_IGNORE_CROP;
+#endif
+
+ /* ***** libavcodec frame skipping ***** */
+ p_sys->b_hurry_up = var_CreateGetBool( p_dec, "avcodec-hurry-up" );
- switch( var_CreateGetInteger( p_dec, "ffmpeg-skip-frame" ) )
+ switch( var_CreateGetInteger( p_dec, "avcodec-skip-frame" ) )
{
case -1:
p_sys->p_context->skip_frame = AVDISCARD_NONE;
p_sys->p_context->skip_frame = AVDISCARD_DEFAULT;
break;
case 1:
- p_sys->p_context->skip_frame = AVDISCARD_BIDIR;
+ p_sys->p_context->skip_frame = AVDISCARD_NONREF;
break;
case 2:
p_sys->p_context->skip_frame = AVDISCARD_NONKEY;
}
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->p_context->skip_idct = AVDISCARD_DEFAULT;
break;
case 1:
- p_sys->p_context->skip_idct = AVDISCARD_BIDIR;
+ p_sys->p_context->skip_idct = AVDISCARD_NONREF;
break;
case 2:
p_sys->p_context->skip_idct = AVDISCARD_NONKEY;
}
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 &&
+ 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 )
{
/* Always use our get_buffer wrapper so we can calculate the
* PTS correctly */
p_sys->p_context->get_buffer = ffmpeg_GetFrameBuf;
- p_sys->p_context->reget_buffer = ffmpeg_ReGetFrameBuf;
+ p_sys->p_context->reget_buffer = avcodec_default_reget_buffer;
p_sys->p_context->release_buffer = ffmpeg_ReleaseFrameBuf;
p_sys->p_context->opaque = p_dec;
-#ifdef HAVE_AVCODEC_VA
- if( var_CreateGetBool( p_dec, "ffmpeg-hw" ) )
+#ifdef HAVE_AVCODEC_MT
+ 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;
+
+ if( i_codec_id == AV_CODEC_ID_MPEG4 )
+ p_sys->p_context->thread_count = 1;
+
+#endif
+
+ 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_H263 ||
+ i_codec_id == AV_CODEC_ID_H264 ||
+ i_codec_id == AV_CODEC_ID_VC1 || i_codec_id == AV_CODEC_ID_WMV3) )
+ {
+#if defined(HAVE_AVCODEC_MT) //&& LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 1, 0)
+ if( p_sys->p_context->thread_type & FF_THREAD_FRAME )
+ {
+ msg_Warn( p_dec, "threaded frame decoding is not compatible with avcodec-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 avcodec-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->input_pts = p_sys->input_dts = 0;
- p_sys->i_pts = 0;
+ p_sys->i_pts = VLC_TS_INVALID;
p_sys->b_has_b_frames = false;
p_sys->b_first_frame = true;
p_sys->b_flush = false;
}
p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma;
+#if LIBAVCODEC_VERSION_MAJOR < 54
/* Setup palette */
memset( &p_sys->palette, 0, sizeof(p_sys->palette) );
if( p_dec->fmt_in.video.p_palette )
{
p_sys->p_context->palctrl = &p_sys->palette;
}
+#else
+# warning FIXME
+#endif
/* ***** init this codec with special data ***** */
ffmpeg_InitCodec( p_dec );
{
msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
av_free( p_sys->p_ff_pic );
+ vlc_sem_destroy( &p_sys->sem_mt );
free( p_sys );
return VLC_EGENERIC;
}
picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
+ AVCodecContext *p_context = p_sys->p_context;
int b_drawpicture;
int b_null_size = false;
block_t *p_block;
if( !pp_block || !*pp_block )
return NULL;
- if( !p_sys->p_context->extradata_size && p_dec->fmt_in.i_extra )
+ if( !p_context->extradata_size && p_dec->fmt_in.i_extra )
{
ffmpeg_InitCodec( p_dec );
if( p_sys->b_delayed_open )
if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
- p_sys->i_pts = 0; /* To make sure we recover properly */
+ p_sys->i_pts = VLC_TS_INVALID; /* To make sure we recover properly */
- p_sys->input_pts = p_sys->input_dts = 0;
p_sys->i_late_frames = 0;
- block_Release( p_block );
+ if( p_block->i_flags & BLOCK_FLAG_DISCONTINUITY )
+ avcodec_flush_buffers( p_context );
- //if( p_block->i_flags & BLOCK_FLAG_CORRUPTED )
- //avcodec_flush_buffers( p_sys->p_context );
+ block_Release( p_block );
return NULL;
}
if( !p_dec->b_pace_control && (p_sys->i_late_frames > 0) &&
(mdate() - p_sys->i_late_frames_start > INT64_C(5000000)) )
{
- if( p_sys->i_pts )
+ if( p_sys->i_pts > VLC_TS_INVALID )
{
msg_Err( p_dec, "more than 5 seconds of late video -> "
"dropping frame (computer too slow ?)" );
- p_sys->i_pts = 0; /* To make sure we recover properly */
+ p_sys->i_pts = VLC_TS_INVALID; /* To make sure we recover properly */
}
block_Release( p_block );
p_sys->i_late_frames--;
return NULL;
}
- if( p_block->i_pts > 0 || p_block->i_dts > 0 )
- {
- p_sys->input_pts = p_block->i_pts;
- p_sys->input_dts = p_block->i_dts;
-
- /* Make sure we don't reuse the same timestamps twice */
- p_block->i_pts = p_block->i_dts = 0;
- }
-
/* A good idea could be to decode all I pictures and see for the other */
if( !p_dec->b_pace_control &&
p_sys->b_hurry_up &&
b_drawpicture = 0;
if( p_sys->i_late_frames < 12 )
{
- p_sys->p_context->skip_frame =
- (p_sys->i_skip_frame <= AVDISCARD_BIDIR) ?
- AVDISCARD_BIDIR : p_sys->i_skip_frame;
+ p_context->skip_frame =
+ (p_sys->i_skip_frame <= AVDISCARD_NONREF) ?
+ AVDISCARD_NONREF : p_sys->i_skip_frame;
}
else
{
else
{
if( p_sys->b_hurry_up )
- p_sys->p_context->skip_frame = p_sys->i_skip_frame;
+ p_context->skip_frame = p_sys->i_skip_frame;
if( !(p_block->i_flags & BLOCK_FLAG_PREROLL) )
b_drawpicture = 1;
else
b_drawpicture = 0;
}
- if( p_sys->p_context->width <= 0 || p_sys->p_context->height <= 0 )
+ if( p_context->width <= 0 || p_context->height <= 0 )
{
if( p_sys->b_hurry_up )
- p_sys->p_context->skip_frame = p_sys->i_skip_frame;
+ p_context->skip_frame = p_sys->i_skip_frame;
b_null_size = true;
}
else if( !b_drawpicture )
* 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,
+ p_context->skip_frame = __MAX( p_context->skip_frame,
AVDISCARD_NONREF );
#endif
}
/*
- * Do the actual decoding now
- */
+ * 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;
- i_used = avcodec_decode_video( p_sys->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 );
+ post_mt( p_sys );
- if( b_null_size && p_sys->p_context->width > 0 &&
- p_sys->p_context->height > 0 &&
- !p_sys->b_flush )
+ av_init_packet( &pkt );
+ pkt.data = p_block->p_buffer;
+ pkt.size = p_block->i_buffer;
+ pkt.pts = p_block->i_pts;
+ pkt.dts = p_block->i_dts;
+
+ /* Make sure we don't reuse the same timestamps twice */
+ p_block->i_pts =
+ p_block->i_dts = VLC_TS_INVALID;
+
+ 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 )
{
/* 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, p_block->p_buffer,
- p_block->i_buffer );
+ p_context->skip_frame = p_sys->i_skip_frame;
+ i_used = avcodec_decode_video2( p_context, p_sys->p_ff_pic,
+ &b_gotpicture, &pkt );
}
+ wait_mt( p_sys );
if( p_sys->b_flush )
p_sys->b_first_frame = true;
block_Release( p_block );
return NULL;
}
- else if( i_used > p_block->i_buffer )
+ else if( i_used > p_block->i_buffer ||
+ p_context->thread_count > 1 )
{
i_used = p_block->i_buffer;
}
continue;
}
- /* 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 == AV_PICTURE_TYPE_B)
+ {
+ p_sys->b_has_b_frames = true;
+ }
+
+ /* Compute the PTS */
+ mtime_t i_pts =
+ p_sys->p_ff_pic->pkt_pts;
+ if (i_pts <= VLC_TS_INVALID)
+ i_pts = p_sys->p_ff_pic->pkt_dts;
+
+ if( i_pts <= VLC_TS_INVALID )
+ i_pts = p_sys->i_pts;
+
+ /* Interpolate the next PTS */
+ if( i_pts > VLC_TS_INVALID )
+ p_sys->i_pts = i_pts;
+ if( p_sys->i_pts > VLC_TS_INVALID )
+ {
+ /* 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_context->time_base.den > 0 )
+ {
+ int i_tick = p_context->ticks_per_frame;
+ if( i_tick <= 0 )
+ i_tick = 1;
+
+ p_sys->i_pts += INT64_C(1000000) *
+ (2 + p_sys->p_ff_pic->repeat_pict) *
+ i_tick * p_context->time_base.num /
+ (2 * p_context->time_base.den);
+ }
+ }
/* Update frame late count (except when doing 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 );
+ i_display_date = decoder_GetDisplayDate( p_dec, i_pts );
if( i_display_date > 0 && i_display_date <= mdate() )
{
}
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 )
- decoder_DeletePicture( p_dec, p_pic );
-
- ffmpeg_NextPts( p_dec );
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_sys->p_context );
+ p_pic = ffmpeg_NewPictBuf( p_dec, p_context );
if( !p_pic )
{
block_Release( p_block );
else
{
p_pic = (picture_t *)p_sys->p_ff_pic->opaque;
- }
-
- /* Sanity check (seems to be needed for some streams) */
- if( p_sys->p_ff_pic->pict_type == FF_B_TYPE )
- {
- p_sys->b_has_b_frames = true;
+ decoder_LinkPicture( p_dec, p_pic );
}
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_sar_num
- = p_sys->p_context->sample_aspect_ratio.num;
+ = p_context->sample_aspect_ratio.num;
p_dec->fmt_out.video.i_sar_den
- = p_sys->p_context->sample_aspect_ratio.den;
+ = p_context->sample_aspect_ratio.den;
if( !p_dec->fmt_out.video.i_sar_num || !p_dec->fmt_out.video.i_sar_den )
{
}
/* Send decoded frame to vout */
- if( p_sys->i_pts )
+ if( i_pts > VLC_TS_INVALID)
{
- p_pic->date = p_sys->i_pts;
-
- ffmpeg_NextPts( p_dec );
+ p_pic->date = i_pts;
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
{
decoder_sys_t *p_sys = p_dec->p_sys;
+ post_mt( 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 );
+ wait_mt( p_sys );
+
+ if( p_sys->p_ff_pic )
+ av_free( p_sys->p_ff_pic );
if( p_sys->p_va )
vlc_va_Delete( p_sys->p_va );
+
+ vlc_sem_destroy( &p_sys->sem_mt );
}
/*****************************************************************************
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;
}
}
-/*****************************************************************************
- * 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;
-
- return VLC_SUCCESS;
-}
/*****************************************************************************
* ffmpeg_CopyPicture: copy a picture from ffmpeg internal buffers to a
* picture_t structure (when not in direct rendering mode).
{
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;
}
}
-/*****************************************************************************
- * ffmpeg_GetFrameBuf: callback used by ffmpeg to get a frame buffer.
- *****************************************************************************
- * It is used for direct rendering as well as to get the right PTS for each
- * decoded picture (even in indirect rendering mode).
- *****************************************************************************/
-static void ffmpeg_SetFrameBufferPts( decoder_t *p_dec, AVFrame *p_ff_pic );
-
-static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context,
- AVFrame *p_ff_pic )
+static int ffmpeg_va_GetFrameBuf( struct AVCodecContext *p_context, AVFrame *p_ff_pic )
{
decoder_t *p_dec = (decoder_t *)p_context->opaque;
decoder_sys_t *p_sys = p_dec->p_sys;
- picture_t *p_pic;
-
- /* Set picture PTS */
- ffmpeg_SetFrameBufferPts( p_dec, p_ff_pic );
+ vlc_va_t *p_va = p_sys->p_va;
- /* */
- p_ff_pic->opaque = NULL;
-
- if( p_sys->p_va )
+ /* hwaccel_context is not present in old ffmpeg version */
+ if( vlc_va_Setup( p_va,
+ &p_context->hwaccel_context, &p_dec->fmt_out.video.i_chroma,
+ p_context->width, p_context->height ) )
{
-#ifdef HAVE_AVCODEC_VA
- /* hwaccel_context is not present in old fffmpeg 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 ) )
- {
- 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 ) )
- {
- msg_Err( p_dec, "VaGrabSurface failed" );
- return -1;
- }
- return 0;
+ msg_Err( p_dec, "vlc_va_Setup failed" );
+ return -1;
}
- else if( !p_sys->b_direct_rendering ||
- ( p_sys->i_codec_id == CODEC_ID_H264 && p_ff_pic->reference ) )
+
+ if( vlc_va_Get( p_va, p_ff_pic ) )
{
- /* Not much to do in indirect rendering mode.
- * XXX We also do not allow direct rendering with H264 reference frames
- * as there can be too many of them. */
- return avcodec_default_get_buffer( p_context, p_ff_pic );
+ msg_Err( p_dec, "vlc_va_Get failed" );
+ return -1;
}
- /* Some codecs set pix_fmt only after the 1st frame has been decoded,
- * so we need to check for direct rendering again. */
+ p_ff_pic->type = FF_BUFFER_TYPE_USER;
+ return 0;
+}
+
+static picture_t *ffmpeg_dr_GetFrameBuf(struct AVCodecContext *p_context)
+{
+ decoder_t *p_dec = (decoder_t *)p_context->opaque;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ int i_width = p_context->width;
+ int i_height = p_context->height;
+ avcodec_align_dimensions( p_context, &i_width, &i_height );
- 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 );
+ picture_t *p_pic = NULL;
+ if (GetVlcChroma(&p_dec->fmt_out.video, p_context->pix_fmt) != VLC_SUCCESS)
+ goto no_dr;
- if( GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) != VLC_SUCCESS ||
- p_context->pix_fmt == PIX_FMT_PAL8 )
+ if (p_context->pix_fmt == PIX_FMT_PAL8)
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 );
+ p_pic = ffmpeg_NewPictBuf( p_dec, p_context );
if( !p_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++ )
+ goto no_dr;
+
+ for( int i = 0; i < p_pic->i_planes; 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:
+ 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:
break;
}
if( p_pic->p[i].i_pitch % i_align )
- b_compatible = false;
+ goto no_dr;
if( (intptr_t)p_pic->p[i].p_pixels % i_align )
- b_compatible = false;
+ goto no_dr;
}
- if( p_context->pix_fmt == PIX_FMT_YUV422P && b_compatible )
+
+ if( p_context->pix_fmt == PIX_FMT_YUV422P )
{
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;
+ goto no_dr;
}
- if( !b_compatible )
- {
+
+ return p_pic;
+
+no_dr:
+ if (p_pic)
decoder_DeletePicture( p_dec, p_pic );
- goto no_dr;
+
+ return NULL;
+}
+
+/*****************************************************************************
+ * ffmpeg_GetFrameBuf: callback used by ffmpeg to get a frame buffer.
+ *****************************************************************************
+ * It is used for direct rendering as well as to get the right PTS for each
+ * decoded picture (even in indirect rendering mode).
+ *****************************************************************************/
+static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context,
+ AVFrame *p_ff_pic )
+{
+ decoder_t *p_dec = (decoder_t *)p_context->opaque;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ /* */
+ p_ff_pic->opaque = NULL;
+#if ! LIBAVCODEC_VERSION_CHECK(54, 34, 0, 79, 101)
+ p_ff_pic->pkt_pts = p_context->pkt ? p_context->pkt->pts : AV_NOPTS_VALUE;
+#endif
+#if LIBAVCODEC_VERSION_MAJOR < 54
+ p_ff_pic->age = 256*256*256*64;
+#endif
+
+ if( p_sys->p_va )
+ return ffmpeg_va_GetFrameBuf(p_context, p_ff_pic);
+
+ if( !p_sys->b_direct_rendering )
+ return avcodec_default_get_buffer( p_context, 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. */
+
+ picture_t *p_pic = ffmpeg_dr_GetFrameBuf(p_context);
+ if (!p_pic) {
+ if( p_sys->i_direct_rendering_used != 0 )
+ {
+ msg_Warn( p_dec, "disabling direct rendering" );
+ p_sys->i_direct_rendering_used = 0;
+ }
+
+ post_mt( p_sys );
+ return avcodec_default_get_buffer( p_context, p_ff_pic );
}
- if( p_sys->i_direct_rendering_used != 1 )
- {
+ 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_context->draw_horiz_band = NULL;
+ post_mt( p_sys );
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;
- 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
-
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 )
-{
- decoder_t *p_dec = (decoder_t *)p_context->opaque;
- int i_ret;
-
- /* */
- p_ff_pic->pts = AV_NOPTS_VALUE;
-
- /* We always use default reget function, it works perfectly fine */
- 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 )
-{
- decoder_sys_t *p_sys = p_dec->p_sys;
-
- /* Set picture PTS */
- if( p_sys->input_pts )
- {
- p_ff_pic->pts = p_sys->input_pts;
- }
- else if( p_sys->input_dts )
- {
- /* Some demuxers only set the dts so let's try to find a useful
- * timestamp from this */
- if( !p_sys->p_context->has_b_frames || !p_sys->b_has_b_frames ||
- !p_ff_pic->reference || !p_sys->i_pts )
- {
- p_ff_pic->pts = p_sys->input_dts;
- }
- 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 */
- {
- p_sys->input_pts = p_sys->input_dts = 0;
- }
}
static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *p_context,
decoder_sys_t *p_sys = p_dec->p_sys;
if( p_sys->p_va )
- {
vlc_va_Release( 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 )
- {
+ else if( p_ff_pic->opaque )
+ decoder_UnlinkPicture( p_dec, (picture_t*)p_ff_pic->opaque);
+ else if( p_ff_pic->type == FF_BUFFER_TYPE_INTERNAL )
+ /* We can end up here without the AVFrame being allocated by
+ * avcodec_default_get_buffer() if VA is used and the frame is
+ * released when the decoder is closed
+ */
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;
- }
+ for( int i = 0; i < 4; i++ )
+ p_ff_pic->data[i] = NULL;
}
-static void ffmpeg_NextPts( decoder_t *p_dec )
+static int ffmpeg_va_Start( void *func, va_list ap )
{
- 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;
+
+ return open( va, codec, fmt );
+}
- if( p_sys->i_pts <= 0 )
- return;
+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;
- /* 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_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 )
{
- 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);
+ vlc_object_release( p_va );
+ p_va = NULL;
}
- 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
+ return p_va;
+}
- 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);
- }
+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 );
}
-#ifdef HAVE_AVCODEC_VA
-static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_codec,
+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_codec->opaque;
+ 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_sys->p_va )
- {
- vlc_va_Delete( p_sys->p_va );
- p_sys->p_va = NULL;
- }
+ if( p_va != NULL )
+ vlc_va_Delete( p_va );
+
+ /* Profile and level informations are needed now.
+ * TODO: avoid code duplication with avcodec.c */
+ if( p_context->profile != FF_PROFILE_UNKNOWN)
+ p_dec->fmt_in.i_profile = p_context->profile;
+ if( p_context->level != FF_LEVEL_UNKNOWN)
+ p_dec->fmt_in.i_level = p_context->level;
+
+ p_va = vlc_va_New( VLC_OBJECT(p_dec), p_sys->i_codec_id, &p_dec->fmt_in );
+ if( p_va == NULL )
+ goto end;
/* Try too look for a supported hw acceleration */
- for( int i = 0; pi_fmt[i] != PIX_FMT_NONE; i++ )
+ for( size_t 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" );
-
- /* 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 = vlc_va_NewVaapi( p_sys->i_codec_id );
- if( !p_sys->p_va )
- msg_Warn( p_dec, "Failed to open VA API" );
-#else
+ 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;
-#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( 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_context->width, p_context->height ) )
{
- /* 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 ) )
- {
- 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 );
-
- /* 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];
- }
+ if( p_va->description )
+ msg_Info( p_dec, "Using %s for hardware decoding.",
+ p_va->description );
+
+ /* FIXME this will disable direct rendering
+ * even if a new pixel format is renegotiated
+ */
+ p_sys->b_direct_rendering = false;
+ 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;
+
+end:
/* 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