From patchwork Sat Jun 12 19:10:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thilo Borgmann X-Patchwork-Id: 28254 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp1521902iol; Sat, 12 Jun 2021 12:10:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz23B50cFL1bcppyn+tXtPJ/kquZYTRRrLllNCrMCwq3CO2BfSxiL+OXb7qJVG2ozOG5oLP X-Received: by 2002:a17:906:1704:: with SMTP id c4mr8886521eje.182.1623525047906; Sat, 12 Jun 2021 12:10:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623525047; cv=none; d=google.com; s=arc-20160816; b=fFg/OE4xCvXbzM9HaGsCB/JtETBJpFFa4bI69EEM+50BqAh4wtuCUeYnD+rzXHq5/w W0BsoXEtjpJAMpO/QSC1jviTwfXUOIMAG1edxnM7ePYGT1dGj8JYgOhzyGoCsTe9Ch6T 5VzbJwDvhdpdYDZ14fic5eT5jYw5K4POb1b58QJhrbMbwTS+7PBKxQctO90zHLvDTZng ncjo4qgxFgRndDEUHK3xNNwTNMZmUSUr2O1xPSZToUCueDITNH48ROwofxCpyYRb41Rd uQ4AFAqyPV3yOdahIGynEEDn0Y6CWsyml4pstSy99xu4KfyMvSUn0xRSkGoOE636B4ht BO2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:date:message-id:from:to :dkim-signature:delivered-to; bh=kGhbB/Lki+NFf4xJhxFvNWuqqPCOhploAUwCKRpioMs=; b=FLkwJ29ScoQTNfeEHLLkSF2O9DbaA8qjAwaMKb6D2NDvE9eOH0jchNn6bP8BNhCkKw G3DLxls3RvgU2BEku7f+SsmgzrXvmdEjLv2lo3Y6O4YJUep8JyAILfYtHRmEfRwO3NzM 1bm13llUzsjjEPV/xRmkotIwc8x1nAA+imWIpYkvEiH8niA5pV9IhnC60/fMLV9Qfzrd FgBpLd7YXZOG19AR9JN3EB1XlB6fzBMR5ry4cn1LW3YOAa+XXae+jU6gbjaLHPuVdtu7 X7Semk4u1Tyhwkgvsa9UlseqqJkVgaIDHZYMw+WqNT4T7Et7K77wjEBP8lmY0r1DuGDB 9gZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mail.de header.s=mailde202009 header.b=TUcQQcXf; 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 sp=NONE dis=NONE) header.from=mail.de Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 17si3472962ejk.683.2021.06.12.12.10.46; Sat, 12 Jun 2021 12:10:47 -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=@mail.de header.s=mailde202009 header.b=TUcQQcXf; 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 sp=NONE dis=NONE) header.from=mail.de Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A2EF6804F6; Sat, 12 Jun 2021 22:10:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from shout01.mail.de (shout01.mail.de [62.201.172.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC8616802EA for ; Sat, 12 Jun 2021 22:10:34 +0300 (EEST) Received: from postfix01.mail.de (postfix02.bt.mail.de [10.0.121.126]) by shout01.mail.de (Postfix) with ESMTP id C16B21000EB for ; Sat, 12 Jun 2021 21:10:32 +0200 (CEST) Received: from smtp04.mail.de (smtp04.bt.mail.de [10.0.121.214]) by postfix01.mail.de (Postfix) with ESMTP id A9E18A03C1 for ; Sat, 12 Jun 2021 21:10:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde202009; t=1623525032; bh=K4WujvHHtGAaPouhIcsarJI1aLOmBtLQJIbSL5PMCvw=; h=To:From:Subject:Date:From; b=TUcQQcXfaoc0Yn+F1MD8Db7FbPq7PxLkKgmqTZjQAdpcAvpRJD2bUbd/mpWc83lpi 0914CM+teA1NFfyk8joSBrS6715vqvzJU0W+mmwOYV0o6pewFK0v5YK2IeCGX44bFe yJIE5z9T0YSERJa84cTqKDx/viTD6KBfUjfTLoKuT7nMxcsrO6pV325ff08/cO40xl iVIyEXEQZ6OUg+L9u4Z9DzMLMxzABCD5ZrkDT6wyyYkR2ZO3CtXk/sWrs8ntYSrmsl yK7cHFcfMpLoCidZbAJ8aZi93yQOHrqGGsn8oGQeElm1to3d+EfbSBh4xXuFljPbLZ bFELE1lCfZt2Q== Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by smtp04.mail.de (Postfix) with ESMTPSA id 660FDC1352 for ; Sat, 12 Jun 2021 21:10:32 +0200 (CEST) To: FFmpeg development discussions and patches From: Thilo Borgmann Message-ID: Date: Sat, 12 Jun 2021 21:10:30 +0200 MIME-Version: 1.0 Content-Language: en-US X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 3394 X-purgate-ID: 154282::1623525032-00006678-6085611A/0/0 Subject: [FFmpeg-devel] [PATCH 1/2] lavc/libaomenc: Show encoder config as a warning in case of failed initialization 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: o/KtZO2I2OaY Hi, if init fails, it's likely originating from the library's config. This and 2/2 are for easier debugging in that case instead of having to run again with loglevel DEBUG. -Thilo From c165947450383da4e81ef0b0a1ec82509c698479 Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Sat, 12 Jun 2021 20:59:29 +0200 Subject: [PATCH 1/2] lavc/libaomenc: Show encoder config as a warning in case of failed initialization Suggested-By: ffmpeg@fb.com --- libavcodec/libaomenc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 779714fdaa..468f2ba775 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -209,10 +209,10 @@ static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc) } static av_cold void dump_enc_cfg(AVCodecContext *avctx, - const struct aom_codec_enc_cfg *cfg) + const struct aom_codec_enc_cfg *cfg, + int level) { int width = -30; - int level = AV_LOG_DEBUG; av_log(avctx, level, "aom_codec_enc_cfg\n"); av_log(avctx, level, "generic settings\n" @@ -612,7 +612,7 @@ static av_cold int aom_init(AVCodecContext *avctx, return AVERROR(EINVAL); } - dump_enc_cfg(avctx, &enccfg); + dump_enc_cfg(avctx, &enccfg, AV_LOG_DEBUG); enccfg.g_w = avctx->width; enccfg.g_h = avctx->height; @@ -746,12 +746,14 @@ static av_cold int aom_init(AVCodecContext *avctx, if (res < 0) return res; - dump_enc_cfg(avctx, &enccfg); /* Construct Encoder Context */ res = aom_codec_enc_init(&ctx->encoder, iface, &enccfg, flags); if (res != AOM_CODEC_OK) { + dump_enc_cfg(avctx, &enccfg, AV_LOG_WARNING); log_encoder_error(avctx, "Failed to initialize encoder"); return AVERROR(EINVAL); + } else { + dump_enc_cfg(avctx, &enccfg, AV_LOG_DEBUG); } // codec control failures are currently treated only as warnings From patchwork Sat Jun 12 19:12:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thilo Borgmann X-Patchwork-Id: 28253 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp1522804iol; Sat, 12 Jun 2021 12:12:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwx4ePU9OplqfiMh2VovVIAHz6v77UvIk63OdLzoF3/O36b+3WMrZphkYffJPUoARIGim8G X-Received: by 2002:a05:6402:1458:: with SMTP id d24mr9640891edx.85.1623525148735; Sat, 12 Jun 2021 12:12:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623525148; cv=none; d=google.com; s=arc-20160816; b=K8H9yhxWrvX6FkThcuClBdX5Hy2Y0X7OqG5OKCoFwChKvJUYgmjImuDPaI7CtZxlgH MoCAsoJI4O4/1E8OlnVXkMofSY/MTXJPZbYsWbACACZkm0PcJWv89n2/SEWWr6sBIa98 Blk2l/CE7PqQ07sSNh0Jd2Gt+2gaeHo/H+sFM4vP7mrWj0OW3HTjrcvwSl+PISC6GknY MhvO12ka6Eb9igEBgzB9+zvjyyMts9Gq+UPd3O3WpD2CN3iGmLyY6lZo45jlGecgxDIW 3nhty//8OWvacCBOljq4EBwLygK9qfh67+KxwKw9dDnuOWkQ4Zk9+vpQ4KnMZAoMOGLB nqDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:in-reply-to:mime-version:date:message-id:from :references:to:dkim-signature:delivered-to; bh=w/6lPA/1Bzi7ca5xD8JtgfMeOR/8VzeNpljnrOfPMbg=; b=xYydHsFs5oleKXo6PabVjbw4hh3Ci5KCuOF8ZA5zamfotS2jXnRekeBcTenuBqpWCS Le3ZlJ26V/O+EKbR9S2EiUy5t82mSagFJUe9/p6whBaVcuHncXK1qfMVr5AJ4kcJqT+p CHemrHev2Nh/Yh/lNrm1fojX07inMmVlZj+fpc+9aVGEeX9682A1a4BgdpCDHkqg7/3s l2FQXkVxPh9ODXwmBADap/EFZYRsKeY6gpc827RBsuSc8aOQdkt0xMF800JLeAEIywno koMXv3oOuGoteks2sAjOET3aujHLmAisJPjPemPuvCzI2miec/7JvvyhjFsgyohwM+Vb C6QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mail.de header.s=mailde202009 header.b=cCDnCDxU; 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 sp=NONE dis=NONE) header.from=mail.de Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 12si8031554ejm.512.2021.06.12.12.12.26; Sat, 12 Jun 2021 12:12:28 -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=@mail.de header.s=mailde202009 header.b=cCDnCDxU; 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 sp=NONE dis=NONE) header.from=mail.de Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C005B680618; Sat, 12 Jun 2021 22:12:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from shout01.mail.de (shout01.mail.de [62.201.172.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 97EBB68052A for ; Sat, 12 Jun 2021 22:12:18 +0300 (EEST) Received: from postfix01.mail.de (postfix01.bt.mail.de [10.0.121.125]) by shout01.mail.de (Postfix) with ESMTP id 36CB5100350 for ; Sat, 12 Jun 2021 21:12:18 +0200 (CEST) Received: from smtp04.mail.de (smtp04.bt.mail.de [10.0.121.214]) by postfix01.mail.de (Postfix) with ESMTP id 1EE76802C5 for ; Sat, 12 Jun 2021 21:12:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde202009; t=1623525138; bh=fgqX3MqQDhlZG/VhKbN5y4nci5IEBQF8lkXnhzBdqFY=; h=Subject:To:References:From:Date:In-Reply-To:From; b=cCDnCDxUBG+B34Y76FJ77nZGBik3DfRA9WBRtTwEewpK2VXXQTeqDU1VauM3lbTMT uy2L51MGQ7MgClM4VkB0s0/h2N0j20818JSB+mFTX1v9fttWfu1sdxFIOhY2i5IPrA Npfh2jZ9i0HDRCoO09MC5CuM3RcjkF+lk254kBAiAxR/ycfmycCVdPmkHnflUroLaP pRTA+1ZJtNZKJfyrsye1IJzmWbujHa+/CRnZh7jj+ZjthkC81JHG43k8xjpC/uPGGV liABUtFPzJlZ1Tz+lmvR65/7Uej+wAxK/ncw5vYlrg4y/axyweK+30dCNFiY7RCPJQ Uuejjt1TDd6DA== Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by smtp04.mail.de (Postfix) with ESMTPSA id E028BC0D19 for ; Sat, 12 Jun 2021 21:12:17 +0200 (CEST) To: ffmpeg-devel@ffmpeg.org References: From: Thilo Borgmann Message-ID: <7dac021c-067e-3534-cedc-26799af1dd09@mail.de> Date: Sat, 12 Jun 2021 21:12:17 +0200 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 3243 X-purgate-ID: 154282::1623525137-00006678-F60E9463/0/0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/libvpxenc: Show encoder config as a warning in case 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: FMOROmAEXYzz $subject -Thilo From 77ec6561c69bc35b338f92af551f277066f71b88 Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Sat, 12 Jun 2021 21:01:40 +0200 Subject: [PATCH 2/2] lavc/libvpxenc: Show encoder config as a warning in case of failed initialization Suggested-By: ffmpeg@fb.com --- libavcodec/libvpxenc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 66bad444d0..16c68d8fee 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -190,10 +190,10 @@ static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc) } static av_cold void dump_enc_cfg(AVCodecContext *avctx, - const struct vpx_codec_enc_cfg *cfg) + const struct vpx_codec_enc_cfg *cfg, + int level) { int width = -30; - int level = AV_LOG_DEBUG; int i; av_log(avctx, level, "vpx_codec_enc_cfg\n"); @@ -860,7 +860,7 @@ static av_cold int vpx_init(AVCodecContext *avctx, return AVERROR(EINVAL); } - dump_enc_cfg(avctx, &enccfg); + dump_enc_cfg(avctx, &enccfg, AV_LOG_DEBUG); enccfg.g_w = avctx->width; enccfg.g_h = avctx->height; @@ -1004,12 +1004,14 @@ static av_cold int vpx_init(AVCodecContext *avctx, en->key, en->value); } - dump_enc_cfg(avctx, &enccfg); /* Construct Encoder Context */ res = vpx_codec_enc_init(&ctx->encoder, iface, &enccfg, flags); if (res != VPX_CODEC_OK) { + dump_enc_cfg(avctx, &enccfg, AV_LOG_WARNING); log_encoder_error(avctx, "Failed to initialize encoder"); return AVERROR(EINVAL); + } else { + dump_enc_cfg(avctx, &enccfg, AV_LOG_DEBUG); } #if CONFIG_LIBVPX_VP9_ENCODER if (avctx->codec_id == AV_CODEC_ID_VP9 && enccfg.ts_number_layers > 1) {