From patchwork Sat Nov 3 21:02:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Zern X-Patchwork-Id: 10911 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 BB71544D361 for ; Sat, 3 Nov 2018 23:02:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2FB8268A6C7; Sat, 3 Nov 2018 23:02:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 85DA968A6C7 for ; Sat, 3 Nov 2018 23:02:13 +0200 (EET) Received: by mail-pl1-f195.google.com with SMTP id w24-v6so2580293plq.3 for ; Sat, 03 Nov 2018 14:02:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=+duloa0gSSlKzIwv9p22pBijgR1wWbSbkGPOd8H7W54=; b=mWEQACVO2/8KT/jz9hxE5RH5zO60RIWMWJjLVUT8kFAwJBMCC2p5MDpEKFQWipdDr/ z8MhotyEV9lNhcoxCc8etL5yr3Xil8y5jQeLkwcznb7Ps+t+9krEsbPMq5RlJfcyNBlD qqV3Tr6el4M6yenr3xN5B3GILups5Z9uvG4XMmwIVhV9E4pKiwv4zp96u4Rn3bp4YA9I 5fJ/SLbKUQUf5t39XnrVCJi9nmQuqG+/MeZ0u8+uuCfW6SgWIa3eutJIkdQNRkVvz+Pw 6FPTkZyKPnUTVziSwoRNhH2HfnhbW3HJwEcrXvx6IvPcn4m7EeRRyuXV1OYEae6OrZYG tOUg== 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:mime-version :content-transfer-encoding; bh=+duloa0gSSlKzIwv9p22pBijgR1wWbSbkGPOd8H7W54=; b=l2vIGnnucvXtqZg18zbTBN+yhjfUxAxElTKqL5a3zcsXg93rGBQ0Oo3oZRz+Ik46MN DOMuNx9uGbgQNs59d6xUhNUCurX6JXEeOiF1JgmjkdDlVkCjkUydMTpycP5kjOlj+0to ebmA0C+RCjJElqmJGzjBO8C4/beHr3FgLODDA9Mq4rVg3XHqEXDrBkZRIMOXN5/jLeyj /T9Jpo7gxRyU7pLwrvbef5ud9/abMa7B7MLCj0YIXS3naaTbyBWJtpDBcCw8/pRcwAGY ygtIr5BA0hkYZZP4oszKezlvhq7ZIPSzDekcBa20azPFtZ0MkutVe1A5ssWoTfZpBpaF Nu6Q== X-Gm-Message-State: AGRZ1gLmPcwETfAV5poxEgIFp5bnSYN5jjELeWP1E1ky2UEZ/inJ8J72 ASoDQKpITfiBw/w02nMs9JaSTQ015Xyf0g== X-Google-Smtp-Source: AJdET5efK/4EzR6Hv6a+Q5+RYCrpet0byHJnMMfo/nAJmMplYP01FDU5HjxfIy7bUycZeRxonhB8xg== X-Received: by 2002:a17:902:d708:: with SMTP id w8-v6mr8760275ply.72.1541278964653; Sat, 03 Nov 2018 14:02:44 -0700 (PDT) Received: from jzern.mtv.corp.google.com ([2620:0:1000:2511:5375:b441:4b44:1bd]) by smtp.gmail.com with ESMTPSA id v23-v6sm6013526pfm.170.2018.11.03.14.02.43 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 03 Nov 2018 14:02:44 -0700 (PDT) Received: by jzern.mtv.corp.google.com (Postfix, from userid 105886) id 430CA801E1; Sat, 3 Nov 2018 14:02:43 -0700 (PDT) From: James Zern To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Nov 2018 14:02:43 -0700 Message-Id: <20181103210243.124306-1-jzern@google.com> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog 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 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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..ad4480b2ae 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -1068,7 +1068,7 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, #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}, \ + "frames (2-pass only)", OFFSET(auto_alt_ref), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 6, 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}, \