From patchwork Sun Aug 28 21:19:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37525 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1584554pzh; Sun, 28 Aug 2022 14:20:41 -0700 (PDT) X-Google-Smtp-Source: AA6agR7ZrGk0UIFF2dRIPpBqqtQ6aoTsx1eFcn2b0vk1K+7KPiJyuleYotbx5mIyRjstOSDZWB0B X-Received: by 2002:a17:907:3d8e:b0:741:8ebe:3464 with SMTP id he14-20020a1709073d8e00b007418ebe3464mr1468728ejc.747.1661721641581; Sun, 28 Aug 2022 14:20:41 -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 ga5-20020a1709070c0500b00722ebccb11asi6279411ejc.101.2022.08.28.14.20.41; Sun, 28 Aug 2022 14:20:41 -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=lYhw7vpd; 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 2FB8068B76F; Mon, 29 Aug 2022 00:20:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2094.outbound.protection.outlook.com [40.92.91.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BB7068B76F for ; Mon, 29 Aug 2022 00:20:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D6x7rTITGB7doICzGnR7tLbyB9/8NoAg+d2PaEfOPDEft+r61AgsnGkPJtdBNPcgrGP0yeQJIqgu7x8/1jtQz4Yjd3ZYVjfCZdoTLuL/CPXZIRvJHaZHG4oZ/VSfqw8XqI3T6j8SXAhjevRt5+aPe8GXyhA+5xfcXPBZF+SfCJB4fNWwykW7rI5grYAidfAVm10XWQcm3/sd91XmHboG69rdZr8WpJwlHngKuCdjyxNxu9NzSLmquPzTsb8t5G6xwPWtEJRpRX7FJd5VhojWIDQegAZzCRe4aJcW92l2MrWr9zKT79FuGVsDNHWYupiMiOtDZ4vh8y1MOw3cmuGNhg== 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=WnqzJfK4t7SY0EkZXrXbPPwkIj98vRV21YR5cs0tASw=; b=LX0dg8LcZuefjpRU8PV5XVBJ1iL6bwMZVaT4oqWgm7mlAkwVwDAYwkNXHNzaFnmoOIFUnCJS7x6pXnHIYk0zGnRzeJJWIIulSHhPqIFps3Ef0d49dd2qEE8cT73Txc24Hjq9/emc/Cr6QWBnjxUQTtfPcsoew+QKR84lsGtXzqvuuaAN2JBsMz/9T69ctNtE06BE6b9x64vls/7J9RtCyTOfxatE8wDpciVyfITGM0T3dS6SAIlmGcd/HTmC/SKmHqjLpUcJ1/m9kwGxHL1amuxmCyhFmoS3n1U+14OXbeAwE1IkvpNmK+lhY+2XSL4npuT2bRMDLYnWi8MDM6SJmQ== 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=WnqzJfK4t7SY0EkZXrXbPPwkIj98vRV21YR5cs0tASw=; b=lYhw7vpdFUk1GUEYMxX9fGgvWhXaVLeYrK245YG0daMy1A+jh0wJTqDDeqB0tjdQJXZ9TIYR2r+mUWcBNbNo5SUr7TLntiXUBtLSQa6VapflqjPCWVuJaarQtdWxS4LTlaxcRWu4TvQ+STmV1p1BTrVyX2w1Fl/F8PkgdbwLyC0fG1RacmKuMRqPHKflzi0rZP4atbVEAShDNA9Uh8UPiZUnzY6m8v6jHLexRRUt1UJncq4hTiPr+zyOedWjTXvUuJrJcovuoAHZOoYfQ82JaqSdax/fZn/ZL8s99Gj7Q4tJtVuCBSqUiylI8mapbOIEYRAiIOiqRJedFEKlbiCwcw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Sun, 28 Aug 2022 21:20:08 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::7d2a:d9d8:f384:4cee]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::7d2a:d9d8:f384:4cee%9]) with mapi id 15.20.5566.021; Sun, 28 Aug 2022 21:20:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Aug 2022 23:19:50 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [sg+6d/sPNz0go2JLiHfZyrZav340o/YM] X-ClientProxiedBy: AS9PR06CA0114.eurprd06.prod.outlook.com (2603:10a6:20b:465::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220828211957.472263-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4300bf27-3a41-4248-0d37-08da893b1597 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrlP0uwnDwxs8RZ0OmP5JOd1VpVWJCCTZx+yScTq0NhKo99ES86Tij97Kvg13KdedbvB/6DaZhwcjAfMwPKCXbtArhbfaxn/U4SuTHF+aVxBxcBSzzm7WDR3XtvTzyigdO6DsLphP8614370F0rLIlEIo47kI4hkAmXuyAk4DRqW3EWVzWOPYUWo1iN38+nik+5LsmMmk5yDWZZVOuegk2HLPTCDU+2IyCyIJmThlOFRgcrTufLVI/InojZW51z+5hKAR3FeOL8KJBxV9YPSaPL3WVjUNZNaPPuMqKY4pBqMWQinWrVcfJWw8XixKT9FqWMg4qTk1/9OrAGgx6huAxOwKA+Yh7iicmwHk9DrQ5I9dfbO6etUfiWkNMQNeWUxK5vW+KsMEcTfQVHvgHkLl/8Up/2HYNPBtWghQKIQr2CaFAPczlIJmx24/RxICQtKe8K5zi3Z918HlpRY+hu+i8ugQfb5n5s3Hq+cqC8GwE4D4GWrDocjMNk+/y15KDjWT5ZG2Rijvnw6PA5FD8iPro16Z9UY3DRGJrBUj21nVpJToGvAjOObtqXLd1PwXkVAVjVr3gWsNH4snUJFE4Z4uY4HSlbS7SiL1Ov9+RMwOL5mtnojC17A7dhlbUipUfEO7B13wZFjcbhMACGzTN591VpQCSVVTnpniFDNBdcVN+uVCOW4y1V+0b2QQQ6ipkRDlRMxfCVFb7vocp8BN3KyP6RzeIv3qFcspnbl49YnYkEsT8BYRKALtjiL98XfQvN4So= X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EKLAAd81xJwjqJAw28qo/kOkugyx8AhhxGHq4KpYzQDLlMgXMl57HaUaS7IOkOjMF6wM2RXs1Nq0lzK27SHrIXq4fWZieFqgLynysoPRPkcOreWpOmzE2npRFK/08Ln+Zf8ghxSM3DCrdfIBpKBdIH95lRFWxgU4sd+m1cDi0AWL/ciCiZoPVFJJ0TOXeq24ZOayak5CmWYOtnyiWMTeXBpFUeDPyX9vF90kwZLGqez32pTdV/gur6sBmh5753s5ZLPoD88A9/X8oQVjZsgA+syD3VBYoJxb7fF2TxVSejG6OuoMYx7irimtmIu+niHnOPm3wXWRSaq99x5Yda9chfXs78hVv5Pq7b/8cKnLdQf29Y228RJF4yMuV4+ZBHTnTdAK8UmHO4W2xgSL9gR+4Z1uwjvYMM28U2Rv2mlYVfm51YygNDApeyv+W6EnipuS1wtA0kV5vTG9AOVCCmcyTb/VWFkNf/3ErpWdsrVyCESLT/Oqxs5xwKeF7K00vrNYFIFMbO4DvthPAo5jFvu+ntXLrmUTjOtxts8TfYqQ8ai7PXfkWvXGsWfloDVC4qF7aGKjHUkfDUMwFk709JqEgLkqj31CSMH/+QaWFL+V5LsBbUGJr0KdmGmwnCuav6i0CPHkkLzQUXKkmtzLxFnYKQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nFCbHSTBi16F9wrW/wJsc2mb2ok3q0BcyreG3nMKDPoaF0EBM7TDqb7t4y0G0b91ChGt2hdfJ6dbw0k6WkK+n5QhVVY+ijYfkDs23ZrIFGdV3BqZ19Igs3GqERKTqmogdaUT4bt4vlmXJR+m0dyl3ZuCa+QyPLxRpq5guZ+UIYcbYzEnvluZpWxuZVVLvsSDaoEIYuyF5x1Fpc9LRojhiD8BwXQK0laHdsN+RwWEHmlHV0Ga8Gtm1uyJKzAwgEIfTaiq4ih6vmR5tcwCevt8IDOlhRHs3dZE2EDo+ZGFfBBA1N9FGYgg0NCgsfxFkOqenw1w5WYDYEKB6/sbmaWVM2g/sOuZDR3cN9qX9idwLiFEhTpgGQ/4o6HQTyTqQ26EVliVZgy7gXo/8AbaSfDGlZkxgD1CC1I0RNFk3eXQHlVmoRhhBKwxZW/h4/aYEg5ezZadxGxFtwtrtlK3TrMNgJ3EcQE6I8kndoBZ8+60ocVr0bU8z2egNNz++aZ3rUxMB3WHkLPRuI+OmPdDna8dbhzcztNDsvXOC2W9BIu6zfmOYTNpH4L+u3PxeZH8ypTCBhR5ICg2z29biLc4nnAy+5O9+0ayWLiSoUlFWorvOBL8eX14VtgFvf3vapfIJx9LcQf5ovlzKpiKitBtDU1ZgwM6doeAi0VZgESrBYoiZFglk5Wq7Zg8rBjgSeKewOzu8XzCrZra+loWjUACXj1BYDqVnfkKUxZH1iVV07kDkV7Z1OxIMffduf8DdNNxs8IjfD9ZWuzj1kuiYSRwAgHkRpoKuqa5iVQCTJkhQ6Uuw4Z4NzzcGT/CQCC084RRnEGVhDH4ZpUzYmJOVVEIzbCjYiTok8QIBu0l6A0Ng7yieBI+DfaFLcqpeXOE8X9Jei3ohRUBUwJalTVfgiA3T60TCDxTkiVd/dKplFFoEgdq0WKLQl0teP45L0E85sE8mS8nKzpHRXaPQQeasOD0PBy1d8T4oXADFxz6Q07808af8jT74Gms56M6JZuxZr8I4vhE+Sn1qTnxp36finaqgKlxf0imwgS2l5qhY8cYHd/NUZQQ9hX3JBHF81L7o2UrDFgMqBkkwRYF+XsAz20WIJ8atUh+jjE11sFFC5wkjvX5INpUM0eI4Pe6yXvOknL6MtY2JbNLboc2Joh637sXjenWb53OH6fLv3jdw6hXec5wAdWg0ywlYIGfr8CEOG9VTS5UX4UkYp0hyIj0YifjnCkCbQOi/cRkxSKfg/qml4d1AA9itwg2hKlYoHKdyrO4NZHATg524IkFcj+FS17gMp498xBL14hTz+lPD1555OBQcqk= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4300bf27-3a41-4248-0d37-08da893b1597 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2022 21:20:08.6674 (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: DU0P250MB0747 Subject: [FFmpeg-devel] [PATCH 04/11] avcodec/flacdec: Don't infer max_framesize unnecessarily 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: V5wAN+93shc0 This field is not really used by the decoder at all: It is only output in some debug log message, but this debug log message should better use the value read from the streaminfo instead of a second-guessed value from the decoder. Signed-off-by: Andreas Rheinhardt --- libavcodec/flacdec.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index d03369eb6d..3b16426e73 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -565,12 +565,6 @@ static int flac_decode_frame(AVCodecContext *avctx, AVFrame *frame, *got_frame_ptr = 0; - if (s->stream_info.max_framesize == 0) { - s->stream_info.max_framesize = - ff_flac_get_max_frame_size(s->stream_info.max_blocksize ? s->stream_info.max_blocksize : FLAC_MAX_BLOCKSIZE, - FLAC_MAX_CHANNELS, 32); - } - if (buf_size > 5 && !memcmp(buf, "\177FLAC", 5)) { av_log(s->avctx, AV_LOG_DEBUG, "skipping flac header packet 1\n"); return buf_size;