From patchwork Fri Feb 11 11:20:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34228 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp3109574nkb; Fri, 11 Feb 2022 03:20:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJyDBLJVd3ouzNc1g9VI699OZhi7COv2fPjCY5brUyLyED97dtGW1LVsd7+Z1m2Nf/+Jc2CC X-Received: by 2002:a17:907:16a8:: with SMTP id hc40mr916504ejc.739.1644578417258; Fri, 11 Feb 2022 03:20:17 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p15si449607edc.101.2022.02.11.03.20.16; Fri, 11 Feb 2022 03:20:17 -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=UpE4gEcu; 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 C22F468B20B; Fri, 11 Feb 2022 13:20:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075059.outbound.protection.outlook.com [40.92.75.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D19C68B15F for ; Fri, 11 Feb 2022 13:20:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eetVOcH3kBJ/BRUR9UIhVMQdJCFRtk6oM5kWc6kpPZBKHW+2ZfKWg4Hzip8Rgf0X+RItWf8BOXB+PnWkgZ/6iRoHZ/vPKcsxF5DLvE6Lvp95NHEPJcTpA4RoWiApJ9WrAnJ1jcXq7+bA54f2T5sV4QDvqrRU05nlmoab+xXtCb0IymI67zWFoZ6FxL63MhIJCreRZKHevJsq+Tf4DUTYY0ks+QmuRaMkUz9UT9IWWGvIk2a/eWPCXiPVm301ebDCN3D5s1tEf1iyXal7rNUWc1eokXCtMsfPgzOuitLwuoHKIY33JoEVe/qVAC1lI/BIbB5ckZwxOj5vVqpnTgzurw== 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=/cDOS54thPJ7lQcdr21x1w+8Es4mOMrc0FrzTF0yiCM=; b=ZX1S1oBZHUk81sek0EqbSVcssGsjbed+wHN2pUL9UUhEimvhWNitn0O/K3Ms/dBFbc994MjbeUgMN0g3elvuav3PUHEen1YMdJkjZnnpJrU8e/i2ZjUs4RRo7ipXoXl0UyLzSU6nxWJ0WtZexPYPbg6iXc7q04DEVx/ISq7Kh2o8en3uCwHC8HGhWo/hdum6VLvmYYkdd1EH2FcumWAIAaw56kF577OzYV5w86Tog4syJQITgHx8YhKaVkKtMZ2WS/4+gJLUauGSmt3/6GYSK/SClkOgD5d34ulCGMP+qCZZPhpI9KFvkkHQ8rzYB8PCCZZLEDHLNX1w+pm/fmGK7w== 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=/cDOS54thPJ7lQcdr21x1w+8Es4mOMrc0FrzTF0yiCM=; b=UpE4gEcusrStgIJFWJGgNWIB9Zh1ZHojXFQeuV4sv4CJtxq13NdOGsvuGDs6oPrOgKbHa1MLwcryHiaIWl1IeJiXK6JXuZLGTn5rJ9H/AONo+aSNsODr5vmCXKuj30sSvAfiV2fwZErfxWnInNslc5lrPGb3X6FdLI5bpv7C5crLgKa3va0MILle9alT+Nbs/q22M5dh/uTgkHBRcXny1CdQ6ffWdU2gYFCHelYKvokVb00uc4Kg2LyiyXF0+TCgNCqBVW4YaaxgHYCh8O3w0xo2ezN7yRFoYk9iHK6ZbrV/IrdlT2ye1QWLG4FzIYFpehlUWd0jSv9nT8NTGNhDLA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5494.eurprd03.prod.outlook.com (2603:10a6:20b:da::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Fri, 11 Feb 2022 11:20:07 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.011; Fri, 11 Feb 2022 11:20:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Feb 2022 12:20:00 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [LgUeDnnzB5TkM9NB2QzEWlD6NQmQiJBh] X-ClientProxiedBy: AS9PR06CA0047.eurprd06.prod.outlook.com (2603:10a6:20b:463::9) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220211112000.1690868-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4f2996d2-ae91-4c3e-99f9-08d9ed50754e X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUp0/JksszMwSTsxktk2qQRT6p9m7/3NEw7YlWVGuRgZ+tMxM2qG81RtXwqx+07K/idA4UklkCj8jOLSZE431hV2rFOXRAtVJVF5vjEEkXeUB2xnmu3vJ9v8MvNFqKeygUCO8+aor+P1yoQg5RtUgyZZXqIesx4swLqfLXZL8PRYlHJYYwNZHhgaddsvm9FuHmV82EcaN1wtx++rkDUX2tROU1GScnE2IAg6h7yEcvlTaqKwxej7wnnePzDxkDaiWg1QoKLnW8a8oy03v0NC9voFm769eqCGCyTLW2Ofw3gT+UIZjpvdVPSX9hZ+T4MDZ2K5FlGS1mBpgtgBWDSO5oax3eiMlvXS5lJSLhZzchmzU/L+/p8eOB2KhTIKojE2iCiBzbZTs6z8xkCnitnDb18PKyOc201Ml3sx4SFqc04CtWtUWWkq6Kj/bwc45Vsd1oJV0yldrAQsVVEpi5uV8qbA0Ig1a7+pmsYhMpBZS253ak6fvecwmS4TaB4dhQVbGvhEKk8I7cKzVlFiFI5MNjsXXdJFno1xO93mrsRb8vzAtyUlE98TwOnURUXxlPmXR/Wi+x3ply8CVz+bGXgfMjI+ygc7e1kNOJiX87P/Xy0DmLC2NDWB2u0jCwe1ClInyAepCoK7QYgWhu3B32y49QYmJGRxyAY2f/1BXT5vsVNiYAkiI3zfJ0QhpNvOID5XbnQIOdbbzZcQZY0a3bOBxsuy6spp1eTnxc= X-MS-TrafficTypeDiagnostic: AM6PR03MB5494:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /R2EqYfsV3xdpU2wXTQ7W4vOsh1REk0Qf0bzvi03bWvF1VSrlCvZRA9oYZv/HsVfcyYnsB24ix19kYv/clOV2PnY72SfIgCuauwybY9NNJT4d67PMJ4TH2lCvEajGYFEdnUdI34PCr8/RzlkW6rPVNmCD+d4k7KE+5rDTGlRYzaar8IZ6RJoqXasRJg6dIpcts4G++L33AAkx1ZRSEHIF7gnqfCb/HQhG/q3TK9zt7tfbOYFvs6kTvCPQQ2Ktetrbf5g8YOW91ahddVAWkhpcdM9MMY2vhp5cccwtnBNleEYT4+lb/21hEw44pPNKkKtLO8vLaTdNsLrmo8lbplsapfx7Wo98Tuf7JJ56OU8NOs+qf1EVenGVrnl5565lhvVbD7G1sAoEkFBoTrQchx36qcP0Y9LGsJe0/b3Tm8zu7aA0KJsqg+7gOiqVTzgCpe/cNoBk3Hj95u/i4KUlYnCMZMUer++TnONtSOtKCiY040kjc+UvKn9XCsGow+8kp2E5bcCSzgaP4yG8Lbg4mFidrChcyxLaY4sawE1xPJxoNZ7xc65JVFR8sI1W7hwvMZyZQTSqFLIa/cR9aKbcbBBdA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VITmjKzJlQMVHlZ8ptQfa8Jtz2da5kZkRyikMbyze9J7yMi7byUjLkT+LXyTzG33OnUQ8H/9z2HssbLttGVB4EHXWj6JLee3OA/q9J3WBWJLsMAkgMJ/69EEMN/XuVRo8hMyivEnqDgarfBJ+JGmYlNs+mMaPyV3CrIDo82PDTgGtnItpw74lV3eFPQbByLh4s57A0HdB2OXgljN2CAfNQQg6wZAMfCINjyvnfSZP/Lziia38OOfIxxESWyZLlwaFEi8tCy7ywKCzasxJqomGP4HcvybgbRTJcuo0aJyHiyoZuCKN1XOC7gK4VMUIxp2YuadnJRU/w2JPwvN9+XGiRsRELTZ3TbNY3Az+9DFsMg/SAUnMlvMItmCl/hcCU01HJLmkogLACn9ojiG8ApsOnmQFBa6JDUy6RE0tHGHQ1Ek9Jxtc0KD/5DS4Th9XrEnsLrjCfwlWY53skyUJneJQ/qJhCG3jGFDG/jXcV0nuAa/YHQufEDNYrHn5aRk7q2IAIuA4jbnKOG+BL8igw7/FoL5zYq1W9mPwSxEWtiYeYqMg8xSoUMMlUGV0Wb3n1NG8bfKczXk/Hv8D76DNo0e0QXS6/1PQuMfGzbZgf3FgNx2QOTTBtQ60rRioh4YnwZSCiB0IZ7MbAd4tru2Kxj66usiy9AjU+P6N0KVbBQ/Lvwi8dbNaNUt8OWojx6GQM+r1UWXQ2RIIBw2V/sT58EVYqcsagzmrtQRIVSFcMeFPGV3HG2N0VD8+78JCD8FDOREGDUwhkISub04+aiDIMqhV3cH0ombP9SGEYi7xPXUFACrxRuvJbLWuBblXtMyzFrA8uXprf4KE/lJM4uQ5QUi9x0oHF++ShffCGFlitqpv/Fe3FFe6hDyFu7YO1s6AV0e+WyEHibEGCJUHKLeXpk+ihEmQggvXdVk5HFeqQ8pJ0SFk99n6XhldFkde1mkUUyZ1WVG/5jaBoIErCEUfOujyw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f2996d2-ae91-4c3e-99f9-08d9ed50754e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 11:20:07.2762 (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: AM6PR03MB5494 Subject: [FFmpeg-devel] [PATCH] avcodec/pthread_frame: Remove nonsense error message 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: Xdnuqlgjg/MI If a frame-threaded decoder with inter-frame dependencies returns an error when decoding a frame and the returned frame isn't clean, an error message is emitted claiming that this is a bug. This seems to be based upon the thinking that in this case a ThreadFrame has not been properly unreferenced. Yet this is wrong, as decoders with inter-frame dependencies don't use the frame for output for synchronization and therefore don't use ThreadFrames at all for this. So unreferencing this frame generically is fine and not a bug. Signed-off-by: Andreas Rheinhardt --- I hope my guess of the rationale for this message was correct; apologies if not. libavcodec/pthread_frame.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 27ed0b2cc4..33b5a2e628 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -219,12 +219,8 @@ FF_ENABLE_DEPRECATION_WARNINGS p->got_frame = 0; p->result = codec->decode(avctx, p->frame, &p->got_frame, p->avpkt); - if ((p->result < 0 || !p->got_frame) && p->frame->buf[0]) { - if (avctx->codec->caps_internal & FF_CODEC_CAP_ALLOCATE_PROGRESS) - av_log(avctx, AV_LOG_ERROR, "A frame threaded decoder did not " - "free the frame on failure. This is a bug, please report it.\n"); + if ((p->result < 0 || !p->got_frame) && p->frame->buf[0]) ff_thread_release_buffer(avctx, p->frame); - } if (atomic_load(&p->state) == STATE_SETTING_UP) ff_thread_finish_setup(avctx);