From patchwork Wed Feb 14 14:37:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46265 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c493:b0:19e:cdac:8cce with SMTP id eo19csp421337pzb; Wed, 14 Feb 2024 06:35:30 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWnErLIPeYyfga17GyqZvmNMGSDWuwYFFfZlTPpQSlFG16/QaKPFU9gQck/C5b1ao3LOo260S6EIHvyhMqPRznlYM7GaADFGiU77A== X-Google-Smtp-Source: AGHT+IE3LIVBTg79d+nIMla+I/TObE60qKmsgT72x7zHqgH58rm3qZyx2HbCe8vLbB9spVdJHgLO X-Received: by 2002:aa7:cd1a:0:b0:562:f95:d048 with SMTP id b26-20020aa7cd1a000000b005620f95d048mr1971570edw.33.1707921329879; Wed, 14 Feb 2024 06:35:29 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVfzHbSbZ0tGJ1fbnDiPBcbs0SRQS+e0lxXZX4naa0XMyFIO74NV0CfgB+ggAAJPtHhuPoeEmF03rBInpEnjXLK7O1EqLMinT9wqDKvUZ1vPqWG7aipUr32SLBC/ZCZW8GFMfnQiPHCNDFHluVr2uwk1aL6LFf8vASMEe6T2/c7V773lW/3CIpVBkJJgz3B1k/QmnTXkWXrDc0hIb96MLcofQTatv1xDXjquLkS9Vnx2l2pLBDcr/UhRoMDo3Sxb3BNk8gXqHhtbpi+VNtR/atIxz2vPYByI+dX3HLa2xRfg2l5S2i6uDZIAAYsvICkDXxHM0C002LoLJl8PGQiqWTXxDu6NCRANDQe+NONuypfHn/Q/fcufGexYGPjAESm/SRyYzg6ss7b1Obzccabw8YbGn192uwFchBWcT/5/8g528QNTOCUlxHCM8fKiya7tpwYr6MzvrC24y9MHp7gjEBhVSRM0dEJp+gKChdHb4+PWH4CnA8sBVkg0nSq2WeroVrLIx/aiyJHXkBKIe9G7rDeKzxbgZGVym7F4MuFh4/jy9MHpfS5KEZ0zMWZAQe5dWkSJgnB0xCmOPnwgZoxMoJbsM/JrWwNU+diMIKvG4sujQpYaxe0J3gCvtBsaScU82sQnFkOdw6dLCmgaY5gXN1LVcoHTzs1t3ds9T/FYiKM2zR+YnL2Nx2+KpBu2UdGhQKZOSNr/OeSosOAT+6E7Uty0e4WO90RTkQTa1IwLgDw/T7QgZwgJMW7KB30UZt3zrV58bWl8o3exPrAn5eIzZgMmhupaR54vKbhrJnTSa2pSHjhdYJ66XQdXhFuHS4tWwWin6pF3tKZQ3I/6yAskvlFyKDgkBjxlQF72R9fYPB2FYHxh8n8KrMnXDQhDam86sYD3zfxdKgUH030OUpmFIBMW6VMHhczCOb+q/WONB2MHT2YkDiPqiluSk070GEvrMG9nj uugWYYPuCFuNQ6UfaidWMe0EbmGqK6SL7H33NxdRWhNM88+A4Yasa3zf3Z2KhzJM/1o6STN3LzcP9OuJYNMNGQzcndFswEtODD8XfzGVtk86FupsyWPzj0DT0+Orm7sbRPWtIXKRC/Fndq5SLHg0fdBQS6XH4PJkZos5twGQrfnSwfrd7gkXpfLZvRtjztWFvYRTXj/sXUVeTPn9EXedmRpIm/siQYAE+th+/jfRd4aNvBG/PMQNJRDFUBxIVb3lnmF7uVwkUAXIrOcin6qHjp3qDkUKwkWRIJrRRJcs6BCiRncus7b3u5Mj8UrANYsIjm5mScVCCIEMeKP6sJmy72/qqPZnCv3Gwd+9E1gtkRrQRF+NV0r8qVZA3UsbfK/pjWe7sV0jS76ff0aWaIC1M4HQJZfQCm9FR9KQrsjA7bpXSRBOUnzsf8rfo99DC+Acilt4lutDFk8d0LmoIk7TK+hF5HSb2ucA2wh8AtFdnyvPwwzwQqQlpcIQqC8DP7cdgY5LVKw/g3aHcmFjsBrtlNNYhnwJOx0M1Uh/2NMbiTmwOWqELcjGgaDfPzec3qOd3yXZkZAcWC87RpB3n1aRbsL4BBdWJNe5N7M1vjbg== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o6-20020aa7c506000000b005638a2daaedsi340462edq.429.2024.02.14.06.35.29; Wed, 14 Feb 2024 06:35:29 -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=@outlook.com header.s=selector1 header.b=Yj002z9l; 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 6FC3E68D1AC; Wed, 14 Feb 2024 16:35:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2090.outbound.protection.outlook.com [40.92.90.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 315F568C4C4 for ; Wed, 14 Feb 2024 16:35:19 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GcGPFQhI1Dm1l6rLI2hpJ8OMG480NXKl+zWajUt93PBS/3DLszVLeSeGQ1xs/sIQpV414NCJi+iy0APfllB6AkckvwL3kh90F83iSKKJSeiRV5O1eJpauJ2QQvOeqiwgBQHopiqHzdHw6WKnV3cAemitWTrUO+AQU6mcz/n5zYmLElrbzjtJx+cVCXSCyeGkcU/jpyBhADtZlmW4oQfz5/aeDMpsVjRePotQfUHnMaQpTM9npZAJFZcHWIM+ONhfjt3j5hGlNfrxJBGV7J5EtqrosX2o3T4Vwao9fi7nbrfjunfgxeDtEEP9B9iHRZCZztMBKklIjHLsV/wvu5JYSg== 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=21aT6O23YPduPm6I8Q8iVZZ6IXPriLde4NJhWlYTQog=; b=kA6kV2NYLd8AIXellaE30/GPbDOUO+D12S2yyaMPvLLuSGYTODpahvsEm7251rNBmX8Bt8g2WY2lUIQFsPrBkkx9A2BxQpdG2AABmBzxISOQOy1ciI5B/X6LymJWSlZV9QoCYz9rrSBTMEnUp+TLkIkLDsZg7unSeSg+W4yCsFxDPuRjW/1tdimdYWuyMd+OX0FFukL8J+TK0HuH79BTIs0C1jP+wgPTj70k93Qp5R4Is01CuE1CtGzfoOIRanpLaZQ/Y3OS5vcWpJdphzW7Pb1LhvG/zbfnyTvZeaulmXijvKilqcrVQA5p3N1W6dtS+a69+Ju1y367DF1ohABnNg== 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=21aT6O23YPduPm6I8Q8iVZZ6IXPriLde4NJhWlYTQog=; b=Yj002z9lQVU7gxCEYkelELF+ZIc+55SwEDgWmJO+rdNHsGnfP1fb+5LBi8vtOQd9MhtKBv41IktMmLwKsamO5fZLdYPc1H84SGBULIv2WGclfyTUFQAIAa6bDiOQFXUOC7eLUU1wjjXBJ0jxjqlcP8YRKc1BpMzrgb/7KXbp3BpSNYDQzKT/2NvXrmuJyWjfPhBZjtNaBnPeFsSOKFvqiUNmp8XdDjSBRmSAimUENi6W56nl22PwHNbUVn7Up0+NCTYNo2CBCI5ZJhbW0pDmehWImdnwep2TjVPFLmabdbOtqI3r1Lk6jdCxDHvoOrw8MgzRxEvsSM99xO7GSl/+Dw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0104.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:373::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.26; Wed, 14 Feb 2024 14:35:17 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7270.036; Wed, 14 Feb 2024 14:35:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Feb 2024 15:37:07 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [QfTG6N85A8MLB3/lMh8Qh446qIZnh2Zx1IWRPHfQi3s=] X-ClientProxiedBy: ZR2P278CA0040.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:47::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240214143707.840410-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0104:EE_ X-MS-Office365-Filtering-Correlation-Id: cf087589-1271-4445-e8c6-08dc2d6a29c5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JOxpj3DGLK4ihjzGeUXIZ9GgIvJaEWdzR8hmH5NNiaG8+mzwXFl9drikwDj0mkyi/D/u2OirBB5wFIhVf9JlxkhdB0dkEVjG9XisPRripifov4tdFTWxfVvWRZ0UCNSa2Y6Cq20TLevwZzMS7M4Acx+z0IoNhwyUnubr1QFtcSxxDjxgUVsKsQwLJ2J6Jlx5Fsau+4RurBaUgBh9c/mR7/yFInO8ySWMQZA9uMorZ1M3eK77qV/ReNBOXFf4n/mKA3rsjt8So3rP+4lzh/RGYLSJiFdQbjxZZyuZvELgMES9uUCpD7/KV261eTW8DMU2I0JNq+T6+y2eAwnvJHFbuXFtPQNOsVEulDI0K79BgV//hh0I7c9qM5BdoPD/cN/kuITh3UMbtHcoJYAYcRwpVmQKX5p5RDlq1rhVVpeQAk8EFgo431XdOpBA6svFqltKQs44K7qm/HI/SH5rH4dcyMJ5WFCuWmMqo6FepOYdWuWuChlgjDcEasNyYEaBCQeAGpijCPyqjhdf/q9HfgfutQnr7SOaHJ/DO5IbVRQeelSd7yTxsAD8ET8KlCxSXW/BRBdQkffw6B4XdLLezH21Cyuws5QIA8dAS85B568HHMqbmbfOigc/3LpipJChWD3O X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tFpvQTyY4BlGUmONg6LChYUXX44JfQJgBfodrFJ8xV493K4EzL39Ms7l5CJ+BppCwgKkZ3jM9rPJMq5SPMyylZGB8bTHVMcLCZm6meXETUuU0Xpg2Xjb8yZB6hnJpVq/a+Upu0sXbArBDs6MSmH/iPVM1qKc2+22g9uCAcZIPCt5ByrJySQo8ZTC6oUUogM4GyGQHDV2E7Bh5Zt6ARJov4Lti5wiiQIuYP7YgM0CuDO3BV7oz2s+5WkUo46M/usPlkFCRbvLbT4Ql2B3lYE2EXe6AFBifkqmyS7w7a6RKaAWHEkIomU//Kz5USwLO8X7PoslYP7+12YMJUFYf6PH1Fq5jCdO2OjdjZa8lFA8dSorByQfAec8u8AWCQ9VSz99JxANSc9XT+Ebb8Lu5iXalNGsaeJF46htk9EsyYmCOg1MVE1riyjXGDSGYd6JmGbn9DDHFc5d19PQT9gsd09k7WTdePSnrQOQCMp0QlE0KO1ZsCVzzOZy+AFkGQtonkMHiwuTYQm8XWwk5BiQlHXJW0MbayFc/dYZ7qOjXSXGYawWehBvol57C24EVe2PLG3Q7wvUiFd9aKhUlLXjX4jiILG4VlBlPMa9GQpfOixY3d7uZJhyiBNJ2KdGDrd8WhLVHuHX109nSk//22Oio/cLVT/dBZ8kjepJM9z1/i428z0+p6YqLTRIW4xdL0z+jyEIZ6Lj7Ao6Exf0ZSqp+KFVE0DOp7qIIGbwJVxRRXS8sg6TXSub2wMbiVoPalpRmGTuIi2qrIq9APqyKX4L/Uea7YLrXxTzGHlNC634LDOCmyy8PpSOhFx5+F3aOZUiHIiulyau27Y7NdqywyWFd+DqMBOxyxzPUtg/ZMle4TCFGqdkY86oOcRjfp64HMFt89XLuG+8albqqcIaBubQR0TwQvz6eq13o/AYi6gUMAXAQR43ebH8e/VcPcQAYcDlneRPlmRtG9+LN/7twwELqB+oCffHfe4EDmsk/qYBtCuiTTKPjSukWXaWl4ZcaTRzExt5KFiZLSl+5q3bLZnIXux1UgEETblDjFudcJgkszAUnJLsbMhBJULh/zIFr+If76C1cdtYJRoNyWcPEsYlwnrqeIPEQ8tY7VubvSQ5NwF7LjP1UEnDlrlw1OxigffIq5S/2WPGbNJVPyrk5Aa8dhFM2GNp9WUB0XjUa6sPI4VPj5w3F3j8aWLm/inRaTWq4zyJIv7AQ762Bh3CrvvqMHSKbotOzq3PyJte8SbGnMBHJtHhABJGfdGiC2KIkHzTzbBnXTREM7kF07AwxEfbS4sAQw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf087589-1271-4445-e8c6-08dc2d6a29c5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2024 14:35:17.5268 (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: AS8P250MB0104 Subject: [FFmpeg-devel] [PATCH] avfilter/avfilter: Fix build with ASSERT_LEVEL >= 1 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: CUy6msfgCxX8 Broken in 86417b759f789383ab658e2eb90890477a79eedf. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 1ea70578c4..9fe249f3f9 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -1079,7 +1079,7 @@ static int take_samples(FilterLinkInternal *li, unsigned min, unsigned max, /* Note: this function relies on no format changes and must only be called with enough samples. */ - av_assert1(samples_ready(link, link->min_samples)); + av_assert1(samples_ready(li, link->min_samples)); frame0 = frame = ff_framequeue_peek(&li->fifo, 0); if (!li->fifo.samples_skipped && frame->nb_samples >= min && frame->nb_samples <= max) { *rframe = ff_framequeue_take(&li->fifo); @@ -1136,7 +1136,7 @@ static int ff_filter_frame_to_filter(AVFilterLink *link) AVFilterContext *dst = link->dst; int ret; - av_assert1(ff_framequeue_queued_frames(&link->fifo)); + av_assert1(ff_framequeue_queued_frames(&li->fifo)); ret = link->min_samples ? ff_inlink_consume_samples(link, link->min_samples, link->max_samples, &frame) : ff_inlink_consume_frame(link, &frame); @@ -1561,8 +1561,9 @@ FF_ENABLE_DEPRECATION_WARNINGS void ff_inlink_request_frame(AVFilterLink *link) { - av_assert1(!link->status_in); - av_assert1(!link->status_out); + FilterLinkInternal *li = ff_link_internal(link); + av_assert1(!li->status_in); + av_assert1(!li->status_out); link->frame_wanted_out = 1; ff_filter_set_ready(link->src, 100); }