From patchwork Fri Nov 18 22:01:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Converse X-Patchwork-Id: 1480 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp344640vsb; Fri, 18 Nov 2016 14:02:48 -0800 (PST) X-Received: by 10.28.183.215 with SMTP id h206mr664722wmf.60.1479506568110; Fri, 18 Nov 2016 14:02:48 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v134si4013919wmf.32.2016.11.18.14.02.47; Fri, 18 Nov 2016 14:02:48 -0800 (PST) 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=@gmail.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; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 512F1689BCF; Sat, 19 Nov 2016 00:02:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74009689A71 for ; Sat, 19 Nov 2016 00:02:37 +0200 (EET) Received: by mail-pg0-f66.google.com with SMTP id p66so21695473pga.2 for ; Fri, 18 Nov 2016 14:02:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=6eL7HpaxLbu0S+H5ROEoCLYXq/xSDIDU96dhwPkTSbI=; b=ENkfaeN2q2AKELx5fnPxDLGU00g/9IJeVEXnSISIiLq4Th2SSje3fAtpNQa/cUCZoJ F7Kh+ci2J/wBxXroLmShyC1ZTJcg7H535LrRV1cGfko1IiI85A2GX5gCW7oK0n2srKb3 /j2i3mdL3oF29cfNR3u08rxAWNdywMi6KIJBrhRBuf0NLi+giBNqBHTCZJmJKM3gtW4e G6ADEoUxWeQ+8Uxo1sU5R2HVSmGOuPxtuoCqbTFS9BVyq6XMEFRmE+yE/iSqtqHbW4Dn +u8UYXzVQJMZW71u1d+ZjOcvi3lpYE6o/O6ACZ3P+9N6BJUvBOCHVkjr2PZM4NdAxD3I 7vHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=6eL7HpaxLbu0S+H5ROEoCLYXq/xSDIDU96dhwPkTSbI=; b=PH0ZeDnPbBFnrG1IxK1MjIixdnPr01Ad+UCvIWVh5y67j/8MVD0sFuADxXeZC7Byd+ RextwIvoIh/ZguPgLqK+75q5GiMiB2kG2AbV+Dr/YYGJ9wUtetSvcxJBkbAA0zYskTWv T//9VbBJ8VFKFTvdzFSLfe1tjOeNRFQMSF3Tyoujgoyq8FQo/WzR/z5C5UgrgZ8RY3dw TU0RjYwu4zoUmAnSixHsHL3/nfBSAGkcHnjigDmfk0ZSJ9Viy9bdh7+GDA6WsME9ElW0 bYt/tpSIORdOPWBEeIRIgZHaJtpMvXddJW2bxzqisiV3TBncvKPWd8fFh5s3/HUrj0KT oHgg== X-Gm-Message-State: AKaTC03m0RNm0GVfayoj5p43J1t86D5pEVw7xDZRsmeZbU8tfSXTxHT7izZpNPfY7iLhHw== X-Received: by 10.98.166.136 with SMTP id r8mr2419882pfl.113.1479506557356; Fri, 18 Nov 2016 14:02:37 -0800 (PST) Received: from terok.mtv.corp.google.com ([172.22.116.121]) by smtp.gmail.com with ESMTPSA id a30sm2058095pgd.45.2016.11.18.14.02.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Nov 2016 14:02:36 -0800 (PST) From: Alex Converse To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Nov 2016 14:01:56 -0800 Message-Id: <1479506517-731-1-git-send-email-alex.converse@gmail.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Subject: [FFmpeg-devel] [PATCH 1/2] libvpxenc: Support targeting a VP9 level 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 Cc: Alex Converse MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Levels are specified at https://www.webmproject.org/vp9/levels/ --- libavcodec/libvpxenc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 68f25a4..51f423a 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -107,6 +107,7 @@ typedef struct VPxEncoderContext { int drop_threshold; int noise_sensitivity; int vpx_cs; + float level; } VPxContext; /** String mappings for enum vp8e_enc_control_id */ @@ -134,6 +135,9 @@ static const char *const ctlidstr[] = { #if VPX_ENCODER_ABI_VERSION >= 11 [VP9E_SET_COLOR_RANGE] = "VP9E_SET_COLOR_RANGE", #endif +#if VPX_ENCODER_ABI_VERSION >= 12 + [VP9E_SET_TARGET_LEVEL] = "VP9E_SET_TARGET_LEVEL", +#endif #endif }; @@ -680,6 +684,9 @@ FF_ENABLE_DEPRECATION_WARNINGS #if VPX_ENCODER_ABI_VERSION >= 11 set_color_range(avctx); #endif +#if VPX_ENCODER_ABI_VERSION >= 12 + codecctl_int(avctx, VP9E_SET_TARGET_LEVEL, ctx->level < 0 ? 255 : lrint(ctx->level * 10)); +#endif } #endif @@ -1089,6 +1096,9 @@ static const AVOption vp9_options[] = { { "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" }, +#if VPX_ENCODER_ABI_VERSION >= 12 + {"level", "Specify level", OFFSET(level), AV_OPT_TYPE_FLOAT, {.dbl=-1}, -1, 6.2, VE}, +#endif LEGACY_OPTIONS { NULL } };