From patchwork Fri Dec 16 10:12:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 1835 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1270470vsa; Fri, 16 Dec 2016 03:20:36 -0800 (PST) X-Received: by 10.28.170.134 with SMTP id t128mr2576152wme.29.1481887236904; Fri, 16 Dec 2016 03:20:36 -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 u15si2892272wmu.53.2016.12.16.03.20.36; Fri, 16 Dec 2016 03:20:36 -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 D3F4E689BC6; Fri, 16 Dec 2016 13:20:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F0A0689A4B for ; Fri, 16 Dec 2016 13:20:21 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id u144so4760815wmu.0 for ; Fri, 16 Dec 2016 03:20:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hnoWw2FxnBt1POmcZHtoB7ReYZy6tZP1+PO095eVYFw=; b=SrVHmI56blP7wsL8tcQNa2Lq47iKTkFXGqV05JjPcTat4iBxdsWCO4j3yNAhiOOYlF dLoBMDIx1dGFJ+IXotsj1J0nh7KdKAHsizj21LjeDa9VPf/IQXIXLwCq9qK9oyKvyIiZ 7X+wLsjOUb2/nUGkQ/fZxE5K3mkzmJvz6ZIPHipeiYEhdPjkDanGX4GFk2ds3rthKiXa SIUyqhevOL8G4rLerxWJ/NQvUrnxgUbTMXKNW26fdsH4zBQDJm7zreGiObgXRoDllvol Z1M6FGes0wEKBYMcaB1XD9a6SDo689snI1Wu90wKw0TyWVin0QK40dpqTBitS6kHoLSr ddzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hnoWw2FxnBt1POmcZHtoB7ReYZy6tZP1+PO095eVYFw=; b=CHJkWAQND+BeAvAh8oTvSp3UqCuUP9I/he1hH3JrpF++EyxKUXktW3MJtE/ZDbVeYO iI91n0WWrOtezosQrUj2+UZF7jdALTGcsgjG5FLpMmr3UT0Szx/PFd+FUCtIPAca+sgF mJunuqlyTF38Z9HgB4G9fqAj16KnhHIGWafC+iGRQLkeICagk6PRcs/oTeLO2rgEUwiZ eCLtX5S5WgFY580Feixh9N+wdf6Hc7pQEw4gIMS9rAj34Abz9HkEr8EAijb/O+tLctEk mTRyePTczQXBh3blslkbIXY2GinDp/z+67SFAjQ8kFTt4ZlL8xgtm2ZXuwsFEEAjT/AA JwSw== X-Gm-Message-State: AIkVDXIk5rhQFcFrMnC6R6y2po4x/caOTfu26QHn8EjaP3GZxL0FJgLbnb2HKQPzzAPs/A== X-Received: by 10.28.165.2 with SMTP id o2mr2956108wme.38.1481886745165; Fri, 16 Dec 2016 03:12:25 -0800 (PST) Received: from localhost.localdomain (2a01cb0c000ea900449390cb157ec679.ipv6.abo.wanadoo.fr. [2a01:cb0c:e:a900:4493:90cb:157e:c679]) by smtp.gmail.com with ESMTPSA id x140sm2849193wme.19.2016.12.16.03.12.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Dec 2016 03:12:23 -0800 (PST) From: Steve Lhomme X-Google-Original-From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Dec 2016 11:12:05 +0100 Message-Id: <20161216101205.1360-5-robUx4@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161216101205.1360-1-robUx4@gmail.com> References: <20161216101205.1360-1-robUx4@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/5] ffmpeg: 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 Cc: Steve Lhomme MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Steve Lhomme --- ffmpeg_d3d11va.c | 20 ++++++++++---------- ffmpeg_dxva2.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ffmpeg_d3d11va.c b/ffmpeg_d3d11va.c index 18c3e53..837c250 100644 --- a/ffmpeg_d3d11va.c +++ b/ffmpeg_d3d11va.c @@ -59,15 +59,15 @@ typedef ID3D11VideoDevice *DXVA_DECODER_SERVICE; static int d3d11va_get_decoder_configuration(AVCodecContext *s, const D3D11_VIDEO_DECODER_DESC *desc, - D3D11_VIDEO_DECODER_CONFIG *config) + DXVA_DECODER_CONFIG *config) { InputStream *ist = s->opaque; int loglevel = (ist->hwaccel_id == HWACCEL_AUTO) ? AV_LOG_VERBOSE : AV_LOG_ERROR; - D3D11VAContext *ctx = ist->hwaccel_ctx; + DXVA_CONTEXT *ctx = ist->hwaccel_ctx; AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)ctx->hw_device_ctx->data; AVD3D11VADeviceContext *device_hwctx = device_ctx->hwctx; unsigned cfg_count; - D3D11_VIDEO_DECODER_CONFIG *cfg_list; + DXVA_DECODER_CONFIG *cfg_list; HRESULT hr; int i, ret; @@ -77,7 +77,7 @@ static int d3d11va_get_decoder_configuration(AVCodecContext *s, return AVERROR(EINVAL); } - cfg_list = av_malloc(cfg_count * sizeof(D3D11_VIDEO_DECODER_CONFIG)); + cfg_list = av_malloc(cfg_count * sizeof(DXVA_DECODER_CONFIG)); if (cfg_list == NULL) return AVERROR(ENOMEM); for (i = 0; i < cfg_count; i++) { @@ -94,7 +94,7 @@ static int d3d11va_get_decoder_configuration(AVCodecContext *s, return ret; } -static int d3d11va_validate_output(ID3D11VideoDevice *service, GUID guid, DXGI_FORMAT surface_format) +static int d3d11va_validate_output(DXVA_DECODER_SERVICE service, GUID guid, DXVA_SURFACE_FORMAT surface_format) { HRESULT hr; BOOL is_supported = FALSE; @@ -106,15 +106,15 @@ static int d3d11va_create_decoder(AVCodecContext *s) { InputStream *ist = s->opaque; int loglevel = (ist->hwaccel_id == HWACCEL_AUTO) ? AV_LOG_VERBOSE : AV_LOG_ERROR; - D3D11VAContext *ctx = ist->hwaccel_ctx; - AVD3D11VAContext *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, i; GUID device_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 cfde649..928a86f 100644 --- a/ffmpeg_dxva2.c +++ b/ffmpeg_dxva2.c @@ -68,7 +68,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); @@ -80,7 +80,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; @@ -119,13 +119,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; @@ -164,15 +164,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'); - D3DFORMAT target_format = 0; + const DXVA_SURFACE_FORMAT surface_format = (s->sw_pix_fmt == AV_PIX_FMT_YUV420P10) ? MKTAG('P','0','1','0') : MKTAG('N','V','1','2'); + DXVA_SURFACE_FORMAT target_format = 0; DXVA2_VideoDesc desc = { 0 }; - DXVA2_ConfigPictureDecode config; + DXVA_DECODER_CONFIG config; HRESULT hr; int ret;