[FFmpeg-cvslog] Merge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28'

Hendrik Leppkes git at videolan.org
Sun Jun 26 20:23:55 CEST 2016


ffmpeg | branch: release/3.1 | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Jun 26 15:34:01 2016 +0200| [85da4f92580d01cc67061ba90aca28d878868a80] | committer: Hendrik Leppkes

Merge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28'

* commit '18c506e9e6e8df8b1d496d093077b8240ea68c28':
  avconv_dxva2: use the hwcontext device creation API

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=85da4f92580d01cc67061ba90aca28d878868a80
---

 ffmpeg_dxva2.c |  140 +++++---------------------------------------------------
 1 file changed, 11 insertions(+), 129 deletions(-)

diff --git a/ffmpeg_dxva2.c b/ffmpeg_dxva2.c
index 41ee1b6..1a391f8 100644
--- a/ffmpeg_dxva2.c
+++ b/ffmpeg_dxva2.c
@@ -61,9 +61,6 @@ DEFINE_GUID(DXVA2_ModeVP9_VLD_Profile0, 0x463707f8, 0xa1d0,0x4585,0x87,0x6d,0x83
 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 IDirect3D9* WINAPI pDirect3DCreate9(UINT);
-typedef HRESULT WINAPI pCreateDeviceManager9(UINT *, IDirect3DDeviceManager9 **);
-
 typedef struct dxva2_mode {
   const GUID     *guid;
   enum AVCodecID codec;
@@ -96,16 +93,6 @@ static const dxva2_mode dxva2_modes[] = {
     { NULL,                      0 },
 };
 
-typedef struct DXVA2DevicePriv {
-    HMODULE d3dlib;
-    HMODULE dxva2lib;
-
-    HANDLE  deviceHandle;
-
-    IDirect3D9                  *d3d9;
-    IDirect3DDevice9            *d3d9device;
-} DXVA2DevicePriv;
-
 typedef struct DXVA2Context {
     IDirectXVideoDecoder        *decoder;
 
@@ -119,32 +106,6 @@ typedef struct DXVA2Context {
     AVBufferRef                 *hw_frames_ctx;
 } DXVA2Context;
 
-static void dxva2_device_uninit(AVHWDeviceContext *ctx)
-{
-    AVDXVA2DeviceContext *hwctx = ctx->hwctx;
-    DXVA2DevicePriv       *priv = ctx->user_opaque;
-
-    if (hwctx->devmgr && priv->deviceHandle != INVALID_HANDLE_VALUE)
-        IDirect3DDeviceManager9_CloseDeviceHandle(hwctx->devmgr, priv->deviceHandle);
-
-    if (hwctx->devmgr)
-        IDirect3DDeviceManager9_Release(hwctx->devmgr);
-
-    if (priv->d3d9device)
-        IDirect3DDevice9_Release(priv->d3d9device);
-
-    if (priv->d3d9)
-        IDirect3D9_Release(priv->d3d9);
-
-    if (priv->d3dlib)
-        FreeLibrary(priv->d3dlib);
-
-    if (priv->dxva2lib)
-        FreeLibrary(priv->dxva2lib);
-
-    av_freep(&ctx->user_opaque);
-}
-
 static void dxva2_uninit(AVCodecContext *s)
 {
     InputStream  *ist = s->opaque;
@@ -201,17 +162,11 @@ 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;
-    pDirect3DCreate9      *createD3D = NULL;
-    pCreateDeviceManager9 *createDeviceManager = NULL;
+    HANDLE device_handle;
     HRESULT hr;
-    D3DPRESENT_PARAMETERS d3dpp = {0};
-    D3DDISPLAYMODE        d3ddm;
-    unsigned resetToken = 0;
-    UINT adapter = D3DADAPTER_DEFAULT;
 
     AVHWDeviceContext    *device_ctx;
     AVDXVA2DeviceContext *device_hwctx;
-    DXVA2DevicePriv      *device_priv;
     int ret;
 
     ctx = av_mallocz(sizeof(*ctx));
@@ -223,102 +178,29 @@ static int dxva2_alloc(AVCodecContext *s)
     ist->hwaccel_get_buffer    = dxva2_get_buffer;
     ist->hwaccel_retrieve_data = dxva2_retrieve_data;
 
-    ctx->hw_device_ctx = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_DXVA2);
-    if (!ctx->hw_device_ctx)
+    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;
 
-    device_priv = av_mallocz(sizeof(*device_priv));
-    if (!device_priv)
-        goto fail;
-
-    device_ctx->user_opaque = device_priv;
-    device_ctx->free        = dxva2_device_uninit;
-
-    device_priv->deviceHandle = INVALID_HANDLE_VALUE;
-
-    device_priv->d3dlib = LoadLibrary("d3d9.dll");
-    if (!device_priv->d3dlib) {
-        av_log(NULL, loglevel, "Failed to load D3D9 library\n");
-        goto fail;
-    }
-    device_priv->dxva2lib = LoadLibrary("dxva2.dll");
-    if (!device_priv->dxva2lib) {
-        av_log(NULL, loglevel, "Failed to load DXVA2 library\n");
-        goto fail;
-    }
-
-    createD3D = (pDirect3DCreate9 *)GetProcAddress(device_priv->d3dlib, "Direct3DCreate9");
-    if (!createD3D) {
-        av_log(NULL, loglevel, "Failed to locate Direct3DCreate9\n");
-        goto fail;
-    }
-    createDeviceManager = (pCreateDeviceManager9 *)GetProcAddress(device_priv->dxva2lib, "DXVA2CreateDirect3DDeviceManager9");
-    if (!createDeviceManager) {
-        av_log(NULL, loglevel, "Failed to locate DXVA2CreateDirect3DDeviceManager9\n");
-        goto fail;
-    }
-
-    device_priv->d3d9 = createD3D(D3D_SDK_VERSION);
-    if (!device_priv->d3d9) {
-        av_log(NULL, loglevel, "Failed to create IDirect3D object\n");
-        goto fail;
-    }
-
-    if (ist->hwaccel_device) {
-        adapter = atoi(ist->hwaccel_device);
-        av_log(NULL, AV_LOG_INFO, "Using HWAccel device %d\n", adapter);
-    }
-
-    IDirect3D9_GetAdapterDisplayMode(device_priv->d3d9, adapter, &d3ddm);
-    d3dpp.Windowed         = TRUE;
-    d3dpp.BackBufferWidth  = 640;
-    d3dpp.BackBufferHeight = 480;
-    d3dpp.BackBufferCount  = 0;
-    d3dpp.BackBufferFormat = d3ddm.Format;
-    d3dpp.SwapEffect       = D3DSWAPEFFECT_DISCARD;
-    d3dpp.Flags            = D3DPRESENTFLAG_VIDEO;
-
-    hr = IDirect3D9_CreateDevice(device_priv->d3d9, adapter, D3DDEVTYPE_HAL, GetDesktopWindow(),
-                                 D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_MULTITHREADED | D3DCREATE_FPU_PRESERVE,
-                                 &d3dpp, &device_priv->d3d9device);
-    if (FAILED(hr)) {
-        av_log(NULL, loglevel, "Failed to create Direct3D device\n");
-        goto fail;
-    }
-
-    hr = createDeviceManager(&resetToken, &device_hwctx->devmgr);
+    hr = IDirect3DDeviceManager9_OpenDeviceHandle(device_hwctx->devmgr,
+                                                  &device_handle);
     if (FAILED(hr)) {
-        av_log(NULL, loglevel, "Failed to create Direct3D device manager\n");
+        av_log(NULL, loglevel, "Failed to open a device handle\n");
         goto fail;
     }
 
-    hr = IDirect3DDeviceManager9_ResetDevice(device_hwctx->devmgr, device_priv->d3d9device, resetToken);
-    if (FAILED(hr)) {
-        av_log(NULL, loglevel, "Failed to bind Direct3D device to device manager\n");
-        goto fail;
-    }
-
-    hr = IDirect3DDeviceManager9_OpenDeviceHandle(device_hwctx->devmgr, &device_priv->deviceHandle);
-    if (FAILED(hr)) {
-        av_log(NULL, loglevel, "Failed to open device handle\n");
-        goto fail;
-    }
-
-    hr = IDirect3DDeviceManager9_GetVideoService(device_hwctx->devmgr, device_priv->deviceHandle, &IID_IDirectXVideoDecoderService, (void **)&ctx->decoder_service);
+    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;
     }
 
-    ret = av_hwdevice_ctx_init(ctx->hw_device_ctx);
-    if (ret < 0) {
-        av_log(NULL, loglevel, "Failed to initialize the HW device context\n");
-        goto fail;
-    }
-
     ctx->tmp_frame = av_frame_alloc();
     if (!ctx->tmp_frame)
         goto fail;


======================================================================

diff --cc ffmpeg_dxva2.c
index 41ee1b6,0000000..1a391f8
mode 100644,000000..100644
--- a/ffmpeg_dxva2.c
+++ b/ffmpeg_dxva2.c
@@@ -1,562 -1,0 +1,444 @@@
 +/*
 + * This file is part of FFmpeg.
 + *
 + * FFmpeg 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.
 + *
 + * FFmpeg 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 FFmpeg; 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 "ffmpeg.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_ModeVP9_VLD_Profile0, 0x463707f8, 0xa1d0,0x4585,0x87,0x6d,0x83,0xaa,0x6d,0x60,0xb8,0x9e);
 +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 IDirect3D9* WINAPI pDirect3DCreate9(UINT);
- typedef HRESULT WINAPI pCreateDeviceManager9(UINT *, IDirect3DDeviceManager9 **);
- 
 +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 },
 +
 +    /* VP8/9 */
 +    { &DXVA2_ModeVP9_VLD_Profile0, AV_CODEC_ID_VP9 },
 +
 +    { NULL,                      0 },
 +};
 +
- typedef struct DXVA2DevicePriv {
-     HMODULE d3dlib;
-     HMODULE dxva2lib;
- 
-     HANDLE  deviceHandle;
- 
-     IDirect3D9                  *d3d9;
-     IDirect3DDevice9            *d3d9device;
- } DXVA2DevicePriv;
- 
 +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_device_uninit(AVHWDeviceContext *ctx)
- {
-     AVDXVA2DeviceContext *hwctx = ctx->hwctx;
-     DXVA2DevicePriv       *priv = ctx->user_opaque;
- 
-     if (hwctx->devmgr && priv->deviceHandle != INVALID_HANDLE_VALUE)
-         IDirect3DDeviceManager9_CloseDeviceHandle(hwctx->devmgr, priv->deviceHandle);
- 
-     if (hwctx->devmgr)
-         IDirect3DDeviceManager9_Release(hwctx->devmgr);
- 
-     if (priv->d3d9device)
-         IDirect3DDevice9_Release(priv->d3d9device);
- 
-     if (priv->d3d9)
-         IDirect3D9_Release(priv->d3d9);
- 
-     if (priv->d3dlib)
-         FreeLibrary(priv->d3dlib);
- 
-     if (priv->dxva2lib)
-         FreeLibrary(priv->dxva2lib);
- 
-     av_freep(&ctx->user_opaque);
- }
- 
 +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;
-     pDirect3DCreate9      *createD3D = NULL;
-     pCreateDeviceManager9 *createDeviceManager = NULL;
++    HANDLE device_handle;
 +    HRESULT hr;
-     D3DPRESENT_PARAMETERS d3dpp = {0};
-     D3DDISPLAYMODE        d3ddm;
-     unsigned resetToken = 0;
-     UINT adapter = D3DADAPTER_DEFAULT;
 +
 +    AVHWDeviceContext    *device_ctx;
 +    AVDXVA2DeviceContext *device_hwctx;
-     DXVA2DevicePriv      *device_priv;
 +    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;
 +
-     ctx->hw_device_ctx = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_DXVA2);
-     if (!ctx->hw_device_ctx)
++    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;
 +
