From patchwork Wed Apr 4 10:07:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 8323 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp4694006jad; Wed, 4 Apr 2018 03:10:52 -0700 (PDT) X-Google-Smtp-Source: AIpwx48D//6rJaF3F9EJkgIxEppdAjTN+vmL25kZt055aRDZm8/NMXSEjbqu+k1uZZ7mjkN2G1LT X-Received: by 10.223.135.155 with SMTP id b27mr12298356wrb.119.1522836652800; Wed, 04 Apr 2018 03:10:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522836652; cv=none; d=google.com; s=arc-20160816; b=vkneQZdC9vVl7O1/gZ3Fagu1JuNm8U/tT5bODZ8x+qhrRVp6vc+32olIdzRuJdYR1t sj1JMoCR1g0UrAmm579BS1+vPRr14+snufvRboBWnwNZLpCzXpxdhudsSsHVSw1J/BhG B9YrUN6DB0wT3bmLGgfgEaZM8M/4SC42/PU2CFMDWRx8c45U1xaVJVhcuDCzxVdnLRvv 1vIrb/VSG1xnYNBpfmlw2KTPEs38Kx4GnC/DpXwmHzJwNvPxgiCZx7dBj6pwft5Rorm1 wLtShX0rMKgZuw6fX0FShLA0w9sB53uLBluS6PpE98z+gIrtnJn765YHYnUeLCrqyFBo e06A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=aPnqGDxCcuYaMh/Aasd5VWCwu+rH+zpcOA2rJkaBba0=; b=p288Cyc40MafWWLfXZucOW5hvXq1wY9thykOiy14Qfc+vkguyQAV5ghU9AGcb384tI SPYBmhadwkx4WVzavLlaAYoVO7wZWzSGcgukFprT5AMZi18umBsb9CMTuAZtJtpM5H3M YP2ALX6r2K0YK4EusVKn9t5BZbHQmfJ0O+Cus7bDUeNGRL1owGnzAZOYqRgrgloQxsEJ rx7SDQaPKpAW0KG8m2GSyMziuA7Z+RsuEQNajUFDJ2ERfhlE1z8IsTqZ/AK5kY3DOIvj u7T7+3oqPjBy6hI17hxWm/A3DvM2masYIuH7q6SXZvrwVGIpEbc5Y9v5H68ReK4EEfy5 EK2g== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n45si3586138wrf.204.2018.04.04.03.10.52; Wed, 04 Apr 2018 03:10:52 -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; 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 51D9B680C0B; Wed, 4 Apr 2018 13:10:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B80CC680389 for ; Wed, 4 Apr 2018 13:10:15 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Apr 2018 03:10:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,405,1517904000"; d="scan'208";a="188547782" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.13.18]) by orsmga004.jf.intel.com with ESMTP; 04 Apr 2018 03:10:25 -0700 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Apr 2018 18:07:58 +0800 Message-Id: <1522836478-4907-2-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1522836478-4907-1-git-send-email-zhong.li@intel.com> References: <1522836478-4907-1-git-send-email-zhong.li@intel.com> Subject: [FFmpeg-devel] [PATCH] lavc/qsvenc: fix the hard code of height aligment checking 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: Zhong Li MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zhong Li --- libavcodec/qsvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index afb953e..573c11e 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1051,7 +1051,7 @@ static int submit_frame(QSVEncContext *q, const AVFrame *frame, } } else { /* make a copy if the input is not padded as libmfx requires */ - if (frame->height & 31 || frame->linesize[0] & (q->width_align - 1)) { + if (frame->height & (q->height_align - 1) || frame->linesize[0] & (q->width_align - 1)) { qf->frame->height = FFALIGN(frame->height, q->height_align); qf->frame->width = FFALIGN(frame->width, q->width_align);