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 77A434B1CA for ; Thu, 30 May 2024 18:08:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 017C168D3DB; Thu, 30 May 2024 21:08:07 +0300 (EEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2085.outbound.protection.outlook.com [40.92.73.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AAB0768D265 for ; Thu, 30 May 2024 21:07:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HbLskuwsl+vyiiyFSbqvYznFlDZUFr35CdVJRuFcO1DuJxXbtm5UPYXiLt2ivfZ+bFt3AzI5HyAbAJzSk62txNWWiWvkwTCvbULFCNL3ZNXc54I2i+6wIVE8W1EnR4mRy0yoCDbp3FOHOhTbtmJci6OyCLh8t8+VEEUep17okKmMXCDdk3Sd93eLAbM3nahLw9TxMKVXfB45O//nRfuJUdDbui/kM6Y9VsO6MEq4SRXapQXbFZqAzoSMOqeMGP6l6oE9dhdS2XikkmMkbMvODoT7ZWtyKRT9TIEDMKp14hd7kwy69rA9lUxgVXYL5DR0UwglVvbKMlncLDESXrIUDw== 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=Ru84Xsbxukqqq7kedi3ocnI+o4xflL40ZzZ0x0FPWCc=; b=b6ZEg7ZnZUVXj3sjzzBe+e9FeYjhELrWlNb+1/NFUQ4dfQiX8+s7+TyJngt+dND99lxkehlFmMjSabSDPg/+3NsgGhfixC3lSX+JFmfv1rjDN8FU+1zU+1gT1VPjrCY+2733vNuTo0hObjILk2eWhnQxEq/ruKqXliuMW9tNilHn/wFAKIW1DosByaVpTfOwPFQg6HKj0OJfbiVeLwt4m8S4ZfWYla+ucVTarj43ucewC8w5LuGScY+rTsFIkJRYZjAsL15UL2NqOIR9prcA9fP2nQQ3lXZ67av6HMts/u5h63kD7cLeZUDkrnrZS2DcMqOzmPjoiA2JKw9Pz/sW/Q== 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=Ru84Xsbxukqqq7kedi3ocnI+o4xflL40ZzZ0x0FPWCc=; b=SzV5v9i2RNTDXp4VelXbYHjSzeru5TZd6FMLktoitrhHFgTYcgZhaw+owszjcfDN7g5GGU5r9UMkIsq2rTgS/Qely4EZsN3ciMFCyzKXYk+BIIOqYhkktlebcJojaSvJTj1NVzVCO42M+eTxjeIJMSROgHfq1AblG+qrVmWS3zdcO2AZZIci9BjF1F/yx9qIWvngfp+vXbN+tFiTUBYYdOOaoTSdrFVqlx8Gvb1HeSZdwxs4iQkdtJ0/HJ5Jel67BRZfu5uCO/6jSlRR2AtTzK2oAAqC4nI3eWW/Vekn8Pd1tza5sYlX+bouMcjtcC3jcFIwPgYSFY7YOPs/AYENEw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DB9P250MB0475.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:33c::10) 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 18:07:54 +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 18:07:54 +0000 Message-ID: Date: Thu, 30 May 2024 20:07:48 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240530174429.GZ2821752@pb2> <20240530180435.GA2821752@pb2> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20240530180435.GA2821752@pb2> X-TMN: [TBjP2umfnDKuoR+4xu1Bl0wolPVSKRhZu7YF6XYhhJw=] X-ClientProxiedBy: ZR0P278CA0138.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <0a69f8ec-0e29-459f-bf65-23d0520fbc2a@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DB9P250MB0475:EE_ X-MS-Office365-Filtering-Correlation-Id: 0245c3ca-0023-4738-0782-08dc80d36d41 X-Microsoft-Antispam: BCL:0;ARA:14566002|461199019|3412199016|440099019; X-Microsoft-Antispam-Message-Info: dDCoa/pRxzp8O459zetHIO3+LPYgQS10r2lhl/Y4n6mhIfzzZ5fxmDyXWUbwkKDcrH+qNX5fnmBlGM3+IxQVi0yCVNT0izETQq7xhkaMTJSArnU1i0m/rOvBGn7Cdpt2FS6h/e65bhtHELdcwx5xvdBm08PgcJks9zgmxsXoWO5OQY+9tjwzYkfzaWRjqiLbLBp/qNxZ42l4vC+reAJ79T0PWpxmKRCRWkqvycU5LlzYLcgFF25L+7aK5R1wmyCL4HmntHzl9h7paj42zBVLRvAO66zzQ9Gt7dW5EBCLGSRTJNMra2I+HByd+IL5mcsHkSFv0I1FVQhlBDJ3+heqnZYN7mobm1OdowYMYYOv4tiQHHIgwzve6X9cFGNu/3bFYsd7TRLAp+Rv4BJBSWXkEqGukxfGGjKRa5zpl/AW+vTjBNYyB3mSsPYgDtNKtTPkYHp+AiVbkAZf7a1U7Wuie6agbrBOgvO1GlRoge9cTrjb4vzC99OxaipBK7OzOJ88VtaCcKgb+wuWXObd3vHUwGkeQyPnNR82RU3rGigLF0uMMOeiI1cZD7RRWC8PelSo X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SVhlWUw1cElMc1FiWTk1enN6d2lCUkU3dkZ5c0s5S0x0aW5OWlhIL1JpeEtu?= =?utf-8?B?ZWRqQ20zVFZOSjI5NGdQV2tnWXB6Y1JqaWZ0S0JwUUNhZ29lbngrSU1tWmxr?= =?utf-8?B?TDNDU1VDZThrb1pOeCtUdWZHNlBUTjY2RWhjNXFwL09jdmtOQ0tjWUxqUCt3?= =?utf-8?B?SFR4WDNMaDV5cVJPcGdCTWZnVVBHMkNjMWxkMVZtZExvVmdoNmNiemNGdTN3?= =?utf-8?B?bkN4SjQ0ajhaYnUwK3lOREhzT2RZV1k5Y3NZTmNMWTlmekpzZCtFUGJ6OHZy?= =?utf-8?B?bXNpQlIySEQ2OHN2ZnkvaFVUTlZDTyt5aXM3czdPcW0rcHBGdkVTYTgwQmhl?= =?utf-8?B?ZmFRdExwWmtrUmNFOWYwSFpEZTcwQ0hrOTZvaFBaOUMwY01sbGNsR1VROEM5?= =?utf-8?B?aStyZU5WTW9kS2ZHS1VxYlUvVUo1VnZxRlpNc25XQStsM0llSUQ3amh3R25y?= =?utf-8?B?azFxa1V4dDZVQ1Z4NC94NHUzS1pwWjlBZ1JldHg4dUp2cjRyLzVMZkJJUHRI?= =?utf-8?B?MGo0N3l2cjFieVd4MEM5c0ZDTkJoNmpFTitFdUR3U0RYT1ErUEwwTnU5c3ZQ?= =?utf-8?B?b2M1VDEvMUJ1MjJnNEFHeUFxSktIcWFoUk5JeisvVCtkb3dnZEVrakRRQXJ5?= =?utf-8?B?NzdSeVNYVlBHSE9LMVZUajNuUytVcXlqamVuWnlvOFJJaE1CeHV0NmE0ZHpz?= =?utf-8?B?NlZ2cVRQRktNa1AyVmlZRVowR1kvVXVwcXhhZEtEdTRGVG1IUm1NSzhTempV?= =?utf-8?B?dnduNU9SbDVhVXIzYnl6VlhrR2J1T3dIUkdLSUJzQllibHNJa1VJRHJFT1Fw?= =?utf-8?B?UzFHV0NuTUxGMXhMOGdrQjdFSHZvakxLNGEvbnk1WWpSWVF5Y1RBdjFBa09t?= =?utf-8?B?RnBiVjVDT0xnMGJlNHl4NXJ6UTlwWmxrUER6aFhOdExUdW8xUW5WRWliRGN0?= =?utf-8?B?S0FhRDZqYWllcnE0Ly9yd1BiK3NpNTFYMWNHTWxQcDdhVndFNExTTUtCYTVq?= =?utf-8?B?T3dSU21kdnVPSVE2NUhaYmlCUGNhZ3RsN0tHemhtdW51OEExSnYzUm9zRDVh?= =?utf-8?B?ZEtrd2xUVTFtMllIdkhsbS9TaFl1bWJtSTZRYkI5YWFZQklpNDFiejNUQ1Vk?= =?utf-8?B?bTRaVFRUaXZsWWJFMzRTNmxIOWx3ZzVEMmtBSXl6ZUVIY21Pa000aHgwY2Ru?= =?utf-8?B?cTZhc28zZTZBMHNEUmZaM0FDaFFJM1VjUVhXWWlhWUp3T0xXdU50dmxETkJX?= =?utf-8?B?REZJTy9WUDM3ZlpNSGZBUTRtdFh2VGdIMVlwTlBRWkZENE4xWHczd3M5L2Ry?= =?utf-8?B?VkNCWDUvRHlqc3J0YUVhM0R0dVg1M29vc3RoRERzT1U1YUdhaVNGNFR4NEN4?= =?utf-8?B?eWVCdmNNTCtabjlFK205c2xZRnpYTGNJTUFZRUFuZXo0SG00azAyOFZVdzBp?= =?utf-8?B?ZVBWUlY4WmdObTlIWEJDYlpVTTNoWFNZOE5JaDdyandoVjZPdHVZRHVESTJw?= =?utf-8?B?NDlOL2lpcUM4M2swL0IrUmdjbkF4NDg5d3NvRk5ubDR4ZjRhK1VRZ3N6eG8z?= =?utf-8?B?a2k5bTBsMkRjeWZ1QnR4L2Z3U3poaWZsV2o5UmJNNnlNRTkyR1BOa3dlSDBo?= =?utf-8?B?Sk5BNEhWUkx5ZW5qUjlYbklEdnpvN0RMU3R2TlFKdjVFQXRObFp4dVFuL3Ar?= =?utf-8?B?dFhGNFJLR1hnR1RZYmc5MFFNaTRqUUx6bkQ4Rkx5S0RwSmdGVTkwODFnPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0245c3ca-0023-4738-0782-08dc80d36d41 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2024 18:07:54.1351 (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: DB9P250MB0475 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 07:53:42PM +0200, Andreas Rheinhardt wrote: >> 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. > > i honestly belive that we should support changing channel(layout) for > cases like PCM in nut > That is orthogonal to this patch (which just wants to not create inconsistent side data). - 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".