From patchwork Fri Jan 13 13:01:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 2209 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp171294vsb; Fri, 13 Jan 2017 05:01:48 -0800 (PST) X-Received: by 10.28.134.204 with SMTP id i195mr2081825wmd.77.1484312508895; Fri, 13 Jan 2017 05:01:48 -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 77si2089829wmj.34.2017.01.13.05.01.48; Fri, 13 Jan 2017 05:01:48 -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 15FAC68A3C2; Fri, 13 Jan 2017 15:01:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CC2E68A3BB for ; Fri, 13 Jan 2017 15:01:18 +0200 (EET) Received: by mail-lf0-f67.google.com with SMTP id v186so5624642lfa.2 for ; Fri, 13 Jan 2017 05:01:26 -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=AaEV0RDDLV31b3z+VvYXpLM3pdfJpVTKipIgFXOlBhk=; b=WqXCVLq5v6JpjaY1klREniaU2zt+wQcEq6fUbBM8NDJYJCpfABj/Tq9R/SikjyUKei hNuc6iBqcyBJwBQl1MUUM3CEpDzxW38G68GhPzH/SlxxPZM14QgWMdAmORRIgQnWbs/a caWJdyU6HONyaEnKkhSjcRtbRKe1FamOHVWXxNT41SE7QfshatrkrNP4rsR0NKC2mPDj UsoFU3YUgU0NIk5SSla8+OKpuDJ9BLLgTLXukBAqkdlf0L2xB66EZvu+WPge84qdur51 mDpP9Lv1tig1PPmJoC1CS+cHV44al7RBVm8ZF6aJsYVXQVCLGBXqi3Fsdhlw7qhmBT9F IN/w== 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=AaEV0RDDLV31b3z+VvYXpLM3pdfJpVTKipIgFXOlBhk=; b=LioI8/tcngYNwSuowNepJ1iZjSB8aChQLsoNeyjA3/k4xqAaRgHY670BYEYnmLi2jj VilMZMcbNc4p8dW+ZyYbvSFIMM7fAkLJnWTaOY8r3Z6Q96wqG1m2KE88gxSTSHh/4lig EqiFbsPku+HdZ7u23fTMQGe9gSRRQ96R+GVyGjpSy87cSYwJ7bOiLxcS9kuNU6oMznsz OYx8jjDyrLC01JdUff4aRwSbYh10gPnq66EK/TYS+hb80dD/dOrWfoZoTvh1eSo1cIMB iGsa732zD49LDx0izC8q1wRAAbl+O0H3PZo2GJhRigEYYRKaJa+FddGxICGFxVXvinqv zmgQ== X-Gm-Message-State: AIkVDXLSyVLQSYLCouKlCnfadosuycnSwqtmhkFRtDCN4Bak9nPwAD6nc3z9sOSldwmLwg== X-Received: by 10.223.172.17 with SMTP id v17mr13341399wrc.115.1484312486044; Fri, 13 Jan 2017 05:01:26 -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.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Jan 2017 05:01:24 -0800 (PST) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Jan 2017 14:01:07 +0100 Message-Id: <20170113130107.11208-3-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 3/3] 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]. Also added myself as maintainer for DXVA2 and D3D11VA. --- MAINTAINERS | 3 ++- libavcodec/dxva2_internal.h | 4 ++-- libavcodec/version.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index cb9516d..981d71b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -260,7 +260,8 @@ Codecs: Hardware acceleration: crystalhd.c Philip Langdale - dxva2* Hendrik Leppkes, Laurent Aimar + dxva2* Hendrik Leppkes, Laurent Aimar, Steve Lhomme + d3d11va* Steve Lhomme mediacodec* Matthieu Bouron vaapi* Gwenole Beauchesne vaapi_encode* Mark Thompson 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 6b3e62e..2a0df19 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 72 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \