From patchwork Tue Oct 2 13:42:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 10559 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp2976763uaq; Tue, 2 Oct 2018 07:14:26 -0700 (PDT) X-Google-Smtp-Source: ACcGV63XeWn6+8G7Whux7ya1I7w7fBdedm9kCcmRUht0tFaSIjaXnDfPxh94wBED9IHKM6OEJjAH X-Received: by 2002:a1c:7301:: with SMTP id d1-v6mr2076636wmb.72.1538489666045; Tue, 02 Oct 2018 07:14:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538489666; cv=none; d=google.com; s=arc-20160816; b=JBue8S2ixlShNibRqDmsuB+/2nY4IJiCXDWRGVnOr3vPRxlgwIwP3oV9TbL0o26mpr FY/qNDVcnr51I5Hlrz+pQE/BUkXw1wMumwcf4xb/CbXQsi9WalXSsNHIxf93eZh1JGrl y6ETNcjvPxrTVCcoQXIxODgxMcgDOIzMA/51PjJWl2jwx/m13bGQPstaRP43DM5UZUVk f7zB+HKDssNd0tYDpAH63IoU3mW3oUc/gcoODRlQtWhKXcSvLvxqcFnL2SUA05WHr4Uw M8LMEJlzHGod75PchZDDFJpJhgxHMAJxGjAUgv1WNFhceToCJQgg/6Yg2qwO1RsccWYJ KcoA== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=xdvxyhlCfjqP0vDM//ktjlyBiI3fkvEklbGNUC3I9ck=; b=F6jqje/icwL2JclOsct1TSitvZZW1wMRJzKK5HpeAIVr+tfKyiHFYkQMMEX3+9jmCp hVtDsellq5mpBg7jDjlVkX+N8XvVQEwT5V7jJzCNC0FrcYJwYgx2QfBqRBdWCiqWZmE8 BLjrg1EAK7P66LYJCusQnRd/cnv3TsuHRVcyYd/ymCvGc1o9p22aRznIjQoDvIjjuLRB DpTFqmzCb/KR9K+abMVZdxwdHS8y5XMbGqV/84d2M776ok/U4VxQN5mgK/sjg71rKuFg WtSBA/tvclJRHOOYwTVNdN1fE7S4lcoEoEZn6iccN+HPuBEeRpySIgQqB6HuYR7eTVC9 p5NQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b=I0A1TTUF; 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=126.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 74-v6si10693780wmo.69.2018.10.02.07.14.24; Tue, 02 Oct 2018 07:14:26 -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=@126.com header.s=s110527 header.b=I0A1TTUF; 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=126.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E03BE68A245; Tue, 2 Oct 2018 17:14:03 +0300 (EEST) 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 EF577689F92 for ; Tue, 2 Oct 2018 17:13:55 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=nYDG3+a49Oe/1ToOr/ 16LgEuG3bSCqgeSE+8hqajkXw=; b=I0A1TTUFNiqmttJsecUOYuPlTldoYLxi9X fOGH6elDFRZOQ+Pl0El6RNo+x+smojlTJQxcNRNQGodn9PUi2ugSIYURn+HcLtCB CWg2rB9Yz8DPCblPynS2OXqHI6tGgmniAUemwRovqiK8YmZUtVFi8EAW0qFVoZZ1 MufRNZWrE= Received: from localhost.localdomain (unknown [162.105.162.85]) by smtp2 (Coremail) with SMTP id DMmowAD3JkXjdbNbP1JXJQ--.58062S3; Tue, 02 Oct 2018 21:43:01 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Oct 2018 21:42:57 +0800 Message-Id: <1538487779-3283-1-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: DMmowAD3JkXjdbNbP1JXJQ--.58062S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Ar47tw15ur4kur1rKFykXwb_yoW8GFWrpr 9IkFn3Awn3X39akFWUJF10yFs8Ar1jvF18Jw4xCw10q3y8uryUJ39rGFyUKFWIqaykZr45 GF4rKFW3ury3K3JanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j1MKZUUUUU= X-Originating-IP: [162.105.162.85] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiuxnT6VpD6lpcKAABsE Subject: [FFmpeg-devel] [PATCH v1 1/3] lavc/libxavs2: keep uniform with xavs2 api 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: hwren --- libavcodec/libxavs2.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libavcodec/libxavs2.c b/libavcodec/libxavs2.c index 2b47d0c..a3cd588 100644 --- a/libavcodec/libxavs2.c +++ b/libavcodec/libxavs2.c @@ -78,16 +78,14 @@ static av_cold int xavs2_init(AVCodecContext *avctx) return AVERROR(ENOMEM); } - xavs2_opt_set2("width", "%d", avctx->width); - xavs2_opt_set2("height", "%d", avctx->height); - xavs2_opt_set2("bframes", "%d", avctx->max_b_frames); - xavs2_opt_set2("bitdepth", "%d", bit_depth); - xavs2_opt_set2("log", "%d", cae->log_level); - xavs2_opt_set2("preset", "%d", cae->preset_level); - - /* not the same parameter as the IntraPeriod in xavs2 log */ - xavs2_opt_set2("intraperiod", "%d", avctx->gop_size); - + xavs2_opt_set2("Width", "%d", avctx->width); + xavs2_opt_set2("Height", "%d", avctx->height); + xavs2_opt_set2("BFrames", "%d", avctx->max_b_frames); + xavs2_opt_set2("BitDepth", "%d", bit_depth); + xavs2_opt_set2("Log", "%d", cae->log_level); + xavs2_opt_set2("Preset", "%d", cae->preset_level); + + xavs2_opt_set2("IntraPeriodMax", "%d", avctx->gop_size); xavs2_opt_set2("thread_frames", "%d", avctx->thread_count); xavs2_opt_set2("thread_rows", "%d", cae->lcu_row_threads);