From patchwork Fri Jan 11 08:37:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 11706 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 18F8B44D6A6 for ; Fri, 11 Jan 2019 10:37:32 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E64868A848; Fri, 11 Jan 2019 10:37:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m50-112.126.com (m50-112.126.com [123.125.50.112]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F74868A741 for ; Fri, 11 Jan 2019 10:37:11 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=WiWIHP+uj/xS66BOou EXj6d2RnGmgogMX11VnFzDXNQ=; b=inn7vUqV/8LAm+UPvJSU8eReFEoi6gpTwA oD5LQNvnegX5IsJQXAsBLaNOrFSO3bEcS+DI4bMIskALfoojfmSyYKrQaiY2OiFg SeYzkfhfnM0o6WXh/qZjQW34M1w5v3kZtlg2urqYVlTaUhW2i+zPv9fFO73AJBQw wLGlVveQQ= Received: from localhost.localdomain (unknown [111.203.130.71]) by smtp6 (Coremail) with SMTP id j9KowAAnU9G+VThcoxLWAA--.35422S4; Fri, 11 Jan 2019 16:37:19 +0800 (CST) From: hwrenx To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Jan 2019 16:37:15 +0800 Message-Id: <1547195835-22600-2-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547195835-22600-1-git-send-email-hwrenx@126.com> References: <1547195835-22600-1-git-send-email-hwrenx@126.com> X-CM-TRANSID: j9KowAAnU9G+VThcoxLWAA--.35422S4 X-Coremail-Antispam: 1Uf129KBjvdXoW7Xw1rGryruFWkGFyfXFyxXwb_yoWfWrb_A3 WUZ3W3ta1Y9392yw1UArZ8Jw17Jwn3Zr4UKa1xtrsIgrs3Xry5Z3W8Zr1q9an09ws8AFyr Gw4DXry3XrWktjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU847K7UUUUU== X-Originating-IP: [111.203.130.71] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbi2wA56VpD7iW6xwAAsk Subject: [FFmpeg-devel] [PATCH v1 2/2] 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/libxavs2.c b/libavcodec/libxavs2.c index 2d29427..0ad9ca9 100644 --- a/libavcodec/libxavs2.c +++ b/libavcodec/libxavs2.c @@ -109,8 +109,9 @@ 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); }