RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28' 

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2016-06-26 15:34:01 +02:00
parent 844256740d 18c506e9e6
commit 85da4f9258
1 changed files with 11 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
ffmpeg_dxva2.c
View File

@ -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(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); 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 { typedef struct dxva2_mode {
const GUID *guid; const GUID *guid;
enum AVCodecID codec; enum AVCodecID codec;
@ -96,16 +93,6 @@ static const dxva2_mode dxva2_modes[] = {
{ NULL, 0 }, { NULL, 0 },
}; };
typedef struct DXVA2DevicePriv {
HMODULE d3dlib;
HMODULE dxva2lib;
HANDLE deviceHandle;
IDirect3D9 *d3d9;
IDirect3DDevice9 *d3d9device;
} DXVA2DevicePriv;
typedef struct DXVA2Context { typedef struct DXVA2Context {
IDirectXVideoDecoder *decoder; IDirectXVideoDecoder *decoder;
@ -119,32 +106,6 @@ typedef struct DXVA2Context {
AVBufferRef *hw_frames_ctx; AVBufferRef *hw_frames_ctx;
} DXVA2Context; } 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) static void dxva2_uninit(AVCodecContext *s)
{ {
InputStream *ist = s->opaque; InputStream *ist = s->opaque;
@ -201,17 +162,11 @@ static int dxva2_alloc(AVCodecContext *s)
InputStream *ist = s->opaque; InputStream *ist = s->opaque;
int loglevel = (ist->hwaccel_id == HWACCEL_AUTO) ? AV_LOG_VERBOSE : AV_LOG_ERROR; int loglevel = (ist->hwaccel_id == HWACCEL_AUTO) ? AV_LOG_VERBOSE : AV_LOG_ERROR;
DXVA2Context *ctx; DXVA2Context *ctx;
pDirect3DCreate9 *createD3D = NULL; HANDLE device_handle;
pCreateDeviceManager9 *createDeviceManager = NULL;
HRESULT hr; HRESULT hr;
D3DPRESENT_PARAMETERS d3dpp = {0};
D3DDISPLAYMODE d3ddm;
unsigned resetToken = 0;
UINT adapter = D3DADAPTER_DEFAULT;
AVHWDeviceContext *device_ctx; AVHWDeviceContext *device_ctx;
AVDXVA2DeviceContext *device_hwctx; AVDXVA2DeviceContext *device_hwctx;
DXVA2DevicePriv *device_priv;
int ret; int ret;
ctx = av_mallocz(sizeof(*ctx)); ctx = av_mallocz(sizeof(*ctx));
@ -223,102 +178,29 @@ static int dxva2_alloc(AVCodecContext *s)
ist->hwaccel_get_buffer = dxva2_get_buffer; ist->hwaccel_get_buffer = dxva2_get_buffer;
ist->hwaccel_retrieve_data = dxva2_retrieve_data; ist->hwaccel_retrieve_data = dxva2_retrieve_data;
ctx->hw_device_ctx = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_DXVA2); ret = av_hwdevice_ctx_create(&ctx->hw_device_ctx, AV_HWDEVICE_TYPE_DXVA2,
if (!ctx->hw_device_ctx) ist->hwaccel_device, NULL, 0);
if (ret < 0)
goto fail; goto fail;
device_ctx = (AVHWDeviceContext*)ctx->hw_device_ctx->data; device_ctx = (AVHWDeviceContext*)ctx->hw_device_ctx->data;
device_hwctx = device_ctx->hwctx; device_hwctx = device_ctx->hwctx;
device_priv = av_mallocz(sizeof(*device_priv)); hr = IDirect3DDeviceManager9_OpenDeviceHandle(device_hwctx->devmgr,
if (!device_priv) &device_handle);
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)) { if (FAILED(hr)) {
av_log(NULL, loglevel, "Failed to create Direct3D device\n"); av_log(NULL, loglevel, "Failed to open a device handle\n");
goto fail; goto fail;
} }
hr = createDeviceManager(&resetToken, &device_hwctx->devmgr); hr = IDirect3DDeviceManager9_GetVideoService(device_hwctx->devmgr, device_handle,
if (FAILED(hr)) { &IID_IDirectXVideoDecoderService,
av_log(NULL, loglevel, "Failed to create Direct3D device manager\n"); (void **)&ctx->decoder_service);
goto fail; IDirect3DDeviceManager9_CloseDeviceHandle(device_hwctx->devmgr, device_handle);
}
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);
if (FAILED(hr)) { if (FAILED(hr)) {
av_log(NULL, loglevel, "Failed to create IDirectXVideoDecoderService\n"); av_log(NULL, loglevel, "Failed to create IDirectXVideoDecoderService\n");
goto fail; 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(); ctx->tmp_frame = av_frame_alloc();
if (!ctx->tmp_frame) if (!ctx->tmp_frame)
goto fail; goto fail;