From patchwork Fri Nov 18 22:01:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Converse X-Patchwork-Id: 1479 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp344718vsb; Fri, 18 Nov 2016 14:02:55 -0800 (PST) X-Received: by 10.28.22.193 with SMTP id 184mr635949wmw.100.1479506575171; Fri, 18 Nov 2016 14:02:55 -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 f21si3982497wmh.150.2016.11.18.14.02.54; Fri, 18 Nov 2016 14:02:55 -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 AFD38689D08; Sat, 19 Nov 2016 00:02:46 +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 5DE09689C4F for ; Sat, 19 Nov 2016 00:02:39 +0200 (EET) Received: by mail-pg0-f66.google.com with SMTP id 3so21693444pgd.0 for ; Fri, 18 Nov 2016 14:02:41 -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:in-reply-to:references; bh=2T26lL7DwyWrXiS/Cv43XGfzZBJFzHLikAkYt4J0xMA=; b=OURoUkSfYznwqqE0DjNIa61n5qtEstj2lydgoPpL71CyCMRekqNydcHfYNCzvlHmCy SCXhCpjZbv/DZQJ5xTPYuvttiRzSTDNg8500GaomTBYrawXC2wg64bLqPZEtEtSTKft/ 5V+mweKWzcRQM3Qvs5I5Vy3hAZAP2SgIGSmwPmHPnevoxT4LPzhEvC4RwBTrwaY3cPb7 ZvVlRGH4hBsCbolSL+CvNH2e/XgN23LQEc+MEgPz9/rX9g2Hb1/8jZeswJ5cUcpDAYDq FIUMNCxeFeMztRVMhP6hwqbnlCHKMXNxZ5326TsuqsLpAr6C9qsIMSK2WY2rZf1npqn0 PbCg== 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:in-reply-to :references; bh=2T26lL7DwyWrXiS/Cv43XGfzZBJFzHLikAkYt4J0xMA=; b=b9KZnMvYZkMsNbvm9V2aZPP81wwQsInzZJWBbcKmAzJnaW4MlcnF+w7yYBpGYXpXJm iteFwopIQdgVq8y5c8fUrLNUGcrwbkmwbKLRsMYG9j0MOx42xaK5B8ZebnMJHlqL8Qb7 cwLotc3jQ7Wv4fTmJyvmFRMn/38apHrz6tOgiEdpNe71cPaIDYpQm3AJoMQ6FH1zhQAj ZLgc0ctqrcitNyX0XF9Zk2NIyVWyLsHh2gYfFtewQ7bNNnEhnyMpFT9QturcivPG6Bpr dnambBw8d8IXlbCFehO2LQk0uRTSFkOT/0w65IfuWP91eeMDJqIQ6G4cQr5Kd7pQIMwj ryUg== X-Gm-Message-State: AKaTC008jKZVx658gEHY6Q7jit+haIuc36M/3mIzgH2xwHdaqDiL5vM24mcPVME+8e6QPA== X-Received: by 10.99.155.26 with SMTP id r26mr3821168pgd.165.1479506559301; Fri, 18 Nov 2016 14:02:39 -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.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Nov 2016 14:02:38 -0800 (PST) From: Alex Converse To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Nov 2016 14:01:57 -0800 Message-Id: <1479506517-731-2-git-send-email-alex.converse@gmail.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1479506517-731-1-git-send-email-alex.converse@gmail.com> References: <1479506517-731-1-git-send-email-alex.converse@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] libvpxenc: Report encoded 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" Report the actual level of the encoded output if a level is targeted or the level is passively tracked with a target of 0. --- libavcodec/libvpxenc.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 51f423a..a2fb82e 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -137,6 +137,7 @@ static const char *const ctlidstr[] = { #endif #if VPX_ENCODER_ABI_VERSION >= 12 [VP9E_SET_TARGET_LEVEL] = "VP9E_SET_TARGET_LEVEL", + [VP9E_GET_LEVEL] = "VP9E_GET_LEVEL", #endif #endif }; @@ -264,9 +265,39 @@ static av_cold int codecctl_int(AVCodecContext *avctx, return res == VPX_CODEC_OK ? 0 : AVERROR(EINVAL); } +#if VPX_ENCODER_ABI_VERSION >= 12 +static av_cold int codecctl_intp(AVCodecContext *avctx, + enum vp8e_enc_control_id id, int *val) +{ + VPxContext *ctx = avctx->priv_data; + char buf[80]; + int width = -30; + int res; + + snprintf(buf, sizeof(buf), "%s:", ctlidstr[id]); + av_log(avctx, AV_LOG_DEBUG, " %*s%d\n", width, buf, *val); + + res = vpx_codec_control(&ctx->encoder, id, val); + if (res != VPX_CODEC_OK) { + snprintf(buf, sizeof(buf), "Failed to set %s codec control", + ctlidstr[id]); + log_encoder_error(avctx, buf); + } + + return res == VPX_CODEC_OK ? 0 : AVERROR(EINVAL); +} +#endif + static av_cold int vpx_free(AVCodecContext *avctx) { VPxContext *ctx = avctx->priv_data; + int level_out = 0; + +#if VPX_ENCODER_ABI_VERSION >= 12 + if (ctx->level >= 0 && !(avctx->flags & AV_CODEC_FLAG_PASS1) && + !codecctl_intp(avctx, VP9E_GET_LEVEL, &level_out)) + av_log(avctx, AV_LOG_INFO, "Encoded level %.1f\n", level_out * 0.1); +#endif vpx_codec_destroy(&ctx->encoder); if (ctx->is_alpha)