From patchwork Fri Mar 1 21:11:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46689 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp1530599pzb; Fri, 1 Mar 2024 13:09:26 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUJ8eRkd6qqM3DlXf8bW70DzaNPxv36qq7E5BPMHcjM3GnZrfJLS+6pEoqFWes9HLX0cJEADTdk86Eo6OgnjjIhWVRMLd9JVnfQQQ== X-Google-Smtp-Source: AGHT+IFtLga/rkaIUslSHeDjliz7mTs/aVm8tLilA8x2ApnRzw2aRVps5sb2KJi01c1225oL7W62 X-Received: by 2002:a05:6512:24a:b0:513:42e:ddf0 with SMTP id b10-20020a056512024a00b00513042eddf0mr2132289lfo.36.1709327366273; Fri, 01 Mar 2024 13:09:26 -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 b14-20020a056402084e00b005665f21291csi1846202edz.71.2024.03.01.13.09.25; Fri, 01 Mar 2024 13:09:26 -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=Xi7wuaTJ; 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 6969C68D2BA; Fri, 1 Mar 2024 23:09:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2101.outbound.protection.outlook.com [40.92.73.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4BDD468D125 for ; Fri, 1 Mar 2024 23:09:15 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mhWUzZD4CcRa3vGM4rGixvkDJ0/NqS/zhfvbaxg2NB8KxLxxJlAYQbkQQaxQ0NNyvfsgcQV/7xZRerzIC0dnIAxTbsNGSnlCHpu1UfacfT5M1Te8Kfn/sOZcfd34zbcu+qdJuEABqArjgyjVyz5pEaMAmKC6SIc0z3l3DZeBxw/eg9rLBmPhDk5TY6zBXumjZdatlzyTtVQ/klYXzDU1uVy2Ao1xwJneIfJ7UCI/MnigYhxpFONXNG0ZNWdjG4ESz4mQEzAJ4v3ePZ8yvz8TB2HvNNpIVsYSPGzpnQIaoiHErGhAUeIVox44BrhC15CWTi2797kaEEh0jrIo8mDH1Q== 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=ZUWWoy3NOn8g9wbokz58F11QPZh9fIgsNwF0dnt+oro=; b=hdVKTT1Pu8z7wun+TfFSQNJrQRugBHYS1Ka/ONooiLfrBoP2+4LySjHbP0Pu4w1Mc1zLker51CfYxlel7K+E4B9Yh1fEXu2h50QMw3Kwi3LmXp+x6UJavlr06y6l1A52zAMjndpRYPJrwmr3DCqhRgRZpHSTkOs2NxWrDPE+q6kw2bWOJgRGqUjpxOUhEgR+2fDMKwKXDSU8/1ogeledCw+Eq9b8qGiqPJkWTQILbMk/OP5rxRH9B/zRKo/UlVkLNYOsUVcDVZ4XDye7OHJ0vC0alXNhn682CSyCy7mHzlCh7Z6O6FeBx6HY7I+xGsacZTxTqzUr3hIxTqV5MWaJvg== 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=ZUWWoy3NOn8g9wbokz58F11QPZh9fIgsNwF0dnt+oro=; b=Xi7wuaTJ+bKrqUDHLpMJAgOcEXvMY7tnjpg5MMQmggzGKxtNcfuJ11tNofF0kEw1v2ovWCEi8wnI0UpnH0SFZACElwAeM0MXVqKqbksHZvr6dE4jCZ/MX2Y4DmvMSeCjczYw3wBlGqTcwenBzLMkZRpccWFM2m/foXUyHO9L9al50+pouG3/bUn83fNTAVwYsc7evpgKPL5JGhymhMkQH2O7JhngkWnSZhaIM/D5VAel6zMuErHAeNGYsWqC23G9THLyU8aQpuoDniQ1OSxE5SWl/YKj8nSdoBrTjr8e5tOof5BOurUgz7hE1RavjnQ7jAFDXrtkDc345ppYn+jhMA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0179.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.41; Fri, 1 Mar 2024 21:09:13 +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.7316.023; Fri, 1 Mar 2024 21:09:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Mar 2024 22:11:04 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [8xlxxBWKg/W932LSGbrv/qWTIB5HyHgsRd2ul0ORbjA=] X-ClientProxiedBy: FR2P281CA0083.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9b::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240301211104.3748947-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0179:EE_ X-MS-Office365-Filtering-Correlation-Id: 0031509d-9301-476b-e807-08dc3a33d859 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aSOx4lE/Jy+uQehCHKN0QjBAtgK/wgnEnrIuUWtE8ForDzcMpRsET7NovnWHG9pGFcQ5YqGWFXZwHqenqiakvm+T3zId2aFk9oB+IbgD+JuYn6fF9y8umlvGehRg/GgshmbntQgA/mnFVkfKhM1p59vMerlUukyuW3T6vq75/0FXiQrCYxTZAsI7tpFSDK53wcz2651PB5voXSXPejQpOPw59DuzHVUdZsrqYZjt68vIKSuHvGjCBRMpLL9rlWAiR967W6HcJJh4dD+LY8uAQ7wC8JKmhOYLaVffFJjxEJxi+ARsHjotuLbAH/k9DD+axGGWwcXq0SVnGlYmuRB4p+fSMFdaeFPfQgN5z8W9Ej+j3TrsmqwrYVAYOjw8WLnCZiOR7Sf1MulnLCrpc18Eo5LMQWaBIT01iO+jRrSfur7BVsRqiebXPY20rIevlMs2q4GQL8gH2+bAh+P/833CFkW47LciEI4uBGmyLe1wkhmtMzEiAZYJYRSOqt2vficeIMNooOMZQJOeiaN9WZKfoAS2gedoqWhq/qTg4X1j2v9Rn01nJoZCMS6BIpyVnuYqKwszwuWJ/1ybs3WKQDJaqudvmFEQc89f+5m5wCD19/ELmJ3qhts2hRUUdh9Ko8xM X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ymjeXh90z7Br5ojp3nsr7O1xOt8zKRlRCKtn3Qlt/xywrtvBh/Ib5pHl8ZK2AXarji0gEvFdAmryEWXN61qng3CInKObU/DZXIC1vo5t85ClCnfrTQnxg9+QT7oOKtw/QX4apr4QSLkh0MTR98RgbToUpSXr3bsZrZo0b0XXoerggBe+M+BH/yO+GHWnvZyxjIdSVwF/RTUkPaemqRY+3F20kooapHthf44DyG/q2Mo1dsez4ymOgHid97YeZj7sKUETgOLBI9bEuPFHG0Q4vvgEkZ1pXq/P8gyKoJLhohjzkj7jdJMwdgy0WWRjb5do4ev7dkAA91C7dJ/AmmPtVsYP0K4irNtVcR5cvGHyu09ZwnfLrx3cI9NxVYtCF8i7m39B3jLW6XdYfCoG4CvhlOlbXmKk7KHicr/gOXt5Ckfifmk+kcgZgAvczt6Ae/M1khYIIcV3+rDTJuZKfdX1b0/o8Psfp/3KDZ0KXW8psdUjswCAIH9z0CYKuqUcNaI0B7uidLtN7UdVerKIWRmpLNRtSlo93ndiW1r3zpym6w2Nb4/E+vx42qabkVifa5ITbfsDmtwZN8ZqRiX8qmWzKsVDABjNUoGT0PySaBk7SNILqT62tS4XngQc6AG03n/r/7vVJ+YLV08b1qmtytuj/nRTiwJ0f+zsPDpXBlKygMyCJW8j/EK8SKMvzSC0Pe/xgyHm+Vi1BofKCpC4NtXpfJMtQCtec/ZuJOYAceJU6CJHU1i7bBCUlz2psQQEbRgbfz1DATak0S6RLCYThgnjAlirQQeh/e6xT7SdDcP2fmE/VShqs2BgiEJ3j/c9SEHn4JEphUzKIgLla2c+XC/zdYwgfPtKTdQDyqh+y6ugG4NbekIFC0XqhUUh3U8e7zIFGmaRw98YexuF0iPzTj2zEYaLCt6hxGMj5z0CLAiAg2n+c2LoCNscGFyqwaQAvqF2ebOq9VuFD12ybCBbaM5T7A7caTOUIERUszBopLZWhrO1MYawG4GG82zcY8PKzsBdB5F+Imnv+vl2ZQsaMdqK0JpQqj7mFRB2BT90DzKt5WAGzEdCglNHlt+XDvfGXw5sF8ddmOOdae7ErjUSLVYe/UexIrybSuBX8wGdKjYiDAM+0fy1rv9xuNbHpvM7zos1jfZ6zkMTMxIlQni3PQhkdQLZ0/nhBFPmOTmXsqZLKQWGykhUJr/Lr0A42/hjtjZusw9piMzB06jEymeb5xZMKlX+OLeAOUmEJACYXey4c0uioDT4mDBTwIr7/SdVxEBW1lAPWC3gyFTSO4YqQDPoIg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0031509d-9301-476b-e807-08dc3a33d859 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2024 21:09:12.9224 (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: PR3P250MB0179 Subject: [FFmpeg-devel] [PATCH] avformat/mpegts: Restrict skipping Metadata AU cells to metadata streams 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: XH/ZhXP7GBW8 Only metadata streams (stream type 0x15) are packed in Metadata AU cells, so it should only be stripped from them and not from all KLV streams. Fixes ticket #10828, a regression since 468615f2045da325e0f73e8e668d49cf456ccb37. Signed-off-by: Andreas Rheinhardt --- I really don't know mpegts; the above information is based around reading ITU-T H.222.0 for about half an hour. libavformat/mpegts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 836d5dd5a3..7c40e52262 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1307,7 +1307,8 @@ skip: p += sl_header_bytes; buf_size -= sl_header_bytes; } - if (pes->st->codecpar->codec_id == AV_CODEC_ID_SMPTE_KLV && buf_size >= 5) { + if (pes->st->codecpar->codec_id == AV_CODEC_ID_SMPTE_KLV && + pes->stream_type == 0x15 && buf_size >= 5) { /* skip metadata access unit header */ pes->pes_header_size += 5; p += 5;