From patchwork Wed Jan 4 13:36: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: 2043 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp4836028vsb; Wed, 4 Jan 2017 05:43:24 -0800 (PST) X-Received: by 10.28.45.142 with SMTP id t136mr65385381wmt.110.1483537404197; Wed, 04 Jan 2017 05:43:24 -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 9si14461wrz.187.2017.01.04.05.43.23; Wed, 04 Jan 2017 05:43:24 -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 EBB9F689BBD; Wed, 4 Jan 2017 15:43:14 +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 104CE680D1B for ; Wed, 4 Jan 2017 15:43:08 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id l2so66179987wml.2 for ; Wed, 04 Jan 2017 05:43:13 -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=H7mCMtMwIdbIqTRT7OltmZkLqWFDFdgu2oqdqRXgo5Y=; b=sWJmnvVHmoPqIin8a4ucH1zVHhVqLKqss2m5h0Llvda4+wQPdOwaz1TW5OsOwAZMGt R8oehVIt0uMhOfCaXYX0XTNZOkY6/fCgCToEQsj1uwMFG0KShbeXz7FARHswvhu3dTGH pzhRzZpGl822re77UvG61S1bAv9TAYaRzsP2rRzfx5YqJOrckUdD1vMD87ZO+ASkK8jT Trzhm8dVtc/OGs/bRjY/ESB1XQ0GRoebYUWujaykrOZD5OKxY2yjaRqsnLShkx0Dac3N uo1FYuDSrAwlKY4qxkflpn0tyHUoUI16IrfjOwh71zDttUlDMz0KIrbZJ1fDE8vdNe5S HNnQ== 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=H7mCMtMwIdbIqTRT7OltmZkLqWFDFdgu2oqdqRXgo5Y=; b=gyQ6SuMWehjA42xyTAczZa8CUxD+J2DXMRLYtAa2BaWbUeTiKnHSKzVYUz+3kdxjuH 0nEMCBNKXPoyGJRNuFAPDAXc29vkd3qM5x770XpVYQR9FPD1JN2wFuKv0rB0Dkbj+3QF mz7pkhnCsrVcTBCJaRmyrn7pm8jPGkVBuIU5QvlIBubVl5OiKcRcs6EUvXpnL0gHmz0Y Y4qx8jR9bJT63SXnOSXDLMF8reK0mvE+IZGLia8AQBiaLDa6pCx+PXoCRn4Siw2P9C2h tCHmBbQQEQaS1yDlFUsV17b6U2DiwOXvXo805aEh2k8mCJOZoWrMNFVXvuhBJEeNEY0C eKOA== X-Gm-Message-State: AIkVDXIB3UkfzDq/0BBOiY++dfWzPy6jSIkZY18W8vSrTb8QbFsSyXgifl1ZW6bdm25aQA== X-Received: by 10.28.145.2 with SMTP id t2mr50511036wmd.23.1483537019525; Wed, 04 Jan 2017 05:36:59 -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 81sm94943124wmw.7.2017.01.04.05.36.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Jan 2017 05:36:58 -0800 (PST) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Jan 2017 14:36:43 +0100 Message-Id: <20170104133644.6720-4-robux4@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170104133644.6720-1-robux4@gmail.com> References: <20170104133644.6720-1-robux4@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] dxva2: get the slice number directly from the surface in 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" No need to loop through the known surfaces, we'll use the requested surface anyway. The loop is only done for DXVA2. --- libavcodec/dxva2.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index 2ac3f3e..c782f1c 100644 --- a/libavcodec/dxva2.c +++ b/libavcodec/dxva2.c @@ -41,20 +41,19 @@ unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx, void *surface = get_surface(frame); unsigned i; - for (i = 0; i < DXVA_CONTEXT_COUNT(avctx, ctx); i++) { #if CONFIG_D3D11VA - if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD && ctx->d3d11va.surface[i] == surface) - { - D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC viewDesc; - ID3D11VideoDecoderOutputView_GetDesc(ctx->d3d11va.surface[i], &viewDesc); - return viewDesc.Texture2D.ArraySlice; - } + if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) { + D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC viewDesc; + ID3D11VideoDecoderOutputView_GetDesc((ID3D11VideoDecoderOutputView*) surface, &viewDesc); + return viewDesc.Texture2D.ArraySlice; + } #endif #if CONFIG_DXVA2 + for (i = 0; i < DXVA_CONTEXT_COUNT(avctx, ctx); i++) { if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD && ctx->dxva2.surface[i] == surface) return i; -#endif } +#endif assert(0); return 0;