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 9420D4507E for ; Fri, 3 Feb 2023 15:23:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CBDBB68BD9A; Fri, 3 Feb 2023 17:23:15 +0200 (EET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (unknown [40.92.91.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 342EE68BB84 for ; Fri, 3 Feb 2023 17:23:09 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dzFUkv3THtvJQOpUX3gJiRJfiFDi3geY1dekSxqUQVvgdq2ItmLWDOp69/uphE2XsCFLPvv3nZM7x55h145L2Cc4BK8kndAXSIj1cc16Stws62GbVuGg5Ogh9/dq+WdpPyr4CYt6R4Ki4XNdNo7WZMEGeGfSZe0/G8gAPGfdqVFjbrmALShKj5lSt9JaNupDOad1qab5XQGeQVgVnkjQiOKmqTnQ3G3NstLLp0tJIkbC+3ocGZzNwvf4NKC2+nGws5Tjw2fyey8k45vljeLJe7hRcqyFD2lAa2YXkjhhzlbOmgYgHN9a3LL2Z0bNinbeweJlMm2xQ1IbtUqZ4HL2ww== 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=7N4aggZMyL+DHYkdcUNTH+Z8OFBufjI/5GvnL6pileI=; b=ZRKe07n4NCaqju1xk57NaR7odg2v47Xm/Cyby8WMJSfkSgSSnj9rK9lu/EaTfI5f0axI69DCkwYUdonh8lq11U4M9eBdd8eiUgg5kHFgklMC3YQt7PWi4OVpAbbs0q0iboHUyQedcJxkkum8ctj+ZTGcaWz0r3gyP43dKjJaBfl2cDnRlybYjbqLdazmXCbGAIuUbRqO5p7Qh6AesWq7wVedGwMPIVGRcCgP/a83/RiaPUDLeyiE2oHxKByZcwDlRY98hnM7cPZmg5QcF92Gyh1yEQhIIQ5PzyZFWHUD91b2ZcG/BPx4Nimg4F3mWR9IPJL+fc9+shZWt/D536GTRg== 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=7N4aggZMyL+DHYkdcUNTH+Z8OFBufjI/5GvnL6pileI=; b=dIKoaJbRZ4wQOD/Omdg558MTrHN3BeEbjT0dDAfd14oXF3LkLw6IouaKINN4b4o0fY1OlBLMlT9TmCk5MoQpdyukjfVrXqsyuYNWy2JW+wCwKs5gaGcMftDkamZ/yFJOTYlPjpCzoecNxhOtXKc2cM+5zg8zliur9xmYnwBAfz5U7wOntuDEpKHnMszR2O0IWK9+eBdrs4iBar32LU0dGmAPvkANNCAr28N8arGY5DZE7/zMv92e61ZZ9DOx+NOmSCSyY9Dkt+tPTynnfWx2gYvPSKf/GATldc9EYjjzoxS6V3EawvVStROvNd2D7iR+YTXmhaq2Iweq5MT/ltpVhQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PAXP250MB0421.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:281::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.24; Fri, 3 Feb 2023 15:23:08 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::ee20:26b8:7242:6ac3]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::ee20:26b8:7242:6ac3%7]) with mapi id 15.20.6043.017; Fri, 3 Feb 2023 15:23:08 +0000 Message-ID: Date: Fri, 3 Feb 2023 16:23:38 +0100 To: ffmpeg-devel@ffmpeg.org References: <20230202175101.1871-1-ffmpeg@gyani.pro> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20230202175101.1871-1-ffmpeg@gyani.pro> X-TMN: [uXKI1ZI2IaDLSK/QX83Mi4i8/zENnwJE] X-ClientProxiedBy: FRYP281CA0011.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <0845faa7-6558-a61d-df1d-42a545b2a784@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PAXP250MB0421:EE_ X-MS-Office365-Filtering-Correlation-Id: 26080c18-9523-4e76-00d6-08db05fa8d95 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d19x6ki53XDpNollhbaWb63JHVXwU5X1OscOY11pw9OJ4xuopHthxIBL6r25Nxb3RAXEPl+9LI7Zm9deOqIisCLPTtaK+tgfZgQehSwnHJ5pVBM5UZGp8j1D8RwV+3p/FJeL7VJAvsN9qPwyE0AvoqfnDCuAbbugUApM8pcIN6juVP6sulci6Ag5hQtu5Wnvy/UwgQ9nYJGAXRYnAQvkd/4vbOLQQzBtGXqV4WkyMPDsTSSry+5EJ53DbIDm/eUbKEVypsO1/7ywoaE3NBg2zcsJggwmynREWUqwKKgRtF/MfKcHTBILZOxdcjhfX2dpWEwvc6jx76vSL6vHZtbl4BKevNpw5lmodbsjDumIGSO8+VqrTi026ictRDVyBDqAtS05IJ7Eqx6/wAgeMLXYves7jflvfneaUg74ZNSJMr9AYCn/qxbj0/4n24GbEGJEdKTwlm3XQVE6iWuTvJW4AvZaKuv5IE1gLbZgy0XjpgvJmS913e8Ft6pGtpGBxWnMCZ4uyrGWOPp4gUVLGtvvyIacamhnT+KkmiGE5dTheo62mjYAAqjaW31A43bDg5BX4MKSjGXpG/wHXc/3/LuVdsHztk28raJSa6l03vc+xKs4Y+0R44ROkr9UoWtMCgyTGaIBi313Mx6fs7Bv4Yxh2VholNbtMd1uCZEtFwInXD8= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aUNtRkNIYVYxdGJ1TUxzR3BNZ2FIQWdjelpHZGh3QzdQZmR4eFRqOXc4a0hV?= =?utf-8?B?VFc2b0hnOStiQVd5VEloS3pDYjVjQ0RacXlUNFQyV3QxblI5eVNXcUROUFl1?= =?utf-8?B?dTJKZU5ucVJFL1F6L3dJNnVLNU5yaVBMOU1RRWpEQWVUTDRnem85aUVSRVUv?= =?utf-8?B?SGFSWUNQYTk3WERjbjlNZ09IQjUwNGtZUjE3TU1ZdlVuTjNZOEFDTU9PYjd5?= =?utf-8?B?VGlQcXMwSUZITHZIMzcwOFZaQnkyV0lrU1FPclM5N0FBODZPN0hmQ0l3bCtB?= =?utf-8?B?bDJ5cDNjbzNOT1pvbFRNNjZjbWhpdkJRdXVmRVlGMGNjeTJjYUgrTTUzM2tO?= =?utf-8?B?TGEyS1JyR2FVSUVndVdld2FmZTNUbzJTaDNoVE5NWDFoaXAwcGNHSW1TSEJw?= =?utf-8?B?bDduU0l2ZExZYjIxWk5jSWpyMlRVK3lYdHdpc2Vlek0xOVp1am1QRlpuR2s0?= =?utf-8?B?NERFM0RXMWVqU1JxSllBWlpKak5nNlhQTHN3d0xqbGF6a1NEQ0lPcWk4Smxt?= =?utf-8?B?eElvLzBkSWNlSjJsTUFIL1Jpem42MVpKazJRV1NYakRDVUVqaHpXdmJ3TGRT?= =?utf-8?B?eFgzdDdEZGxoQmFUNE9zQlVYeGNZVTNXNHVnRm84cU94QjRiK0x1aGFCckdI?= =?utf-8?B?eFd1MVJLOTRyRHdRTGtJcUZCMHVvdnd0ck5uMkhmNmtEZWJvZTZHN1BHdTBG?= =?utf-8?B?WVpGalQ5SWZybnc3RG81cGl3bXZtZCtkTXhiMWNTNkxSV3kzamJJNzJqSWJV?= =?utf-8?B?RnVmeFF4L21mSDQveERsTHpENElJL0F2akdlR2Jyd1g1ZHh5ejJrSzdHa0Rq?= =?utf-8?B?Ym5YTnRZcHdQUmVOdzRRQ2tSNTlja21JMTNkMUtaaEpwbWpzbnV6ZGtSeEZE?= =?utf-8?B?TGJXbGtEY0pyTXlaMmQxdHZ1Y052cWJQN1ZOZEg2bGc0dkFxaE5zenk4Zi9k?= =?utf-8?B?Q2s4ZmJ0T2R2ZFFmOEllZDBWRGVCVm9HWEZmTkJINy9mNkZqN2VsRWxXMXQw?= =?utf-8?B?SEdON21kUHVTNENVTFlneHlIWUN1K1lkbFlVa051Y2RpTFkzc3BWRVFkTndL?= =?utf-8?B?aDk5N0k2Q3BvRHpKb0VuMWgzYnRnb3NqZyt5dk15c1VlejU4YTlwL0dqZDhr?= =?utf-8?B?aEEzVEFwOGpFZGpzT2dEcmhCV1licEJIRm9BeFNRMEJMMnVJa0RuNVVuQlJ2?= =?utf-8?B?NHhITWE1ZmY2cUYvU2tLdXJFeHpOWjhMSDlWYjNnSlc3SW4xanJ6NXczYlRQ?= =?utf-8?B?T2haK3dEcUhwYUdvUlp5UGFCdFpqSGlZaGlLbUF4MGVUbnBOWHg0ckV1OFpy?= =?utf-8?B?MjdGNUI0d1hoUlA0Q2p2dmtkUmludnExQ2Vmd05lQjFnY0pQVkFvaGFoQlRi?= =?utf-8?B?MFFlaGZiblRORUw4WGwzOW1yZGNrOXVYUzZSR0xPNDlxclVaUlY4cHpQZWpI?= =?utf-8?B?OE5NUWIzSzh3Ump5VEh1UTIyeGVQVE9IbktnN3VabnI5QTc1Qi95MUZ1cjB1?= =?utf-8?B?WExuVjJsMlMwVDhPVHJNaE1RVG56L01jZXA4ZE1EZUl4TnZ1cEJUdFNvR1Rq?= =?utf-8?B?NUZZUjZUNmpNeFI3UlcwdnFBQTVjdVBtdUU0TDVsaVF0dlBtT2NlSUtHUCt2?= =?utf-8?B?Wjc5b2pvMUFoa1dmOHA1Yit1bG9JYmFVNlhQUHN2dTFxemxUSUo0L25sTTBC?= =?utf-8?B?Z21NR21aL0VPVllxN2ZISGZuTlZKajRrSHlydms4RllvSmVKQ20vb24rbGVm?= =?utf-8?Q?l8RNLzKFPq3eMbrrf4=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 26080c18-9523-4e76-00d6-08db05fa8d95 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2023 15:23:08.0850 (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: PAXP250MB0421 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/h264_metadata_bsf: remove AUDs at any position 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 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: Gyan Doshi: > Some files, likely due to faulty packetization or muxing, can have AUDs > at other positions besides the head unit of a packet. Remove these too. > --- > libavcodec/h264_metadata_bsf.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c > index d318bf0cee..6fab0190d4 100644 > --- a/libavcodec/h264_metadata_bsf.c > +++ b/libavcodec/h264_metadata_bsf.c > @@ -469,12 +469,13 @@ static int h264_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt, > H264MetadataContext *ctx = bsf->priv_data; > int err, i, has_sps, seek_point; > > - // If an AUD is present, it must be the first NAL unit. > - if (au->nb_units && au->units[0].type == H264_NAL_AUD) { > - if (ctx->aud == BSF_ELEMENT_REMOVE) > - ff_cbs_delete_unit(au, 0); > - } else { > - if (pkt && ctx->aud == BSF_ELEMENT_INSERT) { > + if (ctx->aud == BSF_ELEMENT_REMOVE) { > + for (i = 0; i < au->nb_units; i++) { You should count down here, otherwise you don't inspect the unit after an AUD. > + if (au->units[i].type == H264_NAL_AUD) > + ff_cbs_delete_unit(au, i); > + } > + } else if (ctx->aud == BSF_ELEMENT_INSERT) { > + if (pkt) { > err = h264_metadata_insert_aud(bsf, au); > if (err < 0) > return err; _______________________________________________ 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".