From patchwork Mon Apr 18 19:59:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bohan Li X-Patchwork-Id: 35340 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp9108pzh; Mon, 18 Apr 2022 12:59:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRARZoNGq5LujSrX0C2pBy6DsC3sovZ2gYd5HNGeuGuvTPJsJgXZ3pR6EI/CTYqa1qCxQ7 X-Received: by 2002:a17:907:9493:b0:6ef:6ade:92da with SMTP id dm19-20020a170907949300b006ef6ade92damr10659376ejc.630.1650311999099; Mon, 18 Apr 2022 12:59:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650311999; cv=none; d=google.com; s=arc-20160816; b=nqBnRdN9owdjS5qe3/4eq9cydehEDPMXRBZ82eLpEoNYhMH+szxGTuSp9AmwGQ+UBD YbyiOnID4EkB8G5VGQxkTSjUakwMNG9Wkmv3MS2QcUFUcY1N7bzU+Pv9dS72caPptmVe 6GLOGYMcv9kxZmfKOJO0WjQG4zJzAo0GHBy5zyPpVeiGW/BA7ri2latYHzsBjJAd4Ppm H7iIGejVrAW4Ljz1OfUfSktDFYUoPKCG46osmb+Pb4SeQheGO7tUBob4F+srXFwL42f7 CcFdT+H9tq8KYVJQzbS8ht3ekZ74OScNzfor3RsWGnsBwS7Hlg/28WZh9j6KwAPv6YNR Cd3Q== 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:mime-version:message-id:date :dkim-signature:delivered-to; bh=f3cua9PS/CAj3mmpoKc8PAe+ejiNmweMBhXuJk8M41A=; b=RpPL0k7GVYGzP5zGivo/FfrdztKhlbFVB9X3Y2it34/I2pdONaLRbKFX501jFirjUT j9c+A7CJo+xptG0ueWqrI2Gs1+Z1UlhzWBnYBKhqrGRY8nvngXb8MYxYjePRc/81vmZh hH744k7MucrkEITD19jhdsOdJGffc+UqDsta2fc0JagCZzrX5V1j3dxQ5i0t4mSbkWqB nHt3ZxD1l8M6BKc6ct5rV39eh+aKymAh/ObAQrzjpB5Z++s1AfBNOhQnl5k593kYj7wU BFN9v4OE1o+nu93sY/lEsRsfTZ1UkjR7E/Dj2qDHCQopGXK4rVQPhTtAv+L63mHRz1jI IsSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20210112 header.b=AKHiqDAL; 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 24-20020a170906309800b006e7ee599274si6516645ejv.235.2022.04.18.12.59.58; Mon, 18 Apr 2022 12:59:59 -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=AKHiqDAL; 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 8F45D68B2FC; Mon, 18 Apr 2022 22:59:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C2D568A336 for ; Mon, 18 Apr 2022 22:59:47 +0300 (EEST) Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-2ec12272fb2so126190857b3.6 for ; Mon, 18 Apr 2022 12:59:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=BGgszom/SwDjnW1xeEfmBZ/QUsxDGNw2RHYIQr8CVfU=; b=AKHiqDALXriIpN/Z480ua3dU31JDP/Dnkg2T+au0uTXTnLb5YZ5pwyMwwBfC+hA8jC lhJ5jrTRMGK5FoVxiT1jbJ1+MixRukqqkQsaoU6eYOxG3yJSy2vCd7aTqKtoTnf/nwe4 qszpNxg185zO3O4owURGB5ymqHTHmNsrxh3dkL0xH0f8WvwHzrUnIKf71zT8sN7bZu9k l/ZwRqP/+isC4AlNaPfakGSw8P0wjpKvMZ4BTRzQveHc7X1rV6Zt/iB1dyQGtGsrFtB5 EhDqSIkqyHpUrXGLDlb6vYXJElh5gwbrK21zZanP/BYyWSzP5OeG4oyKt/qwZc6uhCr5 IJHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=BGgszom/SwDjnW1xeEfmBZ/QUsxDGNw2RHYIQr8CVfU=; b=yU1F38ikmI3OWnBBF/+QcjUzCgbii5fs/396f0rF2MynstynUCmy4KdSKBKbaTgwHf 7lQWKsyaJw2ehe9axGqU0hB33mPVcXowR4TOgES2lxXBTQi4a1fHWSnz1XmE4HP6sTZh kIF1PQKi6bTEFkJwEHz1kuxdeYKtk6bJFJrhBAKgn8p7upDEDGn7L0wFH+1eYwXzknKc 0GxJrQ+LVrUhY/hF5kJlf1ph7Qz1g3c1mK2PaXvqBZ6iuLyDAEyWm07Unc2RQ2+xljRO A9P8oR3x3Ox85FV1qDZ4h+389nWeQx506THs+ctVIvWHKnq8S/43yPi8Xtxvf+X8pk7z Mkrg== X-Gm-Message-State: AOAM531NaFdVq2FkCvXZNGRNgGJV7fNPAtWeBbQGqz6StGcx1Jnbwxnb q9VRd3JpUJqGXtec6MXCDR4DBKfFVzQVqGHV8iaP8I+intOavYM6kLwvA3b/9wfhonPjs7tYhb6 UJVG4M5rkWJu2fEDrsHRwUAJoMX9ALkGq4gi2Pq2aZVWsqNi1u8FSG7XGu7PMxpVtQQ== X-Received: from bohanli.mtv.corp.google.com ([2620:0:1000:2511:6479:3e1b:bbd5:39e8]) (user=bohanli job=sendgmr) by 2002:a0d:f746:0:b0:2eb:4227:5191 with SMTP id h67-20020a0df746000000b002eb42275191mr11966752ywf.370.1650311986162; Mon, 18 Apr 2022 12:59:46 -0700 (PDT) Date: Mon, 18 Apr 2022 12:59:42 -0700 Message-Id: <20220418195942.3112480-1-bohanli@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.36.0.rc0.470.gd361397f0d-goog From: Bohan Li To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] Add unmet target level warning to libaom encoding. 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: MC7bUPHutBb2 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..402bcb5198 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.", + 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.", + 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);