From patchwork Wed Sep 12 07:54:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 10300 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp4549572jap; Wed, 12 Sep 2018 00:55:05 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdaf+S+wQ5cOh3jSuqR0aDDJdOaJ+AT/rM7Bbkf+3U54bH6PneqnoS6R6XhcE2xqGD+7PUKs X-Received: by 2002:adf:94c5:: with SMTP id 63-v6mr535014wrr.247.1536738905118; Wed, 12 Sep 2018 00:55:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536738905; cv=none; d=google.com; s=arc-20160816; b=uSISCxuijaVzNpzSCbXPS81+WIVDxyyCLomNu8+2MH8fmGPiEG0ivfMAeR3tQ2XNIq w0RzxtcOrMFqt+LcHsoflWYeuipURiSILUITuiaTlUfoxlV+zm7lQnz7ft6B/EYxiCpV 37/vSoHvR7iygUJOEZGaQjlEhdnaXd6OOJPVMac4lXFN016xKVAwu0ELuUo3Earw6sFY 2iQUrFpvyAvm5JO8c9jYk1ch/HzMjs6gRXUUsq5l1jtbjywKdyUYrAf+KL6ItblewHFs Fs08cy24MtCqa4gB5ApNI6g0KL2J+dCizN+xBdB3ONgo7sYvds0y4rxRODXadKXaK+mB 97Xw== 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=esq8nSKzYDmWm9BtIrEiD1on7tBRQH4WOdhijzAsBEk=; b=Wh0Q4VtVzma3dmb9ftOLyYmlYbA3q7n68iaTFWRX0bF5s1GTNlvyyPcWLAhHM2p6EH 9gpkwP5fgHOxA3y9LbjSyJgv3eCXk3iDgTsfmDMDaXigo/3vJGFe8e0GPrMNtWDaDQQG rTwtryifS5lbU9/M8VRNLl59uyO5BRf0ZgRp/ZcXx8gdS2lQkRhZ0Oo9fE7OXsbSi8ls CfCqM7oG5Kf3z4here7XC3r92zQXyUIkkJ8UtBXQuWH6M59r83JNQVc48AcSh0qdHV08 RqY6ZZoIz2OC47UaEf12DEl9mOPXEQQFocBLb264xnLkLX43NVR7YWwxVHRb4fMwlq/L Bvvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b=mFSPFbDt; 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 x20-v6si477327wmc.137.2018.09.12.00.55.04; Wed, 12 Sep 2018 00:55:05 -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=mFSPFbDt; 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 599E468A4C2; Wed, 12 Sep 2018 10:54:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15-113.126.com (m15-113.126.com [220.181.15.113]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1D98E68A296 for ; Wed, 12 Sep 2018 10:54:44 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=I0TNsvRPNkpwRhqNX9 IYhUWMO/CkR+XlJLwTvMs9EXg=; b=mFSPFbDt5By3GuerZ7/MHWKRee2VdUzwS8 HEPQhGwCnE2F9X76yHhDh4EHhZK2Sjk8VfJueDI2LnQJMVeRqcbrAg+iJX1E036j dtmM2TY1uONDKbkhc21EW/wtOR67D6Wj/UVbjsBtEnGvASQiCVwCcR5PSfIOGYxr tsqgD8ghA= Received: from localhost.localdomain (unknown [162.105.162.85]) by smtp3 (Coremail) with SMTP id DcmowAB3Pq9LxphbI_qxIA--.6891S3; Wed, 12 Sep 2018 15:54:52 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Sep 2018 15:54:51 +0800 Message-Id: <1536738891-25599-1-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: DcmowAB3Pq9LxphbI_qxIA--.6891S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Ar4xKF4DJF1xCryDZr18Zrb_yoW8tr4fpF 98Wrn3twn7Xa1rAFs8Ja1kWrn5ZFy2qayfG392kw1xXay0k34UJr9rCry5WFZ2vayvq3yU XwnYk3WxZw13KrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07Uymh7UUUUU= X-Originating-IP: [162.105.162.85] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiTwy-6VpD6Zz8hQAAsA Subject: [FFmpeg-devel] [PATCH] lavc/libxavs2: remove invalid parameters 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 --- doc/encoders.texi | 3 --- libavcodec/libxavs2.c | 4 ---- 2 files changed, 7 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 4623f38..0696a7a 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -2761,9 +2761,6 @@ Set the Speed level from 0 to 9 (default 0). Higher is better but slower. Set the log level from -1 to 3 (default 0). -1: none, 0: error, 1: warning, 2: info, 3: debug. -@item hierarchical_ref -Set the hierarchical reference or not (default true). - @item xavs2-params Set xavs2 options using a list of @var{key}=@var{value} couples separated by ":". diff --git a/libavcodec/libxavs2.c b/libavcodec/libxavs2.c index e26c90a..2b47d0c 100644 --- a/libavcodec/libxavs2.c +++ b/libavcodec/libxavs2.c @@ -78,8 +78,6 @@ static av_cold int xavs2_init(AVCodecContext *avctx) return AVERROR(ENOMEM); } - xavs2_opt_set2("rec", "%d", 0); - xavs2_opt_set2("width", "%d", avctx->width); xavs2_opt_set2("height", "%d", avctx->height); xavs2_opt_set2("bframes", "%d", avctx->max_b_frames); @@ -92,7 +90,6 @@ static av_cold int xavs2_init(AVCodecContext *avctx) xavs2_opt_set2("thread_frames", "%d", avctx->thread_count); xavs2_opt_set2("thread_rows", "%d", cae->lcu_row_threads); - xavs2_opt_set2("hierarchical_ref", "%d", cae->hierarchical_reference); xavs2_opt_set2("OpenGOP", "%d", 1); @@ -261,7 +258,6 @@ static const AVOption options[] = { { "min_qp" , "min qp for rate control" , OFFSET(min_qp) , AV_OPT_TYPE_INT, {.i64 = 20 }, 0, 63, VE }, { "speed_level" , "Speed level, higher is better but slower", OFFSET(preset_level) , AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 9, VE }, { "log_level" , "log level: -1: none, 0: error, 1: warning, 2: info, 3: debug", OFFSET(log_level) , AV_OPT_TYPE_INT, {.i64 = 0 }, -1, 3, VE }, - { "hierarchical_ref", "hierarchical reference" , OFFSET(hierarchical_reference) , AV_OPT_TYPE_BOOL, {.i64 = 1 }, 0, 1, VE }, { "xavs2-params" , "set the xavs2 configuration using a :-separated list of key=value parameters", OFFSET(xavs2_opts), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { NULL }, };