From patchwork Wed Mar 22 09:41:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 3063 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp227688vsy; Wed, 22 Mar 2017 02:50:11 -0700 (PDT) X-Received: by 10.28.230.83 with SMTP id d80mr6704022wmh.18.1490176211864; Wed, 22 Mar 2017 02:50:11 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w65si1811613wma.113.2017.03.22.02.50.11; Wed, 22 Mar 2017 02:50:11 -0700 (PDT) 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 AAC516891FB; Wed, 22 Mar 2017 11:49:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3191368826D for ; Wed, 22 Mar 2017 11:49:44 +0200 (EET) Received: by mail-wr0-f196.google.com with SMTP id l37so25864590wrc.3 for ; Wed, 22 Mar 2017 02:50:03 -0700 (PDT) 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=qH6iuw2WulQLvu8Yp+iZhMvGTlZk3rHyx3NyIzJZN30=; b=JhZozwWuCAAP1QC7G8P9xH1N6L1EoxKNaOAP2HP+o3VNlyY6uGKQWUYwsSvMYC1w68 5pb6BwCLQgGXzebN0fC9dgHw9Z+GVq3+4lw+4jOnNUY7diHfsIMtImKK6lomemO7/nla yZXBed0ntltL11Kk2v2IUbvn3CRf1QWnCM/R067RD9JcsjoiUSSLpIVzQf/ZHOTUUfBz x5oEbMi2XiQ2wesdsj2Ik/LF58eIeyPuFB0eOniR91FdzmtSjcCzI/RSvr2nO65VoCRr zNiNSNN8DbxXepGaW19aZHT5O8Pyc1w3+mdDWJsL4FjR8NUYWXs5gBKtdW+j7n23h5Qe Wz7w== 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=qH6iuw2WulQLvu8Yp+iZhMvGTlZk3rHyx3NyIzJZN30=; b=stlphBO28m4Uw9yunBnSrwsQRtqNmeqWiPoD4W7DGNvMG41HYyNDRMTrMo2Jsy8PqU volZ5/IVAuWVdBpSIh0eDexOP88w6qcfk4u2FHvSqPgVNA2DmQYg3Rcqd2rSXvyLaFCo WJ+2zWKv535Klzqmjfx9xPtClw66gek45o6tuhDT0pEl8ZsML14yOyNaBCMHCbJRsBjk HN0DQf7oHOSyd8NM5XhW4BXBHMyGljDK4qZhbhMy/cnr0Ux44TvO5oVeyhHXL8BvBCI3 Qkv7w/PBwk0cKwiGTInEWMs69bmiCf0dIkG4ZVSaPIGjK+JnxYbRBmgaplreY2IBcyWm RmAQ== X-Gm-Message-State: AFeK/H3EPHW0kLzWwqtU9PqYMwM9wrpJ+xH7zU+16EDDSLWlmeV6mgzBLmaV4Xl+z1cl6g== X-Received: by 10.223.170.70 with SMTP id q6mr39300031wrd.162.1490175711571; Wed, 22 Mar 2017 02:41:51 -0700 (PDT) Received: from localhost.localdomain (2a01cb0c000ea900596bc7dc9239b9f6.ipv6.abo.wanadoo.fr. [2a01:cb0c:e:a900:596b:c7dc:9239:b9f6]) by smtp.gmail.com with ESMTPSA id u7sm1112040wru.56.2017.03.22.02.41.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Mar 2017 02:41:49 -0700 (PDT) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Mar 2017 10:41:37 +0100 Message-Id: <20170322094137.8108-2-robux4@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170322094137.8108-1-robux4@gmail.com> References: <20170322094137.8108-1-robux4@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/hevc: add the dimension constraints when attempting to use DXVA 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" --- libavcodec/hevc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 505249e6b5..35e9a273fa 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -328,6 +328,14 @@ static void export_stream_params(AVCodecContext *avctx, const HEVCParamSets *ps, num, den, 1 << 30); } +#if CONFIG_HEVC_DXVA2_HWACCEL || CONFIG_HEVC_D3D11VA_HWACCEL +static void add_dxva_constraints(AVCodecContext *avctx) +{ + avctx->coded_width = FFALIGN(avctx->coded_width, 128); + avctx->coded_height = FFALIGN(avctx->coded_height, 128); +} +#endif + static int set_sps(HEVCContext *s, const HEVCSPS *sps, enum AVPixelFormat pix_fmt) { #define HWACCEL_MAX (CONFIG_HEVC_DXVA2_HWACCEL + CONFIG_HEVC_D3D11VA_HWACCEL + CONFIG_HEVC_VAAPI_HWACCEL + CONFIG_HEVC_VDPAU_HWACCEL) @@ -352,9 +360,11 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps, enum AVPixelFormat pix_fm case AV_PIX_FMT_YUVJ420P: #if CONFIG_HEVC_DXVA2_HWACCEL *fmt++ = AV_PIX_FMT_DXVA2_VLD; + add_dxva_constraints(s->avctx); #endif #if CONFIG_HEVC_D3D11VA_HWACCEL *fmt++ = AV_PIX_FMT_D3D11VA_VLD; + add_dxva_constraints(s->avctx); #endif #if CONFIG_HEVC_VAAPI_HWACCEL *fmt++ = AV_PIX_FMT_VAAPI; @@ -366,9 +376,11 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps, enum AVPixelFormat pix_fm case AV_PIX_FMT_YUV420P10: #if CONFIG_HEVC_DXVA2_HWACCEL *fmt++ = AV_PIX_FMT_DXVA2_VLD; + add_dxva_constraints(s->avctx); #endif #if CONFIG_HEVC_D3D11VA_HWACCEL *fmt++ = AV_PIX_FMT_D3D11VA_VLD; + add_dxva_constraints(s->avctx); #endif #if CONFIG_HEVC_VAAPI_HWACCEL *fmt++ = AV_PIX_FMT_VAAPI;