From patchwork Tue Nov 6 01:02:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Zern X-Patchwork-Id: 10946 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 848C944E357 for ; Tue, 6 Nov 2018 03:10:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED59168A8BA; Tue, 6 Nov 2018 03:10:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6306168A8BA for ; Tue, 6 Nov 2018 03:09:58 +0200 (EET) Received: by mail-pf1-f194.google.com with SMTP id x2-v6so1196868pfm.7 for ; Mon, 05 Nov 2018 17:10:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=fAuzKz1XTN2x0qZV3w3QZb4Ep0RsYrbNnYarx4BZ/mI=; b=wBTE2W5FVEkYXBcjuTHJLnljJ4udtiQpHbA1R/1Nw+INI2BLVv0K7Twb3rPcKMZDD7 4UoA3RrpjgYAO0+Vqz+2uJ7GfI3D5nYyqd7IbmC+I9ShDpmbK6G75HqxmhQNVMnC7UAQ 1lU15psleFV2mW0SVDlVH5hiAU0oz7BRbPphwJWS4CHXDU7Y1DTJsZ9mxuiiLrUUSy6y BjsYvE86euJ3Hoo1ArlXiOz2Mlt1Scn8OtadRsUiu7WARMo07rC5HSwDm+Vy66x/FPnU 2ev6XFLODlsXIrwnl8mgwy+zMoSPzCT+gixp0qj5wvHOlDOo/pS6MZQ9W4AgoSww48FM 9I/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fAuzKz1XTN2x0qZV3w3QZb4Ep0RsYrbNnYarx4BZ/mI=; b=e8+xzOXqEcXms3I+rpuGC9KDKQ0ysP5H7bAkcrTxm8XNLEp9W2Umk7FUXpH8b/TTxG STf/crnjYy47AItFgCPejoI2JZijN5bmOceii8115BHBBry1E2vhDt9jWxpj2N8ZOF54 Dw+pdWuWJw/mAa/3WTSCQDPJ2iWLBFVBjmbRBx/LDSJBaHfbfT9oiBVo9Oahq0Aj44O0 IBiq/K+1lr+ERGUXtRbSDnQn2MCJgbHbtZHmCP1Lr4Se5xR5Un8wpaHTAvIReNWkqMBA cHBl/cMM2wcrAqOUM6fWUAYrWExc8VG9HR2cjEWeYjYbFndVI3B7fbAgHJDs3KsfwrR9 W9Fg== X-Gm-Message-State: AGRZ1gIyjfpJpcy5ODvbggHuxqTQCX39eJrZASQXCibKpXoBOdKpcXdk tR48mPnlvnCO8NcdCO49m/gmRhsYcBeK5w== X-Google-Smtp-Source: AJdET5caWPjjHQIxkGtTITgKDtbiPjeBP8rLjfbXo58NZPeuJfvO4v8tOSP+KehRE2ti31ke632kgw== X-Received: by 2002:a63:4466:: with SMTP id t38mr12430027pgk.102.1541466175729; Mon, 05 Nov 2018 17:02:55 -0800 (PST) Received: from jzern.mtv.corp.google.com ([2620:0:1000:2511:5375:b441:4b44:1bd]) by smtp.gmail.com with ESMTPSA id h128-v6sm23166169pfb.52.2018.11.05.17.02.54 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Nov 2018 17:02:54 -0800 (PST) Received: by jzern.mtv.corp.google.com (Postfix, from userid 105886) id 4901080237; Mon, 5 Nov 2018 17:02:53 -0800 (PST) From: James Zern To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Nov 2018 17:02:53 -0800 Message-Id: <20181106010253.131597-1-jzern@google.com> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libvpxenc: extend auto-alt-ref range 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" vp9 now supports [0, 6] Signed-off-by: James Zern --- doc/encoders.texi | 1 + libavcodec/libvpxenc.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 899faac49b..3c6f5cd70b 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1641,6 +1641,7 @@ means unlimited. @table @option @item auto-alt-ref Enable use of alternate reference frames (2-pass only). +Values greater than 1 enable multi-layer alternate reference frames (VP9 only). @item arnr-max-frames Set altref noise reduction max frame count. @item arnr-type diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 09f7a88452..827df21fa5 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -1067,8 +1067,6 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM #define COMMON_OPTIONS \ - { "auto-alt-ref", "Enable use of alternate reference " \ - "frames (2-pass only)", OFFSET(auto_alt_ref), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 2, VE}, \ { "lag-in-frames", "Number of frames to look ahead for " \ "alternate reference frame selection", OFFSET(lag_in_frames), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, VE}, \ { "arnr-maxframes", "altref noise reduction max frame count", OFFSET(arnr_max_frames), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, VE}, \ @@ -1112,6 +1110,8 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, #if CONFIG_LIBVPX_VP8_ENCODER static const AVOption vp8_options[] = { COMMON_OPTIONS + { "auto-alt-ref", "Enable use of alternate reference " + "frames (2-pass only)", OFFSET(auto_alt_ref), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 2, VE}, { "cpu-used", "Quality/Speed ratio modifier", OFFSET(cpu_used), AV_OPT_TYPE_INT, {.i64 = 1}, -16, 16, VE}, LEGACY_OPTIONS { NULL } @@ -1121,6 +1121,8 @@ static const AVOption vp8_options[] = { #if CONFIG_LIBVPX_VP9_ENCODER static const AVOption vp9_options[] = { COMMON_OPTIONS + { "auto-alt-ref", "Enable use of alternate reference " + "frames (2-pass only)", OFFSET(auto_alt_ref), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 6, VE}, { "cpu-used", "Quality/Speed ratio modifier", OFFSET(cpu_used), AV_OPT_TYPE_INT, {.i64 = 1}, -8, 8, VE}, { "lossless", "Lossless mode", OFFSET(lossless), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 1, VE}, { "tile-columns", "Number of tile columns to use, log2", OFFSET(tile_columns), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 6, VE},