From patchwork Fri Apr 14 01:44:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Zern X-Patchwork-Id: 3410 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.129.122.84 with SMTP id v81csp92176ywc; Thu, 13 Apr 2017 18:45:04 -0700 (PDT) X-Received: by 10.223.131.2 with SMTP id 2mr5278413wrd.87.1492134304436; Thu, 13 Apr 2017 18:45:04 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k13si1100367wmg.164.2017.04.13.18.45.03; Thu, 13 Apr 2017 18:45:04 -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=@google.com; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6F2C56899B7; Fri, 14 Apr 2017 04:44:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f181.google.com (mail-pf0-f181.google.com [209.85.192.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8854D689812 for ; Fri, 14 Apr 2017 04:44:47 +0300 (EEST) Received: by mail-pf0-f181.google.com with SMTP id s16so35626915pfs.0 for ; Thu, 13 Apr 2017 18:44:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:subject:date:message-id; bh=2NomPRxo2eQqxHXK5azeHqqSIXevoZkWbaifsh01u5o=; b=D43JkLOoN59VJWekSUbX2LckTgiCvnwooz6iOJDUgbkuJsIaFNU9DFdfrt6fG8dmkj EwOLJD5bKyjG05j2av6nrfo/lzVNerakpq+4C7dyIT/08yGwKhj4SYfPvfVNELBO34FL oOAc+VNqPilL4RGvIS5of+yixQLIBB36p69LYL3KylB/LUPvV9eV8/BdePZcQADXnn0w 6aiIKXzQpI/1z8ZCQShy17xlfphvZZl0wuH3VyhAUMISis5GFPrw0Q2qlONY6ZFgmvf1 CU8uhmoD6VacsVtUV8ZbgtdEkyp6D/KgywYwcyarOCF0QVsnRhzuHx2VAXymyV2S14xt yHCw== 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; bh=2NomPRxo2eQqxHXK5azeHqqSIXevoZkWbaifsh01u5o=; b=V1Ttv+hNeSgcQQAJUCGGM/Be2DiSftir9b4fPn/0jb81UVeEvxc1qoJz8/womV9SfZ aShqbfyanDK7d9QyGvHskQQUEdkRgJOuy/heeGjA9sL/yQplbdiqWpuNsOIvkHhaYk23 8YmFpV6HCd6nTJfWO2UHwMkI68YCZyWGQh9hDn46x9bK9DQMjX7womhHYSW0wiAgVs+G IxFyWtGjbO0GJvVCOpvtwACUVGjujvct8/hbxQEiEOkX5GAqmowtgENcZErP8l4ua11q cvCubVModTr0KA0qNbftre0ZE7vxbRMH8yA5Lrb2r0BXchOEs7kDfWKntb4pV0HKhq/x N7ow== X-Gm-Message-State: AN3rC/62tS55pSodEF8XJUvniVIfEbNVeSDC3XqEyJ68S6PWqpkn3W4s uontl9SbO7j5eWb4cJimsg== X-Received: by 10.98.20.23 with SMTP id 23mr4569067pfu.70.1492134291499; Thu, 13 Apr 2017 18:44:51 -0700 (PDT) Received: from jzern.mtv.corp.google.com ([172.22.112.200]) by smtp.gmail.com with ESMTPSA id p6sm411954pgn.9.2017.04.13.18.44.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Apr 2017 18:44:50 -0700 (PDT) Received: by jzern.mtv.corp.google.com (Postfix, from userid 105886) id 2217AA2D5E; Thu, 13 Apr 2017 18:44:50 -0700 (PDT) From: James Zern To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Apr 2017 18:44:50 -0700 Message-Id: <20170414014450.176531-1-jzern@google.com> X-Mailer: git-send-email 2.12.2.762.g0e3151a226-goog Subject: [FFmpeg-devel] [PATCH] libvpxenc: allow aq-mode 4 (equator360) 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" this was added in 1.6.0 Signed-off-by: James Zern --- doc/encoders.texi | 2 +- libavcodec/libvpxenc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 594c612b5a..f8f187664c 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1666,7 +1666,7 @@ option to 2. Enable frame parallel decodability features. @item aq-mode Set adaptive quantization mode (0: off (default), 1: variance 2: complexity, 3: -cyclic refresh). +cyclic refresh, 4: equator360). @item colorspace @emph{color-space} Set input color space. The VP9 bitstream supports signaling the following colorspaces: diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index b8e8d3a87b..4ae0918c69 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -1142,11 +1142,12 @@ static const AVOption vp9_options[] = { { "tile-columns", "Number of tile columns to use, log2", OFFSET(tile_columns), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 6, VE}, { "tile-rows", "Number of tile rows to use, log2", OFFSET(tile_rows), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 2, VE}, { "frame-parallel", "Enable frame parallel decodability features", OFFSET(frame_parallel), AV_OPT_TYPE_BOOL,{.i64 = -1}, -1, 1, VE}, - { "aq-mode", "adaptive quantization mode", OFFSET(aq_mode), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 3, VE, "aq_mode"}, + { "aq-mode", "adaptive quantization mode", OFFSET(aq_mode), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 4, VE, "aq_mode"}, { "none", "Aq not used", 0, AV_OPT_TYPE_CONST, {.i64 = 0}, 0, 0, VE, "aq_mode" }, { "variance", "Variance based Aq", 0, AV_OPT_TYPE_CONST, {.i64 = 1}, 0, 0, VE, "aq_mode" }, { "complexity", "Complexity based Aq", 0, AV_OPT_TYPE_CONST, {.i64 = 2}, 0, 0, VE, "aq_mode" }, { "cyclic", "Cyclic Refresh Aq", 0, AV_OPT_TYPE_CONST, {.i64 = 3}, 0, 0, VE, "aq_mode" }, + { "equator360", "360 video Aq", 0, AV_OPT_TYPE_CONST, {.i64 = 4}, 0, 0, VE, "aq_mode" }, #if VPX_ENCODER_ABI_VERSION >= 12 {"level", "Specify level", OFFSET(level), AV_OPT_TYPE_FLOAT, {.dbl=-1}, -1, 6.2, VE}, #endif