This is done by the generic code now. It was not removed earlier to
reduce the diff in the commit adding the new code.
---
This also hopefully fixes all aspects of dxva2 in configure.
---
avtools/Makefile | 1 -
avtools/avconv.h | 1 -
avtools/avconv_dxva2.c | 440 -------------------------------------------------
avtools/avconv_opt.c | 4 +-
configure | 7 +-
5 files changed, 2 insertions(+), 451 deletions(-)
delete mode 100644 avtools/avconv_dxva2.c
diff --git a/avtools/Makefile b/avtools/Makefile
index c23a605a55..d95e2d9fc2 100644
--- a/avtools/Makefile
+++ b/avtools/Makefile
@@ -12,7 +12,6 @@ OBJS-avconv += avtools/avconv_opt.o
avtools/avconv_filter.o \
avtools/avconv_hw.o
OBJS-avconv-$(CONFIG_LIBMFX) += avtools/avconv_qsv.o
OBJS-avconv-$(CONFIG_VDA) += avtools/avconv_vda.o
-OBJS-avconv-$(HAVE_DXVA2_LIB) += avtools/avconv_dxva2.o
define DOAVTOOL
OBJS-$(1) += avtools/cmdutils.o avtools/$(1).o $(OBJS-$(1)-yes)
diff --git a/avtools/avconv.h b/avtools/avconv.h
index fe2bb313b7..4c699333a5 100644
--- a/avtools/avconv.h
+++ b/avtools/avconv.h
@@ -54,7 +54,6 @@ enum HWAccelID {
HWACCEL_AUTO,
HWACCEL_VDPAU,
HWACCEL_DXVA2,
- HWACCEL_DXVA2_OLD,
HWACCEL_VDA,
HWACCEL_QSV,
HWACCEL_VAAPI,
diff --git a/avtools/avconv_dxva2.c b/avtools/avconv_dxva2.c
deleted file mode 100644
index 7578c3f632..0000000000
--- a/avtools/avconv_dxva2.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <windows.h>
-
-#ifdef _WIN32_WINNT
-#undef _WIN32_WINNT
-#endif
-#define _WIN32_WINNT 0x0600
-#define DXVA2API_USE_BITFIELDS
-#define COBJMACROS
-
-#include <stdint.h>
-
-#include <d3d9.h>
-#include <dxva2api.h>
-
-#include "avconv.h"
-
-#include "libavcodec/dxva2.h"
-
-#include "libavutil/avassert.h"
-#include "libavutil/buffer.h"
-#include "libavutil/frame.h"
-#include "libavutil/imgutils.h"
-#include "libavutil/pixfmt.h"
-
-#include "libavutil/hwcontext.h"
-#include "libavutil/hwcontext_dxva2.h"
-
-/* define all the GUIDs used directly here,
- to avoid problems with inconsistent dxva2api.h versions in mingw-w64 and
different MSVC version */
-#include <initguid.h>
-DEFINE_GUID(IID_IDirectXVideoDecoderService,
0xfc51a551,0xd5e7,0x11d9,0xaf,0x55,0x00,0x05,0x4e,0x43,0xff,0x02);
-
-DEFINE_GUID(DXVA2_ModeMPEG2_VLD, 0xee27417f,
0x5e28,0x4e65,0xbe,0xea,0x1d,0x26,0xb5,0x08,0xad,0xc9);
-DEFINE_GUID(DXVA2_ModeMPEG2and1_VLD, 0x86695f12,
0x340e,0x4f04,0x9f,0xd3,0x92,0x53,0xdd,0x32,0x74,0x60);
-DEFINE_GUID(DXVA2_ModeH264_E, 0x1b81be68,
0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
-DEFINE_GUID(DXVA2_ModeH264_F, 0x1b81be69,
0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
-DEFINE_GUID(DXVADDI_Intel_ModeH264_E, 0x604F8E68,
0x4951,0x4C54,0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6);
-DEFINE_GUID(DXVA2_ModeVC1_D, 0x1b81beA3,
0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
-DEFINE_GUID(DXVA2_ModeVC1_D2010, 0x1b81beA4,
0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
-DEFINE_GUID(DXVA2_ModeHEVC_VLD_Main, 0x5b11d51b,
0x2f4c,0x4452,0xbc,0xc3,0x09,0xf2,0xa1,0x16,0x0c,0xc0);
-DEFINE_GUID(DXVA2_ModeHEVC_VLD_Main10,0x107af0e0,
0xef1a,0x4d19,0xab,0xa8,0x67,0xa1,0x63,0x07,0x3d,0x13);
-DEFINE_GUID(DXVA2_NoEncrypt, 0x1b81beD0,
0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
-DEFINE_GUID(GUID_NULL, 0x00000000,
0x0000,0x0000,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00);
-
-typedef struct dxva2_mode {
- const GUID *guid;
- enum AVCodecID codec;
-} dxva2_mode;
-
-static const dxva2_mode dxva2_modes[] = {
- /* MPEG-2 */
- { &DXVA2_ModeMPEG2_VLD, AV_CODEC_ID_MPEG2VIDEO },
- { &DXVA2_ModeMPEG2and1_VLD, AV_CODEC_ID_MPEG2VIDEO },
-
- /* H.264 */
- { &DXVA2_ModeH264_F, AV_CODEC_ID_H264 },
- { &DXVA2_ModeH264_E, AV_CODEC_ID_H264 },
- /* Intel specific H.264 mode */
- { &DXVADDI_Intel_ModeH264_E, AV_CODEC_ID_H264 },
-
- /* VC-1 / WMV3 */
- { &DXVA2_ModeVC1_D2010, AV_CODEC_ID_VC1 },
- { &DXVA2_ModeVC1_D2010, AV_CODEC_ID_WMV3 },
- { &DXVA2_ModeVC1_D, AV_CODEC_ID_VC1 },
- { &DXVA2_ModeVC1_D, AV_CODEC_ID_WMV3 },
-
- /* HEVC/H.265 */
- { &DXVA2_ModeHEVC_VLD_Main, AV_CODEC_ID_HEVC },
- { &DXVA2_ModeHEVC_VLD_Main10, AV_CODEC_ID_HEVC },
-
- { NULL, 0 },
-};
-
-typedef struct DXVA2Context {
- IDirectXVideoDecoder *decoder;
-
- GUID decoder_guid;
- DXVA2_ConfigPictureDecode decoder_config;
- IDirectXVideoDecoderService *decoder_service;
-
- AVFrame *tmp_frame;
-
- AVBufferRef *hw_device_ctx;
- AVBufferRef *hw_frames_ctx;
-} DXVA2Context;
-
-static void dxva2_uninit(AVCodecContext *s)
-{
- InputStream *ist = s->opaque;
- DXVA2Context *ctx = ist->hwaccel_ctx;
-
- ist->hwaccel_uninit = NULL;
- ist->hwaccel_get_buffer = NULL;
- ist->hwaccel_retrieve_data = NULL;
-
- if (ctx->decoder_service)
- IDirectXVideoDecoderService_Release(ctx->decoder_service);
-
- av_buffer_unref(&ctx->hw_frames_ctx);
- av_buffer_unref(&ctx->hw_device_ctx);
-
- av_frame_free(&ctx->tmp_frame);
-
- av_freep(&ist->hwaccel_ctx);
- av_freep(&s->hwaccel_context);
-}
-
-static int dxva2_get_buffer(AVCodecContext *s, AVFrame *frame, int flags)
-{
- InputStream *ist = s->opaque;
- DXVA2Context *ctx = ist->hwaccel_ctx;
-
- return av_hwframe_get_buffer(ctx->hw_frames_ctx, frame, 0);
-}
-
-static int dxva2_retrieve_data(AVCodecContext *s, AVFrame *frame)
-{
- InputStream *ist = s->opaque;
- DXVA2Context *ctx = ist->hwaccel_ctx;
- int ret;
-
- ret = av_hwframe_transfer_data(ctx->tmp_frame, frame, 0);
- if (ret < 0)
- return ret;
-
- ret = av_frame_copy_props(ctx->tmp_frame, frame);
- if (ret < 0) {
- av_frame_unref(ctx->tmp_frame);
- return ret;
- }
-
- av_frame_unref(frame);
- av_frame_move_ref(frame, ctx->tmp_frame);
-
- return 0;
-}
-
-static int dxva2_alloc(AVCodecContext *s)
-{
- InputStream *ist = s->opaque;
- int loglevel = (ist->hwaccel_id == HWACCEL_AUTO) ? AV_LOG_VERBOSE :
AV_LOG_ERROR;
- DXVA2Context *ctx;
- HANDLE device_handle;
- HRESULT hr;
-
- AVHWDeviceContext *device_ctx;
- AVDXVA2DeviceContext *device_hwctx;
- int ret;
-
- ctx = av_mallocz(sizeof(*ctx));
- if (!ctx)
- return AVERROR(ENOMEM);
-
- ist->hwaccel_ctx = ctx;
- ist->hwaccel_uninit = dxva2_uninit;
- ist->hwaccel_get_buffer = dxva2_get_buffer;
- ist->hwaccel_retrieve_data = dxva2_retrieve_data;
-
- ret = av_hwdevice_ctx_create(&ctx->hw_device_ctx, AV_HWDEVICE_TYPE_DXVA2,
- ist->hwaccel_device, NULL, 0);
- if (ret < 0)
- goto fail;
- device_ctx = (AVHWDeviceContext*)ctx->hw_device_ctx->data;
- device_hwctx = device_ctx->hwctx;
-
- hr = IDirect3DDeviceManager9_OpenDeviceHandle(device_hwctx->devmgr,
- &device_handle);
- if (FAILED(hr)) {
- av_log(NULL, loglevel, "Failed to open a device handle\n");
- goto fail;
- }
-
- hr = IDirect3DDeviceManager9_GetVideoService(device_hwctx->devmgr,
device_handle,
-
&IID_IDirectXVideoDecoderService,
- (void
**)&ctx->decoder_service);
- IDirect3DDeviceManager9_CloseDeviceHandle(device_hwctx->devmgr,
device_handle);
- if (FAILED(hr)) {
- av_log(NULL, loglevel, "Failed to create
IDirectXVideoDecoderService\n");
- goto fail;
- }
-
- ctx->tmp_frame = av_frame_alloc();
- if (!ctx->tmp_frame)
- goto fail;
-
- s->hwaccel_context = av_mallocz(sizeof(struct dxva_context));
- if (!s->hwaccel_context)
- goto fail;
-
- return 0;
-fail:
- dxva2_uninit(s);
- return AVERROR(EINVAL);
-}
-
-static int dxva2_get_decoder_configuration(AVCodecContext *s, const GUID
*device_guid,
- const DXVA2_VideoDesc *desc,
- DXVA2_ConfigPictureDecode *config)
-{
- InputStream *ist = s->opaque;
- int loglevel = (ist->hwaccel_id == HWACCEL_AUTO) ? AV_LOG_VERBOSE :
AV_LOG_ERROR;
- DXVA2Context *ctx = ist->hwaccel_ctx;
- unsigned cfg_count = 0, best_score = 0;
- DXVA2_ConfigPictureDecode *cfg_list = NULL;
- DXVA2_ConfigPictureDecode best_cfg = {{0}};
- HRESULT hr;
- int i;
-
- hr =
IDirectXVideoDecoderService_GetDecoderConfigurations(ctx->decoder_service,
device_guid, desc, NULL, &cfg_count, &cfg_list);
- if (FAILED(hr)) {
- av_log(NULL, loglevel, "Unable to retrieve decoder configurations\n");
- return AVERROR(EINVAL);
- }
-
- for (i = 0; i < cfg_count; i++) {
- DXVA2_ConfigPictureDecode *cfg = &cfg_list[i];
-
- unsigned score;
- if (cfg->ConfigBitstreamRaw == 1)
- score = 1;
- else if (s->codec_id == AV_CODEC_ID_H264 && cfg->ConfigBitstreamRaw ==
2)
- score = 2;
- else
- continue;
- if (IsEqualGUID(&cfg->guidConfigBitstreamEncryption, &DXVA2_NoEncrypt))
- score += 16;
- if (score > best_score) {
- best_score = score;
- best_cfg = *cfg;
- }
- }
- CoTaskMemFree(cfg_list);
-
- if (!best_score) {
- av_log(NULL, loglevel, "No valid decoder configuration available\n");
- return AVERROR(EINVAL);
- }
-
- *config = best_cfg;
- return 0;
-}
-
-static int dxva2_create_decoder(AVCodecContext *s)
-{
- InputStream *ist = s->opaque;
- int loglevel = (ist->hwaccel_id == HWACCEL_AUTO) ? AV_LOG_VERBOSE :
AV_LOG_ERROR;
- DXVA2Context *ctx = ist->hwaccel_ctx;
- struct dxva_context *dxva_ctx = s->hwaccel_context;
- GUID *guid_list = NULL;
- unsigned guid_count = 0, i, j;
- GUID device_guid = GUID_NULL;
- const D3DFORMAT surface_format = s->sw_pix_fmt == AV_PIX_FMT_YUV420P10 ?
- MKTAG('P', '0', '1', '0') : MKTAG('N',
'V', '1', '2');
- D3DFORMAT target_format = 0;
- DXVA2_VideoDesc desc = { 0 };
- DXVA2_ConfigPictureDecode config;
- HRESULT hr;
- int surface_alignment, num_surfaces;
- int ret;
-
- AVDXVA2FramesContext *frames_hwctx;
- AVHWFramesContext *frames_ctx;
-
- hr =
IDirectXVideoDecoderService_GetDecoderDeviceGuids(ctx->decoder_service,
&guid_count, &guid_list);
- if (FAILED(hr)) {
- av_log(NULL, loglevel, "Failed to retrieve decoder device GUIDs\n");
- goto fail;
- }
-
- for (i = 0; dxva2_modes[i].guid; i++) {
- D3DFORMAT *target_list = NULL;
- unsigned target_count = 0;
- const dxva2_mode *mode = &dxva2_modes[i];
- if (mode->codec != s->codec_id)
- continue;
-
- for (j = 0; j < guid_count; j++) {
- if (IsEqualGUID(mode->guid, &guid_list[j]))
- break;
- }
- if (j == guid_count)
- continue;
-
- hr =
IDirectXVideoDecoderService_GetDecoderRenderTargets(ctx->decoder_service,
mode->guid, &target_count, &target_list);
- if (FAILED(hr)) {
- continue;
- }
- for (j = 0; j < target_count; j++) {
- const D3DFORMAT format = target_list[j];
- if (format == surface_format) {
- target_format = format;
- break;
- }
- }
- CoTaskMemFree(target_list);
- if (target_format) {
- device_guid = *mode->guid;
- break;
- }
- }
- CoTaskMemFree(guid_list);
-
- if (IsEqualGUID(&device_guid, &GUID_NULL)) {
- av_log(NULL, loglevel, "No decoder device for codec found\n");
- goto fail;
- }
-
- desc.SampleWidth = s->coded_width;
- desc.SampleHeight = s->coded_height;
- desc.Format = target_format;
-
- ret = dxva2_get_decoder_configuration(s, &device_guid, &desc, &config);
- if (ret < 0) {
- goto fail;
- }
-
- /* decoding MPEG-2 requires additional alignment on some Intel GPUs,
- but it causes issues for H.264 on certain AMD GPUs..... */
- if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO)
- surface_alignment = 32;
- /* the HEVC DXVA2 spec asks for 128 pixel aligned surfaces to ensure
- all coding features have enough room to work with */
- else if (s->codec_id == AV_CODEC_ID_HEVC)
- surface_alignment = 128;
- else
- surface_alignment = 16;
-
- /* 4 base work surfaces */
- num_surfaces = 4;
-
- /* add surfaces based on number of possible refs */
- if (s->codec_id == AV_CODEC_ID_H264 || s->codec_id == AV_CODEC_ID_HEVC)
- num_surfaces += 16;
- else
- num_surfaces += 2;
-
- /* add extra surfaces for frame threading */
- if (s->active_thread_type & FF_THREAD_FRAME)
- num_surfaces += s->thread_count;
-
- ctx->hw_frames_ctx = av_hwframe_ctx_alloc(ctx->hw_device_ctx);
- if (!ctx->hw_frames_ctx)
- goto fail;
- frames_ctx = (AVHWFramesContext*)ctx->hw_frames_ctx->data;
- frames_hwctx = frames_ctx->hwctx;
-
- frames_ctx->format = AV_PIX_FMT_DXVA2_VLD;
- frames_ctx->sw_format = s->sw_pix_fmt == AV_PIX_FMT_YUV420P10 ?
- AV_PIX_FMT_P010 : AV_PIX_FMT_NV12;
- frames_ctx->width = FFALIGN(s->coded_width, surface_alignment);
- frames_ctx->height = FFALIGN(s->coded_height,
surface_alignment);
- frames_ctx->initial_pool_size = num_surfaces;
-
- frames_hwctx->surface_type = DXVA2_VideoDecoderRenderTarget;
-
- ret = av_hwframe_ctx_init(ctx->hw_frames_ctx);
- if (ret < 0) {
- av_log(NULL, loglevel, "Failed to initialize the HW frames context\n");
- goto fail;
- }
-
- hr = IDirectXVideoDecoderService_CreateVideoDecoder(ctx->decoder_service,
&device_guid,
- &desc, &config,
frames_hwctx->surfaces,
-
frames_hwctx->nb_surfaces, &frames_hwctx->decoder_to_release);
- if (FAILED(hr)) {
- av_log(NULL, loglevel, "Failed to create DXVA2 video decoder\n");
- goto fail;
- }
-
- ctx->decoder_guid = device_guid;
- ctx->decoder_config = config;
-
- dxva_ctx->cfg = &ctx->decoder_config;
- dxva_ctx->decoder = frames_hwctx->decoder_to_release;
- dxva_ctx->surface = frames_hwctx->surfaces;
- dxva_ctx->surface_count = frames_hwctx->nb_surfaces;
-
- if (IsEqualGUID(&ctx->decoder_guid, &DXVADDI_Intel_ModeH264_E))
- dxva_ctx->workaround |= FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO;
-
- return 0;
-fail:
- av_buffer_unref(&ctx->hw_frames_ctx);
- return AVERROR(EINVAL);
-}
-
-int dxva2_init(AVCodecContext *s)
-{
- InputStream *ist = s->opaque;
- int loglevel = (ist->hwaccel_id == HWACCEL_AUTO) ? AV_LOG_VERBOSE :
AV_LOG_ERROR;
- DXVA2Context *ctx;
- int ret;
-
- if (!ist->hwaccel_ctx) {
- ret = dxva2_alloc(s);
- if (ret < 0)
- return ret;
- }
- ctx = ist->hwaccel_ctx;
-
- if (s->codec_id == AV_CODEC_ID_H264 &&
- (s->profile & ~FF_PROFILE_H264_CONSTRAINED) > FF_PROFILE_H264_HIGH) {
- av_log(NULL, loglevel, "Unsupported H.264 profile for DXVA2 HWAccel:
%d\n", s->profile);
- return AVERROR(EINVAL);
- }
-
- if (s->codec_id == AV_CODEC_ID_HEVC &&
- s->profile != FF_PROFILE_HEVC_MAIN && s->profile !=
FF_PROFILE_HEVC_MAIN_10) {
- av_log(NULL, loglevel, "Unsupported HEVC profile for DXVA2 HWAccel:
%d\n", s->profile);
- return AVERROR(EINVAL);
- }
-
- av_buffer_unref(&ctx->hw_frames_ctx);
-
- ret = dxva2_create_decoder(s);
- if (ret < 0) {
- av_log(NULL, loglevel, "Error creating the DXVA2 decoder\n");
- return ret;
- }
-
- return 0;
-}
diff --git a/avtools/avconv_opt.c b/avtools/avconv_opt.c
index 7e4f124610..575ce120dd 100644
--- a/avtools/avconv_opt.c
+++ b/avtools/avconv_opt.c
@@ -64,11 +64,9 @@ const HWAccel hwaccels[] = {
{ "d3d11va", hwaccel_decode_init, HWACCEL_D3D11VA, AV_PIX_FMT_D3D11,
AV_HWDEVICE_TYPE_D3D11VA },
#endif
-#if HAVE_DXVA2_LIB
+#if CONFIG_DXVA2
{ "dxva2", hwaccel_decode_init, HWACCEL_DXVA2, AV_PIX_FMT_DXVA2_VLD,
AV_HWDEVICE_TYPE_DXVA2 },
- { "dxva2-old", dxva2_init, HWACCEL_DXVA2_OLD, AV_PIX_FMT_DXVA2_VLD,
- AV_HWDEVICE_TYPE_NONE },
#endif
#if CONFIG_VDA
{ "vda", vda_init, HWACCEL_VDA, AV_PIX_FMT_VDA,
diff --git a/configure b/configure
index 789c052598..46f39888e0 100755
--- a/configure
+++ b/configure
@@ -1713,7 +1713,6 @@ HAVE_LIST="
$TOOLCHAIN_FEATURES
$TYPES_LIST
dos_paths
- dxva2_lib
libc_msvcrt
MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS
sdl
@@ -2167,7 +2166,6 @@ zmbv_encoder_deps="zlib"
# hardware accelerators
d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder"
dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode ole32"
-dxva2_lib_deps="dxva2"
vda_deps="VideoDecodeAcceleration_VDADecoder_h blocks_extension pthreads"
vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration
-framework QuartzCore"
@@ -2548,7 +2546,7 @@ avconv_deps="avcodec avfilter avformat avresample swscale"
avconv_select="aformat_filter anull_filter asyncts_filter atrim_filter
format_filter
fps_filter null_filter resample_filter scale_filter
trim_filter"
-avconv_suggest="dxva2_lib ole32 psapi shell32"
+avconv_suggest="psapi shell32"
avplay_deps="avcodec avfilter avformat avresample sdl"
avplay_select="rdft format_filter transpose_filter hflip_filter vflip_filter"
avplay_suggest="shell32"
@@ -4874,9 +4872,6 @@ enabled d3d11va &&
check_type "windows.h d3d11.h" ID3D11VideoDevice ||
disable d3d11va
-enabled dxva2 &&
- check_lib dxva2_lib windows.h CoTaskMemFree -lole32
-
enabled vaapi && require vaapi va/va.h vaInitialize -lva
enabled vaapi &&
--
2.11.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
