From patchwork Thu Dec 1 16:22:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?St=C3=A8ve_Lhomme?= X-Patchwork-Id: 1640 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1033602vsa; Thu, 1 Dec 2016 08:39:55 -0800 (PST) X-Received: by 10.28.195.9 with SMTP id t9mr32239948wmf.92.1480610395701; Thu, 01 Dec 2016 08:39:55 -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 ev17si894644wjd.42.2016.12.01.08.39.55; Thu, 01 Dec 2016 08:39:55 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 865E2689F1D; Thu, 1 Dec 2016 18:39:45 +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 592C5689E73 for ; Thu, 1 Dec 2016 18:39:39 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id g23so35135062wme.1 for ; Thu, 01 Dec 2016 08:39:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wquXhTNm3V+gci0nLo3g0M4K2l/OEHsO0JsajtTTY2o=; b=DdDARM1qO8zLerOlTZXFHYiqiTM8huea6fwe2Y/j55pmL1jy60FwJEVYWQxo84f9+Z Wi5KS+AAjI6ZDhzqA7lLcZ8GYXPC2GkfT6u6b29mBd5C1UQ/gWrghi4inWQ9fXDig47J ExijX8IXCtcLEFF543286sAhPyg0C97O7kXoMVftd02gRCODFANJvlvd2I//U/wD6koz mwo526Kuixg0OMEvqVwHsU43JQXUDfWbkNRQ+mHZk21KuAWo+93gnvMvov5xdZDU3BF7 JMbXcvpjVYVRCVYRjZ69Vf72lBgGcXWkf4hhaDBD4CiY8WtUfOL7L0Lc8NSD46bZziAY VCBw== X-Gm-Message-State: AKaTC00wGEYqaRTxHj5R3uy+M+8Nt5dpf+vy9JoOT+pimZamaGZAe5pzwbSJGKdTtSIbJw== X-Received: by 10.28.138.135 with SMTP id m129mr32451059wmd.36.1480609359808; Thu, 01 Dec 2016 08:22:39 -0800 (PST) Received: from localhost.localdomain (2a01cb0c000ea90021f51a7b7fa51aff.ipv6.abo.wanadoo.fr. [2a01:cb0c:e:a900:21f5:1a7b:7fa5:1aff]) by smtp.gmail.com with ESMTPSA id yj10sm1066807wjb.3.2016.12.01.08.22.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Dec 2016 08:22:39 -0800 (PST) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Dec 2016 17:22:28 +0100 Message-Id: <20161201162228.3524-4-robux4@videolabs.io> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161201162228.3524-1-robux4@videolabs.io> References: <20161201162228.3524-1-robux4@videolabs.io> 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 Cc: Steve Lhomme MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Steve Lhomme 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 c28867a..69aae45 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 66 -#define LIBAVCODEC_VERSION_MICRO 108 +#define LIBAVCODEC_VERSION_MICRO 109 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \