From patchwork Sat Dec 11 18:40:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32293 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3357156iog; Sat, 11 Dec 2021 10:41:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJz/ct4InteTpT29mggvyk7I6OMwPl0kFpytp6aRasfzDwkqfgO8HeKxJE+P85jaQVBw3uvJ X-Received: by 2002:a05:6402:516c:: with SMTP id d12mr48219261ede.391.1639248062344; Sat, 11 Dec 2021 10:41:02 -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 p2si9238307edq.79.2021.12.11.10.41.01; Sat, 11 Dec 2021 10:41:02 -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=PqE4IK7j; 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 C6CD868AF3B; Sat, 11 Dec 2021 20:40:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2035.outbound.protection.outlook.com [40.92.89.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB8C5689BFF for ; Sat, 11 Dec 2021 20:40:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d6y4TsKZRieb5bH6UkQU+DbWaU97Vh7YKwcIlOAi2I0hH/GfHD3DWlckJF2wOnLcE9gFb/E+ibkF/EUb431EfFL3dssaUbqLEI2yIzCFJglVHreHIMHea0rzx5L8iQx+tz8FNftJ8CL/x6am3vxANBS/j+oNRPAEEicmRNeKFAJ5fRz4C8H8djrjrW9GDHQBmjXvxnNpIWx+bp3snKClUMBCE13+Jmh5PuDoqm0EekCV1SeVY/HLMysWQqqXCvV9WsdvLg0AUe1Kd8VmwrKQIJB0tqpoWWd+Jd5+st59OYNwv9FQg4zFgw/58Mj/iq9xnK2ZDRVTgXvAXKKBLSf8dw== 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=+Mzrx1pHd4pHMKWmvtuh0Lz8Zwn7b8ccqZNYpoNj9zQ=; b=hSEiOVmFJyzyxYo2QdERYJXWTTDCktvkx3dEeHyEBriMEJjB3fj2qwUwrsTbF2+WzokcBwL6plNHoLHfa65draRq+5QJpHOWETlRUH6YPTYKUeZbREapHWIYJwrHr4HeDP3yiMho4bUWClSXlNavbhmcbO5LRatG2VBtmnlyj0fL2jaKj2y1HhKVAigeprlXBDAZ7pLnO+qscuYHFhD5cXKrmCkKn0qQq09zEB3beFuIZpqF5vawQq4KC/762uBcLfZB60+JWU5vn8D38yQsD3WLLEMMXOpL6gQlZIq04UCBfR6OtusMId2bUkIsZQOR4pL2lcaOKeUnPWrZ/kfwMw== 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=+Mzrx1pHd4pHMKWmvtuh0Lz8Zwn7b8ccqZNYpoNj9zQ=; b=PqE4IK7jRXMw73neC0lG3E1qQv1ZYdhLJteLakbw+LoLiV4ByAEaWz7kV7XDAXHDCU9E0dcJXIvQe7E5i0bME379S07uTCmI8nYSpCtJx+a1pKrnc7s5jQtRFfgjNE9i0MGr+PSqr4peWiqffA79rWnhsj6T2+8fkN8INUtZWNCcIVhl6l8ZOuV7vu30fwj4vj407JtJfQzzEeXJer7EdP13nl1dtQEZntc0r9kXnrcdeVvweMf9NGjGuZkxX70MqXQPh0pgXAEWrZtR0njnwZbQY4l5nd1bo1g/lgHd3KCH+EOWvGbNYKmFg3oD4TzwC2rTQeR5KoGgQiapktg0fw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6450.eurprd03.prod.outlook.com (2603:10a6:20b:1b2::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.22; Sat, 11 Dec 2021 18:40:40 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.017; Sat, 11 Dec 2021 18:40:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Dec 2021 19:40:17 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [PFpXVWy98igSGjEjLPBwF4v498aeBCyj] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211211184025.1430779-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e494d4d2-148b-4baf-1b61-08d9bcd5bb12 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWxJUMtMcNsrGqEGMDh6H/uT78iMSw3HXMTjUydiD8NjjrNdyQoikqNQjGTrBvOsbZ7qpXU21heClAVgX1E0HdIPnzCvSF4IYCjgavYlAeGnEgJ/HlWBxY3kHr+mcRqvZegcv1gUYmfudCp7EAwoVrYjjj7XMBstsqfs+YfViBYB1OSCpGCA61U7Kmxx29zCDgzofCXmpuD0Age57JsfP7sq5Rt+BO6SA9bziKovl2QSIxhE4urdbitNu9sISFig1ZaVZLdhOWBFlg5urlmAp5Y1YS0535gUg4lfYpp6L908DEJzeG5ihHY8/X5VgGj7a6DIy3izWaf8y9+252FePsP7OLI/iSPyxnsOBhwxXEZvYutVEA+JHfVwtl44Xx8KQ/95kDGqh2cCuQQXouyg5HCIqDSupfSW85HEiPp/LBQKAMH2qb/206aBR+tFAo5QiLoebbhNfs7ENdVGWovxCEwq/sstwFRJK4EEbeeFmz7ddXviVn9nV7lnYP1GOY9qTuD04S7aTS6dy5SskSQSiOhAXL87GwP7pXVM2o4eLPKtwfu0N6uIVHXxRdJwnc0MyHOJ7Mv187hQr1GRmd3eeeX+s2IGJpUe+f9g5n/YF/K6sOmlBXzDPwIiYr1sTTxfov0iNBFRt8MnhXa4A08L4fp9bBLjXFf/xg0zTYpF3vvlnJFiaF7y7f4MH4AnNWst28FjmTfWzBjQZD2g0stnFgB2ISWEasi43w= X-MS-TrafficTypeDiagnostic: AM7PR03MB6450:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 710f/ZfrtvX3O1HTrnEvXVuoS0XJXHWERb7LY5YhjPMLyyeWPbD101nDo1V1fGH4zvra27bL+EzNODQa1liuISKgVVNvHk1V+b5tY5r3pMF+ygcgbLRsWjLGa+ksZzmZBbIXk5WLcRijhZqzaUo9ss/N+WyaFkiP3THyhPV/RQ0nD6mpxWt4le6tN/5IDO6mM/JDv0mI/DcyD1BZLXpQb4gjbuNIhc7Q7FPwkIJiIvoADHNSVVYHLvR46kJe62MoGUd/lpTxJ3kwG1mMHbLzKYJK3TNqL1VwKyhkPGMBLVkiU+Z6WnY9tf75LN0gh7FARA3IEsxLX1++HNk+tSPRDnPvQNCG8Vcv22LuO4VLjpIETjQ9UXmBZEzuH4euC52PYkXNCDJDRHU2Q2tfNm4oQrvvs4p/lf23PB1Sp2ScZofO2D7SlEWbCKMKZlAgbHPuLQorEjiPSoFZAbk1OFi1U5+LGd3WmM/G7K5UUdHcJxe/g7nq9rknJHdFFLUxXf+e1zvghwZhLMFLshGlTdPULqOB11M2mHytIzNxfrHW7prZaU31vM5tkmHAmZvB/jGqMonI3cl4d/qXPHFjY5xcOQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: z6Q812hoUKghjZJgGGncq8YHawZqdYpq7vo8EqyNKyYzYAX8kWSR6ft6B35OZIA0wTLXBiLeVd5eUJ43CK2EUue65CTBBRLxJu+Wo5hgmQqYi1+wIIwbsDY+oJbG31Dg3Hc8jGub9qBUZVaDGfpvAbrN7GgMRKn8Bo2ig+bUGnaCz/vs3UA9tAolg/uWnzNVGfCzSBa5KdvphMzCDTroE8wmguUPZyii6ZeMZxiAgtzD0xQatSHWwxnohIlOXsf4f1GFflcspkAKvw4eBnd6VVKjmt3CHY6WXlCW5x/8Q6qnYSinbZlonLOshyxl841eqfhBPVvBt3JRTtdL5QtL0D3kviehLkAmw+dcbibIoZ3/cf0x81HU3wn9MKsrO9+ar1FXfEPiztXh44lBZHKgQz7m2D3kc3l77hPHxs1PqhBamh2iwpgruWvA3KLJJtRb+6YijoLwwiIFj+BAH52I4ltxdhgViaw2NSKv/ETfLBgAFgH2tLuo86a36buORzE7TKbCbsib++f5TSdTe4Xmoc8TB1rPmOiPAA8B4N9qmh7+J6U9xYmv8qj8pEQYtXTQp1FdXfcop+1cqqgI5nxirD3mVy1a2UlWK9ZGYvNm444yLxS4xFP5wEvwYbwPwIjxCXAFCamLFxuP6v7KJrJzq5KD3vhCVlu6B9tEhAokHtLOgtfDAkWFFzz3jUPtIdJTZ6m4wedLfquhD6h0fRa8xYzhhvZN1/m2Kuj4XMM8ACK+pnngO4PPI0BqE4aAVyCDsJaNHFlHUMquL6al/JM3cMyYqHPn3fo8CB5agD7aTshHBsLYwb+6c47R/vypGSVuNf339dtlUebtDN2m3dtKSVadgIeyWHnaGGgY7w5AlZTFc9nGRpls7i/Q5l4ISxx0MYpWq2JV3Moev2O5sgVE1VpZ8nfeIWLSDpO3IxJA7GjstQmGXL/p9f7S60wqEl112oC9GO5FsYFZIGymm3zbXw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e494d4d2-148b-4baf-1b61-08d9bcd5bb12 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2021 18:40:40.3779 (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: AM7PR03MB6450 Subject: [FFmpeg-devel] [PATCH 04/12] avformat/demux: Remove redundant prevention against infinite loop 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: OV2WAi3nhimD This piece of code has been added as FFmpeg's answer to infinite loops in try_decode_frame() in commit 6072a19b4f311cb172d45e90daad90824e40e4b6. There is no loop around try_decode_frame() any more, so this code can be removed. This code is only triggered in case a) the codec parameter could not be determined, b) the decode delay could not be guessed or c) no packet was ever encountered and the encoder has the AV_CODEC_CAP_CHANNEL_CONF. In these cases the new code will no longer emit a "decoding for stream %d failed" message, which is prima facie false. In case a) an additional "Could not find codec parameters" message is (and will be) emitted. No warning will be emitted any more in case b) (this happens e.g. with some h264-conformance FATE-files). Signed-off-by: Andreas Rheinhardt --- libavformat/demux.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index 87dbd53a0f..3f35b3860e 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -2054,9 +2054,6 @@ static int try_decode_frame(AVFormatContext *s, AVStream *st, } } - if (!pkt.data && !got_picture) - ret = -1; - fail: if (do_skip_frame) { avctx->skip_frame = skip_frame;