-     device_priv = av_mallocz(sizeof(*device_priv));
-     if (!device_priv)
-         goto fail;
- 
-     device_ctx->user_opaque = device_priv;
-     device_ctx->free        = dxva2_device_uninit;
- 
-     device_priv->deviceHandle = INVALID_HANDLE_VALUE;
- 
-     device_priv->d3dlib = LoadLibrary("d3d9.dll");
-     if (!device_priv->d3dlib) {
-         av_log(NULL, loglevel, "Failed to load D3D9 library\n");
-         goto fail;
-     }
-     device_priv->dxva2lib = LoadLibrary("dxva2.dll");
-     if (!device_priv->dxva2lib) {
-         av_log(NULL, loglevel, "Failed to load DXVA2 library\n");
-         goto fail;
-     }
- 
-     createD3D = (pDirect3DCreate9 *)GetProcAddress(device_priv->d3dlib, "Direct3DCreate9");
-     if (!createD3D) {
-         av_log(NULL, loglevel, "Failed to locate Direct3DCreate9\n");
-         goto fail;
-     }
-     createDeviceManager = (pCreateDeviceManager9 *)GetProcAddress(device_priv->dxva2lib, "DXVA2CreateDirect3DDeviceManager9");
-     if (!createDeviceManager) {
-         av_log(NULL, loglevel, "Failed to locate DXVA2CreateDirect3DDeviceManager9\n");
-         goto fail;
-     }
- 
-     device_priv->d3d9 = createD3D(D3D_SDK_VERSION);
-     if (!device_priv->d3d9) {
-         av_log(NULL, loglevel, "Failed to create IDirect3D object\n");
-         goto fail;
-     }
- 
-     if (ist->hwaccel_device) {
-         adapter = atoi(ist->hwaccel_device);
-         av_log(NULL, AV_LOG_INFO, "Using HWAccel device %d\n", adapter);
-     }
- 
-     IDirect3D9_GetAdapterDisplayMode(device_priv->d3d9, adapter, &d3ddm);
-     d3dpp.Windowed         = TRUE;
-     d3dpp.BackBufferWidth  = 640;
-     d3dpp.BackBufferHeight = 480;
-     d3dpp.BackBufferCount  = 0;
-     d3dpp.BackBufferFormat = d3ddm.Format;
-     d3dpp.SwapEffect       = D3DSWAPEFFECT_DISCARD;
-     d3dpp.Flags            = D3DPRESENTFLAG_VIDEO;
- 
-     hr = IDirect3D9_CreateDevice(device_priv->d3d9, adapter, D3DDEVTYPE_HAL, GetDesktopWindow(),
-                                  D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_MULTITHREADED | D3DCREATE_FPU_PRESERVE,
-                                  &d3dpp, &device_priv->d3d9device);
-     if (FAILED(hr)) {
-         av_log(NULL, loglevel, "Failed to create Direct3D device\n");
-         goto fail;
-     }
- 
-     hr = createDeviceManager(&resetToken, &device_hwctx->devmgr);
++    hr = IDirect3DDeviceManager9_OpenDeviceHandle(device_hwctx->devmgr,
++                                                  &device_handle);
 +    if (FAILED(hr)) {
-         av_log(NULL, loglevel, "Failed to create Direct3D device manager\n");
++        av_log(NULL, loglevel, "Failed to open a device handle\n");
 +        goto fail;
 +    }
 +
-     hr = IDirect3DDeviceManager9_ResetDevice(device_hwctx->devmgr, device_priv->d3d9device, resetToken);
-     if (FAILED(hr)) {
-         av_log(NULL, loglevel, "Failed to bind Direct3D device to device manager\n");
-         goto fail;
-     }
- 
-     hr = IDirect3DDeviceManager9_OpenDeviceHandle(device_hwctx->devmgr, &device_priv->deviceHandle);
-     if (FAILED(hr)) {
-         av_log(NULL, loglevel, "Failed to open device handle\n");
-         goto fail;
-     }
- 
-     hr = IDirect3DDeviceManager9_GetVideoService(device_hwctx->devmgr, device_priv->deviceHandle, &IID_IDirectXVideoDecoderService, (void **)&ctx->decoder_service);
++    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;
 +    }
 +
-     ret = av_hwdevice_ctx_init(ctx->hw_device_ctx);
-     if (ret < 0) {
-         av_log(NULL, loglevel, "Failed to initialize the HW device context\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 if (s->codec_id == AV_CODEC_ID_VP9)
 +        num_surfaces += 8;
 +    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         = (target_format == MKTAG('P','0','1','0') ? 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;
 +}



More information about the ffmpeg-cvslog mailing list