From patchwork Tue Jan 10 10:19:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 2166 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp191039vsb; Tue, 10 Jan 2017 02:25:44 -0800 (PST) X-Received: by 10.194.175.169 with SMTP id cb9mr1354624wjc.73.1484043944486; Tue, 10 Jan 2017 02:25:44 -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 p25si1104312wra.256.2017.01.10.02.25.43; Tue, 10 Jan 2017 02:25:44 -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 A90D868A3EA; Tue, 10 Jan 2017 12:25:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wj0-f196.google.com (mail-wj0-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9AD9468A1BA for ; Tue, 10 Jan 2017 12:25:27 +0200 (EET) Received: by mail-wj0-f196.google.com with SMTP id ey1so7986964wjd.2 for ; Tue, 10 Jan 2017 02:25:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=tvw6n+BLvyivtURMVDhgWrlQetefW6yLdSA5WJp1BQQ=; b=jxBVmAxU0qT4LjDQ//h/z4VUDCkKnie0PzzSa8H7Zy0XZd9ASScfDNFBbg7EBDT+jt nF8J99Bya3L+OIhNYP3oRO0+ncwHiFf9PJ2WnDF3++OZ+NOTpYm15JumHxx3ZF8r3lzN 4hJysiTMOgmG4rq8uROi8VzeOsThWJ5KTlH+RLhzQRqnKMXHQCl+ZuGj9Ur3JG1m/ZNO Qqfb8OfTvq1Kudmpgd+IWPczuLA6QtXyU5s4nzCf2K+Ja9uBzWVX+P+H9Q+vGAQAk+LM +dXfRUpZ4/hSBCNHC0TjMWLXRvvtJzIg+Az42bmQNu1bHDoNTbTgxSFGWdH69mbqvv3N bCjQ== 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; bh=tvw6n+BLvyivtURMVDhgWrlQetefW6yLdSA5WJp1BQQ=; b=FOvDsQydSPO9N1xVqkPdDmds4Elc9VHejgSpkjCpL/5KBSNsmcCY7gplhxxMEwhvk0 oAWdyFZh5MJkTeCAt+Kl/UZovMB102ZWLyIRJmCQWXvAG6rX+LAKeO+7KNW6vo7iCdN/ RAyQIQA4xuxDYUZKKhLKk7+ATEqmdCLG74dToC3Sa5yREbAa3knh5cvEc8JpToLcPjda Oz8b/LbPSpFdo+gUaoWl5+o/ZxBhwgURcCvjURJhwIxuirJwZ5CByB/1rYHmonLtFSGa 9KXo8Bo0uylNAvVf2rHP2vTm5+ZdascUc3kuWWOFM3SSgd4ffshjvf8GuHJHUzuUAVCB 1Bqg== X-Gm-Message-State: AIkVDXIpfOQXgTfKtaZQ1lujP1cdq/kV3ETEhlfbgcUTUNf/ojNgRLf25zQNuxwckfpy+Q== X-Received: by 10.194.109.168 with SMTP id ht8mr1334056wjb.36.1484043582329; Tue, 10 Jan 2017 02:19:42 -0800 (PST) Received: from localhost.localdomain (2a01cb0c000ea900d4d34783073950d5.ipv6.abo.wanadoo.fr. [2a01:cb0c:e:a900:d4d3:4783:739:50d5]) by smtp.gmail.com with ESMTPSA id a8sm2395532wjq.44.2017.01.10.02.19.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Jan 2017 02:19:41 -0800 (PST) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Jan 2017 11:19:30 +0100 Message-Id: <20170110101930.12828-1-robux4@gmail.com> X-Mailer: git-send-email 2.10.2 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 c5a8f55..7f1b0a4 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 71 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \