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 DE9A74AFBB for ; Thu, 30 May 2024 17:53:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0791068D3E1; Thu, 30 May 2024 20:53:53 +0300 (EEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2069.outbound.protection.outlook.com [40.92.73.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0330068AA84 for ; Thu, 30 May 2024 20:53:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PU4IgkUOMGaPSuo0HiMitZmUxL1G8EmlF40EM8j4iQ48dxjWpPc46RVVMlACcFFVXqu/H7W2Lqt4SFC6bEWwniigDDJSEBAXZ9T9rxKYM6dbo56ajxK7gMSk1oFedUKQ3fmpj7DicV1H0CihODUgsyKUyzjmHkP0TpS9G17yQYP/5q7Ns0UVOH8NqEw5wmqCwXwJz4Qz+vsoyk9ALtYZ/YjF1rP6MQaKc55d/vuaHYL/nN4t9q4LFjgbkOQOtz0DmEx/v369Ui/SJrVPWYmC+dVQSFbSJjebqlaBIIGFB1fwxc0ivmA5W+MUrs9FQuP6cY9p2e24MNs/1BqOIsdUpg== 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=QB0XRknlcPDeGaNlrjOC8N5WAIQG69fjZB7OV/3giPw=; b=Me5bDwzX9BlF6l2gRpyPL39SZ1hwQKAFivZI5LRp5R02Hu4nSYSHQDzSx9G86SLG3SVyHlBZWuqcrlE7fSfNIxiWgJ2+MKwmg5DLnQh+vd29j5Tx7acalKMLBJ6hdXDnaUHAmdj6e8mTNEUqS86ifBhsjPw59vMpEJZeHna1PkAPTljwTmrdyPCKAH3hgjkEJ+5JbyJLGuG6wWliq/ArEgJ4AcZOF/C9uRVsNTwkRsa3t8hpXndT15a/D2TPsNz6ipFhHk/D2vIs8iAklDFEW/qhNH4VFZcmQ4WerKuomK0JoTSeWFzErP5rQt/2WOG57CAe+DdwvadrxIBziFMdTA== 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=QB0XRknlcPDeGaNlrjOC8N5WAIQG69fjZB7OV/3giPw=; b=uCHvjeGjlaLBWwKKsu4fQtP2Z6V/8tYKjYRl1MZJjC65qd2wSE/LyAygZKaeQD+B+4IbWfLemhTyX10Rnxyd3GGSSbn3I0MB6xdnlPBmCmbwkKTjsQ9W3dKC6gJVdo9qAjFXKgJvfbYu6Q/Je0bH0Zt9ENZfMd3gQ00+Xv8qSBb7w/ZJjFzZa+jYZDxI31XWrMf2fjQDll7bb6tIompgIDiHyJInJMZ4SHqmzDDgGbQa8TRjb1/8yl7QjwPCpxELmV7ZafUX3D5uOlK7dBSBS0C6Xxq7e7EoAR5X9NRrWEaYd/hW2yEd3s7VuJ2OqNvQLctsR6JEJPFp96Sc977DXw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0268.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.21; Thu, 30 May 2024 17:53:44 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.025; Thu, 30 May 2024 17:53:44 +0000 Message-ID: Date: Thu, 30 May 2024 19:53:42 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240530174429.GZ2821752@pb2> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20240530174429.GZ2821752@pb2> X-TMN: [uF/tmEAVGKHfs1D7T/EFAG9eCkPxv6Lx+CufuLSFRnk=] X-ClientProxiedBy: ZR2P278CA0032.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:47::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0268:EE_ X-MS-Office365-Filtering-Correlation-Id: 86f51c25-81f2-44c3-9c79-08dc80d172aa X-Microsoft-Antispam: BCL:0;ARA:14566002|461199019|440099019|3412199016; X-Microsoft-Antispam-Message-Info: +LcicipmHotqgS8gNJAv0p/J6OkMvbHpBUWgBHal7tjD1Nqu0xFwV0XyCnjfv/fVeus6rhl05uUQ8G1iT1Vg3UPmgOKSp3tWYyUOPPR2zK5P6sh2VgIqzco4AqkMAcuwyZg+9UJfQblIUMRfEx1bw1K6AOM2mFy8CR9NR34X/KxTbDP8Z0Z5plglkhmHGQv/vnO9wZJRlir9RuKAH5wKF9LzgmEqdmDEDmotNIUg4bijToD25NCxjkMzy0LJbTeTUL7GqYvDAewz7ke+jxVGi9fepEPBebBB1uNNyi54mPk65fhsMigDpXRL/G4VWignPT4LUaU66ou2Dq7SsJLdwvEFuZ5yX5PqsXRxiyaOi2TFI1uLpQDq6i08CHY1UlSkvZD9HgKW90eT4QIC568QyTT5VHe0khWCcISYX1NUZLAMxVh5LhoKrU/uST1HrjZ5cOldZCfSqFUiRvyA95mHyh+nqO13k8F3/G0hs0Kmm8PmdsLPIqNPf6Uydictsyyk+NduvYEvt/MUD9WlCCHP/7Y8eNnS9IDdVr/98F1400f1Sj3GfMRAiH0Ks96PQz9f X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QlpoZmlkMVhXNnl2UW81cElzYzhJQTUrakcxWkNkY0FhVCs0YmVyemt0dHJJ?= =?utf-8?B?RWw1MHR5SDRiZFFHTkdtU2F1VEQ3cEZ2OVd6NStWTWFsSWxkeVdMMTBPbFBK?= =?utf-8?B?Rlc3Z1c4VENSNkgyUlJJRXo2ck1YbEVhNGdpUjg2OVVaanUxM242VkJYOU9T?= =?utf-8?B?N2IzZlYrZVpaNmVqaXNCcWNSRTI0TkRweEZGNlovZ1V2NW1Ia2JaNXY1dyty?= =?utf-8?B?MUdIeFlCb2NvVHB6QStUWG5pbmoxZlp6M2lNQWttUGhaTE9IV0V5VXdVTDg2?= =?utf-8?B?L21vNE9vN1hDMGlPZ3pDK2FudnA3enFPQjZMTDZmQzdGR291SnpHeDNLTW5F?= =?utf-8?B?V2pNOFZYemNjQnkzRzVsY0JPNVZtTE1ZNk5YRThoYVhGSXlXYm1WcDBxcERv?= =?utf-8?B?L3NVV1ZXaEdwWmxSZ0g2d2RkMzh1ajRtSWtUQTVvZ210R01Ic2Ixd1RNR2ls?= =?utf-8?B?SHl3VEpuUmROWi9RMUJCUFFRb21sa2duUS9Qb2ZwbWwwWmZYenUyY2lnM2FJ?= =?utf-8?B?ai93bVp5eFR3S25xS25lVGcrYUpGemlyYUk3YkNRYm9vMzJjVWpkeWZISWVv?= =?utf-8?B?bVB3U0M5S21TZ3QwVXVucDMvL25PMExxTDQzNnBEVldra1JCNVNxMko4NmNH?= =?utf-8?B?eU81cHAva0ZsWHNtV3JrMmFPWDJpUFdwaTBRblNHTUNJTGtrcHV2M0RHb3lF?= =?utf-8?B?TS8rRktXY3l0dlFNbGxSWk1hbFkxUE1CMGlUMmsxKys4cGxVUGYvOVFBUk5Q?= =?utf-8?B?M2hyREcvdVlXQ0djTGxHbThlaTYrM1E5NlZIaTJldWZWVi9sd3NwclE2WkQ1?= =?utf-8?B?RWZ5Zyt3Q0VSSCtRTTUxeFFiTjl1ZE5odGJwNnd3SnduSU1mSHdCMEIzSDBt?= =?utf-8?B?aGtJbGNmZk5QVmZnNm5IWWFUMFA0cC9pR1ZqaVYraUJpYm01OFhvRlNqaVor?= =?utf-8?B?SjA2UWt1UVdmQ0xaRnhXdW5pY2hWYTJUbXJLaFd2QmhwakV6N1NKdTVuZURl?= =?utf-8?B?bWYwSGo2d0o4aWxsbkdtNGQrVlAxYWJqRHVMQ0NvTENmUzUxVXVMeUJtWFgy?= =?utf-8?B?eEJqTG9yWGlNTDZQS0FKRGZmcHkxdkhIWkViRE5rQVZFS2ZGb0x3QlU5eVpN?= =?utf-8?B?Q1E4L0xJd1NIT05kclIxN1AyTzVwMnQvTldVd0tMZEJUQ2c0QUhLYjM5ck43?= =?utf-8?B?Vm5EVjY0bjdqK1RBcFhwWU5VSmcwU3FoV3NWdXRaZWVkVkVvV1E2YXVwNHdq?= =?utf-8?B?OVZSTnhzN2hYOUtJOUY5VGtzZjA4dy9Yem5aL2NKaUZ2aU1Lc1hkWG5Wb1Z1?= =?utf-8?B?b1YremNsdFAvOFhkUWF3dnhlODlOMXVwZ1pzZHR1V0ZndWFOVzdRcTdYZ3NO?= =?utf-8?B?OEEyVVdQaFpVOHRlUUlaU2V2Y0wrT2s4THJkUDF2UEdDaGgvWGlQbGtYSEdx?= =?utf-8?B?YWNabVJJOHNaeHUxdUFTOHZuMVlHbjlLYnRIMUYwQWtQbTB4L1JwWUF1K2d3?= =?utf-8?B?ODNub2hMNDhseDNLZDRxdE5NUHhnZENqNm9SeEwxTm9wTjZTd0J3dEFiNCtU?= =?utf-8?B?bUJJRWpmMW1MZEN5YlZ6WHlKazBtL1VtYUFZV2lWejFOWWY0cFJZaUVjMGVx?= =?utf-8?B?a0poZTJFcUZkZlVuSDUvOHdFUmtCcXJDWWxiZVZvVktQbUQ5akhCVHlrKy9h?= =?utf-8?B?QU5SUzEwemFWaG9HeXMrc0twL0lPYWJWVVJGeEJ0dkN2bU4rN21ZVm1RPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86f51c25-81f2-44c3-9c79-08dc80d172aa X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2024 17:53:44.2269 (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: AS8P250MB0268 Subject: Re: [FFmpeg-devel] [PATCH v3] avformat/nutdec: Don't create inconsistent side data 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: Michael Niedermayer: > On Thu, May 30, 2024 at 02:14:20AM +0200, Andreas Rheinhardt wrote: >> Forgotten in 65ddc74988245a01421a63c5cffa4d900c47117c. >> >> Signed-off-by: Andreas Rheinhardt >> --- >> libavformat/nutdec.c | 14 ++++---------- >> 1 file changed, 4 insertions(+), 10 deletions(-) >> >> diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c >> index 0bb7f154db..34b7e3cb9a 100644 >> --- a/libavformat/nutdec.c >> +++ b/libavformat/nutdec.c >> @@ -881,8 +881,6 @@ static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int >> int count = ffio_read_varlen(bc); >> int skip_start = 0; >> int skip_end = 0; >> - int channels = 0; >> - int64_t channel_layout = 0; >> int sample_rate = 0; >> int width = 0; >> int height = 0; >> @@ -930,7 +928,7 @@ static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int >> AV_WB64(dst, v64); >> dst += 8; >> } else if (!strcmp(name, "ChannelLayout") && value_len == 8) { >> - channel_layout = avio_rl64(bc); >> + // Ignored >> continue; >> } else { >> av_log(s, AV_LOG_WARNING, "Unknown data %s / %s\n", name, type_str); >> @@ -952,7 +950,7 @@ static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int >> } else if (!strcmp(name, "SkipEnd")) { >> skip_end = value; >> } else if (!strcmp(name, "Channels")) { >> - channels = value; >> + // Ignored >> } else if (!strcmp(name, "SampleRate")) { >> sample_rate = value; >> } else if (!strcmp(name, "Width")) { >> @@ -965,18 +963,14 @@ static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int >> } >> } >> >> - if (channels || channel_layout || sample_rate || width || height) { >> - uint8_t *dst = av_packet_new_side_data(pkt, AV_PKT_DATA_PARAM_CHANGE, 28); >> + if (sample_rate || width || height) { >> + uint8_t *dst = av_packet_new_side_data(pkt, AV_PKT_DATA_PARAM_CHANGE, 16); >> if (!dst) >> return AVERROR(ENOMEM); >> bytestream_put_le32(&dst, >> AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE*(!!sample_rate) + >> AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS*(!!(width|height)) >> ); >> - if (channels) >> - bytestream_put_le32(&dst, channels); >> - if (channel_layout) >> - bytestream_put_le64(&dst, channel_layout); >> if (sample_rate) >> bytestream_put_le32(&dst, sample_rate); >> if (width || height){ > > This would break mid stream changes to the channel layout & channels when it > is carried at format level only > > The commit message also does not adequately explain why such mid stream changes > are ignored > Mid-stream changes like this have been deprecated in 09b5d3fb44ae1036700f80c8c80b15e9074c58c3; 65ddc74988245a01421a63c5cffa4d900c47117c removed it, but only incompletely: The side data flags for channel count and channel layout changes were no longer written (in fact, they were removed from packet.h), yet it still wrote the rest of the side data as if these flags existed and had been written. That is the inconsistency this commit addresses. It does not address whether channel count/layout updates should have been removed, because that has already happened. - Andreas _______________________________________________ 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".