From patchwork Fri Jan 13 13:01:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 2210 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp171192vsb; Fri, 13 Jan 2017 05:01:39 -0800 (PST) X-Received: by 10.223.148.135 with SMTP id 7mr11681385wrr.150.1484312499532; Fri, 13 Jan 2017 05:01:39 -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 g109si11166139wrd.9.2017.01.13.05.01.39; Fri, 13 Jan 2017 05:01:39 -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 sp=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 BC8ED68A3B7; Fri, 13 Jan 2017 15:01:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7230668A3AB for ; Fri, 13 Jan 2017 15:01:16 +0200 (EET) Received: by mail-lf0-f65.google.com with SMTP id x1so274772lff.0 for ; Fri, 13 Jan 2017 05:01:24 -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=fETOOyYQvN2AcNsKnn6amdiwdBzFjXEnCpE+5GlZP3uXbrXIgHkFhhO3MQouS+lZmk l3/4YtT/VI+7KiNYdMwDqmLt3MkBj+zWr6Stn3uDHKFoewTy8HvZ8dE+f+eYyggSEbUl 6p7fakAq4Jh5XdMyPyVGlpNYEnYS9HCpceA6UM5Gx15Gi6oPNEqxMG70vF+VhUEDoT+B uH13nrEPIt+bukyTEI5pPiP+FOM9uHSWr3/lJZ6H1wRceszy6ZwaN/Tm9512p4dVKk1X 9yAi3ke3zf/1n8EgiCEFlpxKNw6MaXcy2vdzozYM4xmphWfdpQoXUk08f4U8YnOB5AYa +TdA== 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=lAren2J4Zxk7+o2UwQykvkvfwwnfdkljFbjiWKF9xCgBNPjmDHfh7MClCvO1JXiUeI CCDYQQZoSJMaMigwuklQfnsLUf7Z0QYg9ahcA7hl6XMjtn84X8iVa0NiGhvjVqsT+Ik6 o1Gb14jZZth1tumwH7gN0kXV3ZxS1QfaMo7JRmfJ1wZY1mog2tScZ5vJbKVUn3pA3HFo XhgrcmY8PWZx/aeC3KaxAzpj8OvX5jcLeNam2hWm7Djil6x4uVs2fX5PQOxD+CTwuF+x 8SZTgrIwJnMRrmk/H2QIOW5jDbFidJMY+8xfd8xrtS8SAGlXvD52qt1oZ0wYYtd9gbOo yDuA== X-Gm-Message-State: AIkVDXJzr1xbqSMvG5wlRqZ63FWNTzaiQWZy+nwYeKUbo9hNRKuHCTDLJtJopJ2bjPw23g== X-Received: by 10.223.143.45 with SMTP id p42mr13471924wrb.120.1484312484029; Fri, 13 Jan 2017 05:01:24 -0800 (PST) Received: from localhost.localdomain (2a01cb0c000ea900380e27ac423d6603.ipv6.abo.wanadoo.fr. [2a01:cb0c:e:a900:380e:27ac:423d:6603]) by smtp.gmail.com with ESMTPSA id 14sm4208941wmk.1.2017.01.13.05.01.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Jan 2017 05:01:22 -0800 (PST) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Jan 2017 14:01:06 +0100 Message-Id: <20170113130107.11208-2-robux4@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170113130107.11208-1-robux4@gmail.com> References: <20170113130107.11208-1-robux4@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] 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;