From patchwork Wed Jan 4 13:36:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 2042 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp4835885vsb; Wed, 4 Jan 2017 05:42:56 -0800 (PST) X-Received: by 10.28.10.140 with SMTP id 134mr1595824wmk.14.1483537376534; Wed, 04 Jan 2017 05:42:56 -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 s11si50230341wme.82.2017.01.04.05.42.55; Wed, 04 Jan 2017 05:42:56 -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 246C1689FD9; Wed, 4 Jan 2017 15:42:48 +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 92327689FC0 for ; Wed, 4 Jan 2017 15:42:42 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id l2so66178581wml.2 for ; Wed, 04 Jan 2017 05:42:47 -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=dTwHdpQNv+XWcz1t9wFJ8ePQNst82tT92VSGDglHMsM=; b=A+eDENMfjnMGznJbyOmasIBvFlA/g3IpgVF/rmOCR4gPNU7fr6dFhLvnS6XDDIFakd zkrFhIg+F+fx26vBLbeKWNnGmBYChl/f5xyjop+H8WUjrQ6mfpbeCEZUo2ILNKyMj70E b1IbUP1wh2Bs/zgu1A8g1B37whVsKIez5bna7vwtp4kTzVTWSPSDCMCeiip7t22ItaJi flBKOlVVadBp8h87LlS+riYoHWPa6nheYWYlVIeLa8LBcKSB+brFxtp5maRzwakelwyx fiIzyLf/WQwZX3CzIvwn5eOmPPCzuIDUCZpiK/a2rpqiUEwGwVzOvfk3ovyYE9ngnZ3I nAFw== 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=dTwHdpQNv+XWcz1t9wFJ8ePQNst82tT92VSGDglHMsM=; b=LDe625SLNenQJ1YYZqFyCQsEosXLtkzv3Bm5hqwg3+JwGI99EaZkj3ev4GvtuV6wAN BeRWUOX01HBdb149ZBtXX7EfIN+e7iSqajJogrlHUe0rT+Kn9orZ876NHghJBD2VwSwU RevntukfQeRN1RkOtJV0EcTCnGS+T2zBvUjiPK/AKIjDV9WdBncyhLrRlgYp+N60vJJ0 iXHjXjd7zVMd7V1gwAx3muRJ9TrBaWZjyVbvYqzgZZRwGmdwJxNOJtG9Am0OI0rZ677t clxdueJCX1BH9eDFe1fQJmqTV31kgBkyQL7Zk/gIR+HGR0Hix5OMg4Pu9WutNOqvb9Kq QLFw== X-Gm-Message-State: AIkVDXKE08gr7Lt6JnO/9gXpn8XAT2NatiX6AGP7mxpnmyn3iR42uzBt9OS86YXiQpXXGg== X-Received: by 10.28.22.193 with SMTP id 184mr58359718wmw.100.1483537021405; Wed, 04 Jan 2017 05:37:01 -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.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Jan 2017 05:36:59 -0800 (PST) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Jan 2017 14:36:44 +0100 Message-Id: <20170104133644.6720-5-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 4/4] dxva2: allow an empty array of ID3D11VideoDecoderOutputView 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" We can pick the correct slice index directly from the ID3D11VideoDecoderOutputView casted from data[3]. --- libavcodec/dxva2_internal.h | 4 ++-- libavcodec/version.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index e5322ef..dfff4d6 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -78,7 +78,7 @@ typedef union { #define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.cfg->ConfigResidDiffAccelerator : ctx->dxva2.cfg->ConfigResidDiffAccelerator) #define DXVA_CONTEXT_VALID(avctx, ctx) (DXVA_CONTEXT_DECODER(avctx, ctx) && \ DXVA_CONTEXT_CFG(avctx, ctx) && \ - DXVA_CONTEXT_COUNT(avctx, ctx)) + (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD || ctx->dxva2.surface_count)) #elif CONFIG_DXVA2 #define DXVA_CONTEXT_WORKAROUND(avctx, ctx) (ctx->dxva2.workaround) #define DXVA_CONTEXT_COUNT(avctx, ctx) (ctx->dxva2.surface_count) @@ -98,7 +98,7 @@ typedef union { #define DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) (ctx->d3d11va.cfg->ConfigBitstreamRaw) #define DXVA_CONTEXT_CFG_INTRARESID(avctx, ctx) (ctx->d3d11va.cfg->ConfigIntraResidUnsigned) #define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) (ctx->d3d11va.cfg->ConfigResidDiffAccelerator) -#define DXVA_CONTEXT_VALID(avctx, ctx) (ctx->d3d11va.decoder && ctx->d3d11va.cfg && ctx->d3d11va.surface_count) +#define DXVA_CONTEXT_VALID(avctx, ctx) (ctx->d3d11va.decoder && ctx->d3d11va.cfg) #endif unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx, diff --git a/libavcodec/version.h b/libavcodec/version.h index 8f37ebd..2e9594b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 70 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \