From patchwork Tue Apr 19 18:18:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bohan Li X-Patchwork-Id: 35351 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp486206pzh; Tue, 19 Apr 2022 11:20:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLwdMmMtspJ3REIouBHhSJedan45cBcc10MS074tzdpEDp24iVcqVdMZbymbI8xG8SENN0 X-Received: by 2002:a05:6402:5187:b0:423:deb7:f6cd with SMTP id q7-20020a056402518700b00423deb7f6cdmr14064162edd.177.1650392442764; Tue, 19 Apr 2022 11:20:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650392442; cv=none; d=google.com; s=arc-20160816; b=ti7v+gyonUSw6RzaBQCk/bJqAMtOzet+ihbDExkw+BuvdPNqb1mhfXYIlNhznx3Wm6 LnZ23cjGYDvhgXaZQaEWn1/bGbhql8veaKuwZYTBoIK51w6VFZLOLiRUTAhGPx9XYT+/ dQvXMRPVnTKIR+xcM+7/xANxUneNJvTtC0JqUzdTGtXpesffVSwH/Q9XLQ7fD6N5M5sj +LI4NKygBbX0omWC08e6JW3zf6L7oMg4dzodHk12jmM76jo6Y0JadOAYBNTAhiLrMgAa IXoI1c/tDlNQY28+HSyz+NLOfyF1UaGJlhJ3PtVcsI4EL4/MwbGgIvpqavkgf1YwopCk EhZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:from:references:mime-version :message-id:in-reply-to:date:dkim-signature:delivered-to; bh=DEuhdKLlXVTa8f0U22oALtMRP9f2Ifx4GbawSMmlCBI=; b=s++Gb+xKMV3hF2NpexCHOlp8QRMbWt0z0zdc1JuhIxx2YvUfpJETwIoUCPgzhcI9Yh H+OCJfdHxqnEEe77SXFNimO2lIoa0RgDu6/XzMYg3Q3MIzlZBvaUfe0RPywJnonYfGP4 cvMtZ16TrqDHPLRKkYC1HR4VfX7hZvP+dyIoY6GI8jmFTN1jlq3vjfAzeoBg/NkduC76 WflcsjbWVa4cmE5CExA7+Sk6ZlRUMsBCQgIqe9/evlt8wX0bNwIsIYMeha7gD4bY76CO a96gw5G7eS5eozIwGj5QcONodeKUTDUQEKwZpIH0q9TjAIO2bGn+tB8hPVPiGSwQj8g5 vsMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20210112 header.b=g4Yw5rkP; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bm9-20020a170906c04900b006e7d34b161asi8942906ejb.665.2022.04.19.11.20.41; Tue, 19 Apr 2022 11:20:42 -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 header.s=20210112 header.b=g4Yw5rkP; 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 4C3AF68B353; Tue, 19 Apr 2022 21:20:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1A2768B0C3 for ; Tue, 19 Apr 2022 21:20:31 +0300 (EEST) Received: by mail-yb1-f201.google.com with SMTP id h16-20020a056902009000b00628a70584b2so15410315ybs.6 for ; Tue, 19 Apr 2022 11:20:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=14ZbfoY9TctrvmW3oZcqvMvnEgDKBdJ5nFLkfYfGZq4=; b=g4Yw5rkPCrha7FHHL4a5e5pww/zK2RzD+NLYFIY67WxjD4IQz27ZOAqRjmvqmVGXPX WujPv+MTQoNdaFbJcfgckhUWTAqeYbdv9lQFrbuyruqhH/5kVakUlK/P7lYRQvU1Afz0 9AUZCWY4ltvzPCTsq6gj576ux5OJYCW+j2PWByDFUICJMLOcG5FDwr/HZygZzopEgEZ/ /WHwtBFULziqXDyM+qeIhiNiFk+Snn2CsIaEiiaYcsYDjwiIardK1f+mQ8+BihjH4FRQ NTHeu2EXXBzHxQi7f2JuSysb9Xbd3dQEWnThACq/9TuMTCDSAAzpjs6m0Bl9zNnDQmWE iLRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=14ZbfoY9TctrvmW3oZcqvMvnEgDKBdJ5nFLkfYfGZq4=; b=ghH1KmJn91ll9JQv2H3nDPwmcpZYHMokJSg1a3QxZHeOA5Kqw70jq2ukE/UnsBvkvu jji02utJ+8BIJ5u/sK+ml2KnYFFfpjAlVK7uxk9oojG+EIf+rxVMNPPPR6hDXK32vZgG wxpQ5t9ql2dZXRi7V7oK4wSOHtryvTufHEJa0FIcj0i/bhUA8tEx3GrCm+ceEUFWZjqt EP7Mf/VChQumvC9R+gF/HKBJQluG+93UJ57+zb1VmgmBK7Jl1TER0bIvxlM+4yuy2ngC JvvUUSpI/rKF9WMxV2jeX82smHgBkijziLQuUGS4E3FyVDvGjWxMRnMN4GAx8dCGUy8J NDOw== X-Gm-Message-State: AOAM531hDwANdu+51r1Y56vCsEsIRtV3GgMWzGcxNTIIZuyTbXPWENQ1 Vz6RU51vM71Vopc6xRlpzGmVbcx46C+ZmMMjEM7OoFFj904JyN423nsyYk+CsGtdkXxD91/F6aR ZxHuDDl1+oBW1FB/RM6to1Rb70rhGWSHeCazbU89f88zNUejSUNP7uXYoHWDFVgCVJw== X-Received: from bohanli.mtv.corp.google.com ([2620:0:1000:2511:6ff:7206:1c4e:68fe]) (user=bohanli job=sendgmr) by 2002:a25:6b0f:0:b0:633:d1a3:9dbf with SMTP id g15-20020a256b0f000000b00633d1a39dbfmr16650809ybc.216.1650392430166; Tue, 19 Apr 2022 11:20:30 -0700 (PDT) Date: Tue, 19 Apr 2022 11:18:51 -0700 In-Reply-To: <20220419170324.3342219-1-bohanli@google.com> Message-Id: <20220419181850.3392814-1-bohanli@google.com> Mime-Version: 1.0 References: <20220419170324.3342219-1-bohanli@google.com> X-Mailer: git-send-email 2.36.0.rc0.470.gd361397f0d-goog From: Bohan Li To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2] avcodec/libaomenc: Add unmet target level warning X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Bohan Li Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: o7AyfMyPU4M9 When target levels are set, this patch checks whether they are satisfied by libaom. If not, a warning is shown. Otherwise the output levels are also logged. This patch applies basically the same approach used for libvpx. Signed-off-by: Bohan Li --- libavcodec/libaomenc.c | 64 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 054903e6e2..77be56fa51 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -198,6 +198,12 @@ static const char *const ctlidstr[] = { [AV1E_SET_ENABLE_SMOOTH_INTERINTRA] = "AV1E_SET_ENABLE_SMOOTH_INTERINTRA", [AV1E_SET_ENABLE_REF_FRAME_MVS] = "AV1E_SET_ENABLE_REF_FRAME_MVS", #endif +#ifdef AOM_CTRL_AV1E_GET_SEQ_LEVEL_IDX + [AV1E_GET_SEQ_LEVEL_IDX] = "AV1E_GET_SEQ_LEVEL_IDX", +#endif +#ifdef AOM_CTRL_AV1E_GET_TARGET_SEQ_LEVEL_IDX + [AV1E_GET_TARGET_SEQ_LEVEL_IDX] = "AV1E_GET_TARGET_SEQ_LEVEL_IDX", +#endif }; static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc) @@ -323,10 +329,68 @@ static av_cold int codecctl_int(AVCodecContext *avctx, return 0; } +#if defined(AOM_CTRL_AV1E_GET_SEQ_LEVEL_IDX) && \ + defined(AOM_CTRL_AV1E_GET_TARGET_SEQ_LEVEL_IDX) +static av_cold int codecctl_intp(AVCodecContext *avctx, +#ifdef UENUM1BYTE + aome_enc_control_id id, +#else + enum aome_enc_control_id id, +#endif + int* ptr) +{ + AOMContext *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, *ptr); + + res = aom_codec_control(&ctx->encoder, id, ptr); + if (res != AOM_CODEC_OK) { + snprintf(buf, sizeof(buf), "Failed to set %s codec control", + ctlidstr[id]); + log_encoder_error(avctx, buf); + return AVERROR(EINVAL); + } + + return 0; +} +#endif + static av_cold int aom_free(AVCodecContext *avctx) { AOMContext *ctx = avctx->priv_data; +#if defined(AOM_CTRL_AV1E_GET_SEQ_LEVEL_IDX) && \ + defined(AOM_CTRL_AV1E_GET_TARGET_SEQ_LEVEL_IDX) + if (!(avctx->flags & AV_CODEC_FLAG_PASS1)) { + int levels[32] = { 0 }; + int target_levels[32] = { 0 }; + + if (!codecctl_intp(avctx, AV1E_GET_SEQ_LEVEL_IDX, levels) && + !codecctl_intp(avctx, AV1E_GET_TARGET_SEQ_LEVEL_IDX, + target_levels)) { + for (int i = 0; i < 32; i++) { + if (levels[i] > target_levels[i]) { + // Warn when the target level was not met + av_log(avctx, AV_LOG_WARNING, + "Could not encode to target level %d.%d for " + "operating point %d. The output level is %d.%d.\n", + 2 + (target_levels[i] >> 2), target_levels[i] & 3, + i, 2 + (levels[i] >> 2), levels[i] & 3); + } else if (target_levels[i] < 31) { + // Log the encoded level if a target level was given + av_log(avctx, AV_LOG_INFO, + "Output level for operating point %d is %d.%d.\n", + i, 2 + (levels[i] >> 2), levels[i] & 3); + } + } + } + } +#endif + aom_codec_destroy(&ctx->encoder); av_freep(&ctx->twopass_stats.buf); av_freep(&avctx->stats_out);