From patchwork Fri Oct 20 14:34:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44299 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a09:b0:15d:8365:d4b8 with SMTP id e9csp442099pzh; Fri, 20 Oct 2023 07:33:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6hdZLKQFOPxMkkrUGVbsHUGvcOe3eitM568BzUmxuUO8ftq9UkDmJyUIIQ5w3lOtUycJq X-Received: by 2002:a17:907:3f17:b0:9be:e6d4:5753 with SMTP id hq23-20020a1709073f1700b009bee6d45753mr1323741ejc.28.1697812396745; Fri, 20 Oct 2023 07:33:16 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ht13-20020a170907608d00b009b9ee6a33e1si837234ejc.455.2023.10.20.07.33.16; Fri, 20 Oct 2023 07:33:16 -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=@outlook.com header.s=selector1 header.b=GXF6O5E9; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2930668CADA; Fri, 20 Oct 2023 17:33:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02olkn2066.outbound.protection.outlook.com [40.92.48.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F50168C02A for ; Fri, 20 Oct 2023 17:33:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QPFDRpfBUIBnkpnyYeIywbvhlxrpKWLC/SfvOz6csuHSjL1QX62FJjzEuviXlGWCMp2L+w+jO1CiRcjoxasXRmKtSZPtKz9sud4vh8ogIcRIBzJq5qM6SWjohNwAVZefX1F/5VakJWtneo8+3nRRIlBa0uXfpsbzut9iDd1mPVE40ZFB99ZGNyK+9KgelLsrCQ6n62mCM1fL5cxuM6E9kRrfV16F6090rv1BTYVSPNn68kAYNsF5Fsx/lYHluy/gG8TpiVokEDY4PbB348tigksVjocXF0/b3BHlZMjKpgVV193mrtvEOjYXpcMTOkVOFOk/XdXQ17R0fOO/RxiIUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TISwFZ24qs72XzDLQ9ZGFiBxwv2TQ8frSRFrqqxeSLU=; b=FNtUgftwXMDnB7kdA0m41VbBKL0mak+BrACpcAwWJoqG4ax5BVEZGQoLpLoC+uI4vqsAK1oIFFGGlE3i+4fXD2hNwo96EcPgbk8NAdrgDouw77g50C1X1gME18ED94ZPpcaI9sHNyfNtTsihgQnIbdsdeeP8x6PoJdoN6PemBpVfhDt1p2cgJOnJgUtXA0RqmjAJhVKWX1Tpi7E60OplYFFSTlL7vDtaLQXgt5QtC5kXbM8KCN3l2s+6eH420LbkusTzS0KE0ztT57xEeFZgi7RfrLQi9D18Mx0/cpW2xFEsG/e5cuP2+gPQEiBBxSKHvKmnMlHTUOxPqE3E6XBwJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TISwFZ24qs72XzDLQ9ZGFiBxwv2TQ8frSRFrqqxeSLU=; b=GXF6O5E9n1RenSKWkxgeUj1wp09mIB1RsDnvmfPRgD1W5XGtABG0KOokZMW3Fx27RPmze4DUVJOTz6npD/vJl/zc43+gdQVmaJQv/GMCMl7d7xA3hvulX19xU3t3hH8+bvqUThFXCmtG52g0VcXq+eeCMU6HvOubvte+RVWXiK1lKiueliphId5BBsZe9A7bjgY3LdhyZISwx2RO2KtLbkwdbQDIA+bZS9WmXvmDDuvIV6A0Zl0No3xUy7qY/iZI86SWpaSSijvku7UflnDTj7fyRAEweh/EwEJS1F3GMO09e2Lro7ABwIFdzJd066c8pOxyW7TKft0Atb4V5r48pw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0178.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:179::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Fri, 20 Oct 2023 14:33:05 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::3126:4823:194e:6f86]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::3126:4823:194e:6f86%5]) with mapi id 15.20.6907.022; Fri, 20 Oct 2023 14:33:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Oct 2023 16:34:17 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [QqD5o8tZN97RIw9HSG6ftj2IVrTh+cMlAb9MpFSOEXI=] X-ClientProxiedBy: ZR0P278CA0196.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::22) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20231020143417.492242-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0178:EE_ X-MS-Office365-Filtering-Correlation-Id: 33a7b207-7a9f-44be-5e4e-08dbd1797909 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MYlmO/vM86airJKNFyfaxvurC6mq+rSqS7jro/Hc81CvwSzLAh1W4qQbF3CgdNyDQC6jQqY41n3AQXrVj7Z2M/n853wyM/sau/x7omh7OcllFjzjQhF9qnDlxzl8I3b/5dYJWUUMD968QHJivbMi4XZplrrJfXH6Qr1OfBQiZnEp/zygIIO4vaJg1zyjeHyTGEVJtBqjymId9x9zlvkHZoPmBAd/N664XPGFXbtTo3Kczgxc3Vjd2wJE48PNlqs94Z/NbeClQ//RQqs0Edb7qYjYOUSN1kXrqfbJk86/jJBf1489oNJFSjmst6/NJkhjGP1UCmvwlukia6SGJ/ZgLqZIvKWGLNlxPVrZu6+yZLiVU9I+Y/njLT9gHjZnmD+5erICq0IQdz4gdVYscLul7dEvNLT2Fc7goYyR9gWy5HFIChmO99o7TyeXCxHhkIKvsar8mW2JaBWwCB3pdED6TTQlPs1EO1blCPtSwmJRYB1RM9K0EnSRfdSNikdPzJ1d5pzM/87XK3AMUBaMjv7ZRwIrh1BfL3KlSe1MmoTqyFLssl4pTYmMFTWtAqXTiz8Om49IV6xtamzqKN54VQRpiT8Jkz2TxgiMqxVY1suohfa8zIUUDpKEswwNQlLV1kZ3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lUlMGKan/xsN68SKPaHZpYe7kbA4yCU0ZrfrcjBqObzic+e0URcLjJ+F48Ee8+/MDC59aVTGFlYZBhu6sHObwBQkkGHX0lnuSnkH78YjGFnxP6c0PjcN4UyfidI+WZ+hfz5GM1Wa4timdt9f9C+MUbRkLOaPwjGh35Q2+rr1m1758r/hoXNX/PovSzA+C98IVigGh8kY9GxgePTva/Aidz9gWfXy2YfOHknVy12Es7nUrCGLvIf3srp5zE5l3icENr+1JO9RGEHHOxzJcbNJZvQh+tV4zvTccW9p/1kja5XXFkLUAUnTZhpuwdnGz2RcdNYrJOWTFR8WTEc6Q4LTZSOuIeGf56/nmvbxrv0bqo8RRVv5FAmhsEtmmFAqasbPv1iegNXLsWzFoFU1EtopackC/MQ+IUvHCCi/mRU8uvUGVOihum+eTs0LF5ydBKuHi84XcK4cXIEjhWu3DBdrc5Zv7/vG1npIYyZCD0FfVTX4GQTfE2H0BR68DwAqHT4CujZmIjjArM0USvdYLSpwHtlIcb8rEl8Ni1oMcZ4HWdgQxM3xWlA80bLcxCarnBMSeF3JY80ke7uNScmpMnXW+hFfsDT/CJLIgjmVny/APNMYMuM08U2vRRrKb7t/nbxGUGqC+ZSM3R2hruiKVUz6KSj9i7jIUAINfoczsM2adCUUaxNNxoKs5nUuo1GspqZIEmWzLzwCvDTNTESHE29kaflL9/fUWbvZtR4ws+sGQfQFOthBJyTfUHkCumjVuU71SMwkNq0zXY1ynjjlc2DAnXY3oynqGr5UGHI9iBVvIewWrqne09fP7S9gGMW6I5FIElmp+Ly434AjGcjG+XanQt8XWWLB/qbQhIEIUQ8e4rgKqXWmSjnEAtcbOQTKBS4zxDXlIIfSpqp1bU0JdT6ZycP4qKsRzZETopzEcnv+gN0GUYu9zDAUsTMSX32eel2lmoLYwHU2kZPXaegM9Bttg8dH40jc9eTF5YUZJWXlMMxuhqgylVh41LnqTcPvaKUA/O8U0V1gHMDlUgrc1VwlVZL1/pnOVpceWwCfVifZMilwg5mtLSfu3In9BxLKg2WdPLqt6is6dr1cvv1izk3VgqRgR31+jQUIyHlA5qh74Df94Hfl0Uom2rezUmiVukjpysI19DHrpIv04MNBeIokxreglCVXi7I3Bx4rdSMyguuVTtK1BczfZhzUpXoIby9pITSbt9dAg1kjdj/nYKd/62j4urIHkDSiGP4RZ4XarvgRKOI/Psgc4bC6DQk/g4xb X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 33a7b207-7a9f-44be-5e4e-08dbd1797909 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2023 14:33:05.7467 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P250MB0178 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/av1dec, vaapi_av1: Remove excessive logmessages 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0blE6F+V1BaI Signed-off-by: Andreas Rheinhardt --- libavcodec/av1dec.c | 10 ++-------- libavcodec/vaapi_av1.c | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 1a4339b346..6114cb78e6 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -819,19 +819,13 @@ static av_cold int av1_decode_init(AVCodecContext *avctx) for (int i = 0; i < FF_ARRAY_ELEMS(s->ref); i++) { s->ref[i].f = av_frame_alloc(); - if (!s->ref[i].f) { - av_log(avctx, AV_LOG_ERROR, - "Failed to allocate reference frame buffer %d.\n", i); + if (!s->ref[i].f) return AVERROR(ENOMEM); - } } s->cur_frame.f = av_frame_alloc(); - if (!s->cur_frame.f) { - av_log(avctx, AV_LOG_ERROR, - "Failed to allocate current frame buffer.\n"); + if (!s->cur_frame.f) return AVERROR(ENOMEM); - } ret = ff_cbs_init(&s->cbc, AV_CODEC_ID_AV1, avctx); if (ret < 0) diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c index 73aa19c364..1f9a6071ba 100644 --- a/libavcodec/vaapi_av1.c +++ b/libavcodec/vaapi_av1.c @@ -75,19 +75,13 @@ static int vaapi_av1_decode_init(AVCodecContext *avctx) VAAPIAV1DecContext *ctx = avctx->internal->hwaccel_priv_data; ctx->tmp_frame = av_frame_alloc(); - if (!ctx->tmp_frame) { - av_log(avctx, AV_LOG_ERROR, - "Failed to allocate frame.\n"); + if (!ctx->tmp_frame) return AVERROR(ENOMEM); - } for (int i = 0; i < FF_ARRAY_ELEMS(ctx->ref_tab); i++) { ctx->ref_tab[i].frame = av_frame_alloc(); - if (!ctx->ref_tab[i].frame) { - av_log(avctx, AV_LOG_ERROR, - "Failed to allocate reference table frame %d.\n", i); + if (!ctx->ref_tab[i].frame) return AVERROR(ENOMEM); - } ctx->ref_tab[i].valid = 0; }