From patchwork Wed Jan 4 13:52:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 2051 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp4841734vsb; Wed, 4 Jan 2017 05:59:26 -0800 (PST) X-Received: by 10.194.124.162 with SMTP id mj2mr56736815wjb.111.1483538366647; Wed, 04 Jan 2017 05:59:26 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t10si77804960wmb.123.2017.01.04.05.59.26; Wed, 04 Jan 2017 05:59:26 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D13D2689FD0; Wed, 4 Jan 2017 15:59:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wj0-f194.google.com (mail-wj0-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73AA8689E03 for ; Wed, 4 Jan 2017 15:59:06 +0200 (EET) Received: by mail-wj0-f194.google.com with SMTP id qs7so38016353wjc.1 for ; Wed, 04 Jan 2017 05:59:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=/uPF7glxoElH70Z/lmdPDEPhnWyXrZfCrZq2F2lNuJ0=; b=I79lx7rMoLp4A2QQj15j+2139mkm1FeVkVk6eXPL1WY/zfiUcMGnmSTzsTvgeFHgIa zcFZNgdYnjvN6ZgHckAV6Xmn8XlUg7OlxFM/hJwzUcdo7fb98SpJZo+vfbU0KMSNJJ3n zGA6nI3adQgnc37yxS+pTkAGB5TFn0+J8gAIEUZTdWw4jou5K2OH4v+A52vp7WZ7EpaM mMQodjdJf8FGDiU9qUnMUUSlID/b5a7Bj8jMWCu2oCsmsZjYLDDOwTsB+jpPkTHh0l9m W576A8jyjaLY+c0lOS/y8BNYvbYkAehBYzz/3PTyYQ4iND/VDHJExzJKDwQwHyZlFv4s LK6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=/uPF7glxoElH70Z/lmdPDEPhnWyXrZfCrZq2F2lNuJ0=; b=I+bhBHwrPd/PY4K7dfXU0gNl6OdSuOAcLFJj3cV3FumCHWuSUvxJXpnIT59UmJndsh Iq+ufGYEleEV/48wSZ2trgNOaSX9REIRlBV0NeBRf7ssQVr0n1BINjmfv/66Bfjlu3qp zzBI91SDDoNO9AFvktlsvnfWpq0iTTm7hW3Uw/aI9e+YMsNIFimPJ7dsw8o73rs8an+o Fnfh1nk0IxP81zZckakW+kBJlwPXPt3QyYTlNqJ1xbShcNmmdHlrmwH7qvH98qSsTryn WVrVYjjK7igzmiDGi0ZhPGiG/QDzTuuqKj/1amxmDcReViaCzL5vFJyDlNs+Whc9ZYlV Z9mQ== X-Gm-Message-State: AIkVDXJOv0EzagJjjYtby35xIMpm7xLVflRCOyJMw8aD3NWqWh+zIw4dyMt6lCF48UJcFA== X-Received: by 10.194.28.105 with SMTP id a9mr53753991wjh.113.1483537994245; Wed, 04 Jan 2017 05:53:14 -0800 (PST) Received: from localhost.localdomain (2a01cb0c000ea9005c35e70f116a1c8d.ipv6.abo.wanadoo.fr. [2a01:cb0c:e:a900:5c35:e70f:116a:1c8d]) by smtp.gmail.com with ESMTPSA id w18sm95247785wme.9.2017.01.04.05.53.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Jan 2017 05:53:13 -0800 (PST) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Jan 2017 14:52:43 +0100 Message-Id: <20170104135243.13512-7-robux4@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170104135243.13512-1-robux4@gmail.com> References: <20170104135243.13512-1-robux4@gmail.com> Subject: [FFmpeg-devel] [PATCH 6/6] ffmpeg: dxva: use the typedefs more to make comparison between dxva2 and d3d11va X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- ffmpeg_d3d11va.c | 9 +++++---- ffmpeg_dxva2.c | 19 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ffmpeg_d3d11va.c b/ffmpeg_d3d11va.c index b8ca9d8..3fd12f2 100644 --- a/ffmpeg_d3d11va.c +++ b/ffmpeg_d3d11va.c @@ -58,8 +58,8 @@ typedef ID3D11VideoDevice *DXVA_DECODER_SERVICE; #include "ffmpeg_dxva_template.c" static int d3d11va_get_decoder_configuration(AVCodecContext *s, - const D3D11_VIDEO_DECODER_DESC *desc, - D3D11_VIDEO_DECODER_CONFIG *config) + const D3D11_VIDEO_DECODER_DESC *desc, + DXVA_DECODER_CONFIG *config) { InputStream *ist = s->opaque; int loglevel = (ist->hwaccel_id == HWACCEL_AUTO) ? AV_LOG_VERBOSE : AV_LOG_ERROR; @@ -112,9 +112,10 @@ static int d3d11va_create_decoder(AVCodecContext *s) GUID *guid_list; unsigned guid_count, i; GUID decoder_guid; - const DXGI_FORMAT surface_format = (s->sw_pix_fmt == AV_PIX_FMT_YUV420P10) ? DXGI_FORMAT_P010 : DXGI_FORMAT_NV12; + const DXVA_SURFACE_FORMAT surface_format = s->sw_pix_fmt == AV_PIX_FMT_YUV420P10 ? + DXGI_FORMAT_P010 : DXGI_FORMAT_NV12; D3D11_VIDEO_DECODER_DESC desc = { 0 }; - D3D11_VIDEO_DECODER_CONFIG config; + DXVA_DECODER_CONFIG config; HRESULT hr; int ret; diff --git a/ffmpeg_dxva2.c b/ffmpeg_dxva2.c index 68e0365..1497b76 100644 --- a/ffmpeg_dxva2.c +++ b/ffmpeg_dxva2.c @@ -69,7 +69,7 @@ DEFINE_GUID(IID_IDirectXVideoDecoderService, 0xfc51a551,0xd5e7,0x11d9,0xaf,0x55, static void dxva2_uninit(AVCodecContext *s) { InputStream *ist = s->opaque; - DXVA2Context *ctx = ist->hwaccel_ctx; + DXVA_CONTEXT *ctx = ist->hwaccel_ctx; if (ctx->decoder_service) IDirectXVideoDecoderService_Release(ctx->decoder_service); @@ -81,7 +81,7 @@ 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; + DXVA_CONTEXT *ctx; HANDLE device_handle; HRESULT hr; @@ -120,13 +120,13 @@ fail: static int dxva2_get_decoder_configuration(AVCodecContext *s, const GUID *device_guid, const DXVA2_VideoDesc *desc, - DXVA2_ConfigPictureDecode *config) + DXVA_DECODER_CONFIG *config) { InputStream *ist = s->opaque; int loglevel = (ist->hwaccel_id == HWACCEL_AUTO) ? AV_LOG_VERBOSE : AV_LOG_ERROR; - DXVA2Context *ctx = ist->hwaccel_ctx; + DXVA_CONTEXT *ctx = ist->hwaccel_ctx; unsigned cfg_count; - DXVA2_ConfigPictureDecode *cfg_list; + DXVA_DECODER_CONFIG *cfg_list; HRESULT hr; int ret; @@ -165,14 +165,15 @@ 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; + DXVA_CONTEXT *ctx = ist->hwaccel_ctx; + DXVA_AV_CONTEXT *dxva_ctx = s->hwaccel_context; GUID *guid_list; unsigned guid_count; GUID device_guid; - const D3DFORMAT surface_format = (s->sw_pix_fmt == AV_PIX_FMT_YUV420P10) ? MKTAG('P','0','1','0') : MKTAG('N','V','1','2'); + const DXVA_SURFACE_FORMAT surface_format = s->sw_pix_fmt == AV_PIX_FMT_YUV420P10 ? + MKTAG('P', '0', '1', '0') : MKTAG('N', 'V', '1', '2'); DXVA2_VideoDesc desc = { 0 }; - DXVA2_ConfigPictureDecode config; + DXVA_DECODER_CONFIG config; HRESULT hr; int ret;