From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id AF633489E7 for ; Sat, 23 Mar 2024 02:06:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 10F3168D576; Sat, 23 Mar 2024 04:06:39 +0200 (EET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2050.outbound.protection.outlook.com [40.92.74.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC8FF68D022 for ; Sat, 23 Mar 2024 04:06:32 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C+qSkEyO13kbnk/KQdCo9YQQNYXQt/d16D7nXenWlO83qndcMUgv+9pFqy58EQbPl5EhdvCwvHJ6DRYN9jzcXbvSKV1kr/lxfNFxHdrh/uSmXOjPeYjO8ptV3v85nP9gINdSQVzigecGweHym0vINzjwDzDdhVeHNDMXnuikS2fD46pJV4/fi0hSeSPReTBxxFaibDOhYqvfx+paHBShWF4bjRKAUvIMeR1PhjK6FiNlRoqIjA+xhnKJtMnVHJSaf3QygswXk2qwx9SNZe0+zoLtukSol6PNe6Ui4lten0JwblZ0QeYUAcbSglrdPjSqqF0T46p5pym9602MlvvcCQ== 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=ZFWh1+0K3VyGRoHrA90OxJmIHNv/e+umKpYVZy5g10M=; b=DltSJEAWqH0+5kWEI1/ImCceK0YP+u4au6phjxbyCIsiA/Hi8kVIJENioo8MI0GIcn5EheCf2C93hvna47tG7VNbtN5AutvxYwgRRYxjxCTaXeOJUOm9+pe/oyY/UaImWCujNDZflopNbXrh+OnL/M5QNd8P2kZ2NtdrzgMJLZ/pp1BJhcL+x3EOFmTJQN6OeMJNStNFIX6LuJ1HCsjz9nO3NTjR4piWM52F51N09dMLAxxjdCtLhPLZHM7p8j8WQ7bTlA52zSAadWTfGn07n1mYck+jeA9CybV/Td0rdlesTjRBSjYhAHxqQCApb2VJzV3cPYXKZWANG8ctyE+Qew== 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=ZFWh1+0K3VyGRoHrA90OxJmIHNv/e+umKpYVZy5g10M=; b=S5vktHa8m4myf2OlYozUgaQbxwDSeoTt+oj9zLMvQP+WQ9/xlrGQrGL3k2LzmumJ0WYR2kxwy9v9xtRcUaeZeglghOKo3SdKwMNaH1LP4woMOTG1qHOKeu5LcXbnpv7vghBer9iO+8Vks4OP6zQms2Q3NG42CZMZddXquRsBETBiqUbOO7BVI23ICW6dPfrCNpSWKSH/gYCf7pmDfGjbWtn/2Gb3RlGr3i18gPTCgbG48RuCDSVOVy6QLyXA2QfBEZjHljoY85mhu+eaAeVYW2jXCqdl2JQcEUZI2uBGRFiZJNLxxvG1325u9nPpDvdPJuhAG+fDq8b1CNxJB4/Qgg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0137.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:320::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.24; Sat, 23 Mar 2024 02:06:31 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7386.025; Sat, 23 Mar 2024 02:06:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Mar 2024 03:06:10 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [xpT3mP7cqjLdTZRGXSgjIyzTj7orVooG2KHbiuv01Hw=] X-ClientProxiedBy: ZR0P278CA0005.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::15) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240323020623.1570961-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0137:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ad7a70e-fb7f-433d-8c65-08dc4adddb7c X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqkjmXb1vlddM5aSa/Epk3AsQxdDK0Q8KgDxAec+s1xKNq01LgLGdiAtq3fImZHq2PN8aQxajwITTJJg/+M5bkvmHOaZlHDP9sBkANS4LAAdN5wzkCAx6pBWHUWFl9Av2P6QTqneW07nAIWgmqmRDwrYZf8n6YZNoMsj64lG5l+3dg4KK1I05Y3WmfiRaLRDa3WJCngsDIH5tXxk+JFZAfBPwB/VtF504ub/6D8AYno1oLZg+rq1nKx5B+CoXayK27MSxKHF6wG1OeFkW/TtgRJVUcY99UnEhh59lMLd3YyphEAILcrK9pFJUw0nf1QN0QbFCTFJzCJcHZr1gYcNGLG/2IFnb0YtQKSrJjd9hDdd4kXiAy54v1S26ldD3QJWl1D6iLKB27oAkzUaFrXNLZfG1VstBXE+EOBsCGXJ6kSQW8yG/ZAjKUHvsM0CNmw0HMqtLm1fs+UsOJ8eUFhq3hzYZSMsiyyYYeS8DcrlffWxImP0OLrWxo6vxBLcbch2/RtsX5gUtJkGi2ymb3FjdNn4KWWA94cWxUfqPH4gNIMmGWExH9cjIBK1eHTbPpSjyXzllNqtadXWg9hI6K/q8+DU/fEIhNdLJjHtP5t2RKov8tucWu9gDFofSNAVNoWfJSsi7eJ9f9YZ9kSGFdo8a4ez4kgY0j4XI3Yks4uYDbs3VsrA/uyZSZGgR1APsT2R/3YRYwV/08I0UPL07dWoemB7beCY3JeBcL947LXBDtgy5YUEoxTWlm+nXMc4FKI4CI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7MGHVBJZmmJZHjpxPrRNeUL5wjc9jD1hkzghGttP/3fYVJ2+thkEV/UufuYPFqKZ+wyoSTI85RNDX95tLlk7yGTstUWmd3tsJjf3PQSpGmdcLUs8+bl1m9u7xp5wpdlIIWU4fGXKYFI704yAiVOOgkWSOxqTFHIBleMXfUOyhI8eYc/U6Six4fEwZ7ad4jEmc4RArrOCrJ9gm3WMowMvCyqI0YhPJTF7obK/FtQuztT58Xx8z4WF7SuqGLWdQkXURiC8u9KkDpWT4Ua0mF4z21Wp1bfhuPZAko6+XRFtZqc3XWgmtC51fanhMvODFzSA+WaN7c2WycYpzBMNnymUCUWL0ek2ZgOI7Jz6xWPOmUOX+uJzjcwpnqFepbeSjW8haBHgLfCWaKIPK20VI5h3RigrpWJnq5d9DjDoHiyxWd8ZSZFGigrEyYsCHq9T9eOPo0xqq0bhTQ2qX2l4HuoEClAKYhNkYT9CUyzc9Ef9+UZuLTiH30oUewL3IwKjIoVIJsdg0nZngcwc9esoaV8ff3kDTnggeLSSDZ7nhYKQLQUr2OvmuPRn8DwRAWoyDRxOKqzH/TM/51fmAiyEqjF77K9SoSxM1h+Usu8T6cq+nQKNRGFl9oRv1OJLMEyPWZyI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bT5rTt2kzFbFElmO4nZKfFFrWQ1eMnaFYzzC5xe38Styjsp80M76xaYYoySl?= =?us-ascii?Q?0pSzsHppRUh4fh72ddRqWvcpRbqZJSB5r2RjjbWBaH5TB7ytKFhraHyq4H92?= =?us-ascii?Q?B5mcmjFwC5jex44GwJvoHZbyg+zNsNNB3XzDKQiJAt6dIHFlE1vpMVSzv+zs?= =?us-ascii?Q?NY1uZkCFai1P2ZK8X9PpY0o+/FUPcB/qpY0bATnYLNtmsTtj0ySeK8OfJNpN?= =?us-ascii?Q?6Zt/T7AcS4DKarEchQ30GIImL5g/4kEGRNWDIFU2LFtH1mVv7gf2q/PaY1vV?= =?us-ascii?Q?hl39DwRoHlRq5fVhvMKr+Nz1XStabiCcditCikXPJ41ZyF80jPSH5Y2lz4g3?= =?us-ascii?Q?wIDc2T520LrK2Cxjf2g4gKKf8QNG0IDlrLX/xkXNMX+tsh/hdxkWyZWsnXnb?= =?us-ascii?Q?BbZPCZvnELFGL12SV+ID22Tsz3P7ouq09mtEQzBMgyuWptfr4FgryYEAw1+A?= =?us-ascii?Q?BA81dxsE4IZyBW6QZBjBcSv+CzTL5pFD8zK0OyMx9biQx2slKSUv1115Xeh2?= =?us-ascii?Q?P+G8KkFkLUOUv7SigpgnUoXWVg6iZmBogVUF2eUsxxWhBvGlru2NmK6uzp3K?= =?us-ascii?Q?i0KsDVbKDZDzEX9BQHOrWvtVmLak0HBIh9QOlc1gZh+sVoiV4/lt2ej13s9v?= =?us-ascii?Q?enBw8NWby/Hg45GC/GFSt+IHQddQxhzu3E+/Wclu3FZwocFQV6rxSVk3dLtT?= =?us-ascii?Q?9KYfoAuslAELg0spB9LiurBU+oJJdC7kHYAjQc4ptDVheXxKIs1DjRJo6VMK?= =?us-ascii?Q?97eMk2z/pGJbZOutCvq4M9H0sVdsv6dwxw35MLNppXQS1IeiPHpF63w21UiN?= =?us-ascii?Q?nPt2G3nZ1F68gd7hwr+MlNDdkVwIfTaWzuZzCD0HLJ/VHsz0XN4LPwpGbzLj?= =?us-ascii?Q?s2ld6Q84xNq14KIuwJb/yc/s/D9gj+hdcW0Cd0fyc8/IIZqkZYZrY9II5VWI?= =?us-ascii?Q?zLuWPggIKIQPHOtxyOxvpY+ioS4CJ5tBk9uagTmBpjZGXjVXFUexl2/395wU?= =?us-ascii?Q?W/pNMwl/SbLRXiqBzNhqx/zqhOQaIb4kPT4xNKiRmjHHeSNzhD+330+0m1tk?= =?us-ascii?Q?aZCP5/iSCJuKVCqRkxtc5ua1GAOqsBcGfxOmTuMKOJcX1RnwZUBgXY+EHUAr?= =?us-ascii?Q?+oAKKvkDT4WWFPBJp7YCaeyhim5s2fvtHZanatKVYTyBBITxGiY6zBZjtUKG?= =?us-ascii?Q?oVAi22+wAHj6OKRptWCSEBq/Zhzf/46rDxKoZlEY7R1155J4KIYgOFT6VbbK?= =?us-ascii?Q?QhgsuTx6Oxs5Ow2kclLN9i+Ry708IoITbEUQkrOqig=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ad7a70e-fb7f-433d-8c65-08dc4adddb7c X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2024 02:06:31.2581 (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: AM8P250MB0137 Subject: [FFmpeg-devel] [PATCH 02/15] avformat/hls: Don't access FFInputFormat.raw_codec_id 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: It is an implementation detail of other input formats whether they use raw_codec_id or not. The HLS demuxer should not rely on this. Signed-off-by: Andreas Rheinhardt --- libavformat/hls.c | 10 ++++++---- libavformat/hls_sample_encryption.c | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index f6b44c2e35..94defa9384 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2100,10 +2100,12 @@ static int hls_read_header(AVFormatContext *s) */ if (seg && seg->key_type == KEY_SAMPLE_AES && pls->is_id3_timestamped && pls->audio_setup_info.codec_id != AV_CODEC_ID_NONE) { - void *iter = NULL; - while ((in_fmt = av_demuxer_iterate(&iter))) - if (ffifmt(in_fmt)->raw_codec_id == pls->audio_setup_info.codec_id) - break; + av_assert1(pls->audio_setup_info.codec_id == AV_CODEC_ID_AAC || + pls->audio_setup_info.codec_id == AV_CODEC_ID_AC3 || + pls->audio_setup_info.codec_id == AV_CODEC_ID_EAC3); + // Keep this list in sync with ff_hls_senc_read_audio_setup_info() + in_fmt = av_find_input_format(pls->audio_setup_info.codec_id == AV_CODEC_ID_AAC ? "aac" : + pls->audio_setup_info.codec_id == AV_CODEC_ID_AC3 ? "ac3" : "eac3"); } else { pls->ctx->probesize = s->probesize > 0 ? s->probesize : 1024 * 4; pls->ctx->max_analyze_duration = s->max_analyze_duration > 0 ? s->max_analyze_duration : 4 * AV_TIME_BASE; diff --git a/libavformat/hls_sample_encryption.c b/libavformat/hls_sample_encryption.c index d5b4c11b66..f412836d4f 100644 --- a/libavformat/hls_sample_encryption.c +++ b/libavformat/hls_sample_encryption.c @@ -64,6 +64,7 @@ void ff_hls_senc_read_audio_setup_info(HLSAudioSetupInfo *info, const uint8_t *b info->codec_tag = AV_RL32(buf); + /* Always keep this list in sync with the one from hls_read_header() */ if (info->codec_tag == MKTAG('z','a','a','c')) info->codec_id = AV_CODEC_ID_AAC; else if (info->codec_tag == MKTAG('z','a','c','3')) -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".