From patchwork Thu Jan 24 15:16:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 11858 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id ACD9344D378 for ; Thu, 24 Jan 2019 17:16:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D561468AD6C; Thu, 24 Jan 2019 17:16:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15-112.126.com (m15-112.126.com [220.181.15.112]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B23EA68AD50 for ; Thu, 24 Jan 2019 17:16:08 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=og9N+2VDfV6KQxK8s5 4IXy51vIEgAGh5wPMUuZiMlMI=; b=S8PAETYO9iFkTiEJxr2h+o5bJBbQ8/hXqE dWct/ip6WV+CK37ATVHinQ3/yLgXYk+ByAzwmE3BIz6i5RVjV+6Az4NKvVJiIGnu x3HXr8aRSLmWcQtcps5B62Q3ns7KLM/GKON1dcXZHjB1cnQbcBDdgi8MSs18i1DJ Hm8qnedRE= Received: from localhost.localdomain (unknown [111.34.131.29]) by smtp2 (Coremail) with SMTP id DMmowAAXlCXG1klcrJjEBA--.34822S4; Thu, 24 Jan 2019 23:16:23 +0800 (CST) From: hwrenx To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Jan 2019 23:16:17 +0800 Message-Id: <1548342978-4887-2-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548342978-4887-1-git-send-email-hwrenx@126.com> References: <14820246-3BFB-44A7-BAA1-11E9DACE4FFA@chinaffmpeg.org> <1548342978-4887-1-git-send-email-hwrenx@126.com> X-CM-TRANSID: DMmowAAXlCXG1klcrJjEBA--.34822S4 X-Coremail-Antispam: 1Uf129KBjvdXoW7Xw15Jr1UArWkGw43GF15Jwb_yoWfXwb_A3 WDX3W7ta1Y9ws2yw1UArZ8Jw17GwnxZF4UKa1xtrsIgrs3Xry5Z3W8Zr1v9an09ws8CFyr Gw4DWry3JrZ5tjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU847K7UUUUU== X-Originating-IP: [111.34.131.29] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiZgdG6VpD5YL2ygABsN Subject: [FFmpeg-devel] [PATCH v2 2/3] lavc/libxavs2: use upper layer qp parameters first 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" Signed-off-by: hwrenx --- libavcodec/libxavs2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libxavs2.c b/libavcodec/libxavs2.c index 2d29427..d5c4557 100644 --- a/libavcodec/libxavs2.c +++ b/libavcodec/libxavs2.c @@ -109,8 +109,8 @@ static av_cold int xavs2_init(AVCodecContext *avctx) xavs2_opt_set2("RateControl", "%d", 1); xavs2_opt_set2("TargetBitRate", "%"PRId64"", avctx->bit_rate); xavs2_opt_set2("InitialQP", "%d", cae->initial_qp); - xavs2_opt_set2("MaxQP", "%d", cae->max_qp); - xavs2_opt_set2("MinQP", "%d", cae->min_qp); + xavs2_opt_set2("MaxQP", "%d", avctx->qmax >= 0 ? avctx->qmax : cae->max_qp); + xavs2_opt_set2("MinQP", "%d", avctx->qmin >= 0 ? avctx->qmin : cae->min_qp); } else { xavs2_opt_set2("InitialQP", "%d", cae->qp); }