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 653B347371 for ; Sun, 2 Jun 2024 16:53:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 24C8668D627; Sun, 2 Jun 2024 19:52:58 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2087.outbound.protection.outlook.com [40.92.91.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6FC168C1BA for ; Sun, 2 Jun 2024 19:52:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AIbe7yxSMzXt6fpBMDK0cl1A1pwMEL/Rc15Ql8kqXhR/yQ95PZmraZh19Q5QmIgk2ioB4zbd6jU4OcZdRLG+4E1ZPTA7vgB52budgA1sdHwHuFPqFE3HQl/ejs+xnCC9JMTwxgiEDUuiaMHESr5Lgxg4z7To47/6JlmI75/pi3UJxz2qUDlAn0ZnWhsYWUkKQ/jiTEcdZd3mk8Y2vseihJUetOdQ/bd1NMNQA5s9xdEDk+h3FOuVDc51DvpsX1ZDTnBCkYD/hKwHZJlI3cJNt0VgRK/a1iKpvoOTsvphvHE2hRRnr6kLCTMelVwn7N3LuvHLKYjvrc6XYcpaK9Wzdw== 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=R65Ah20XzIJok8aG13wOACKQ/LWdt958C68NRemVeCs=; b=Zko5t8vOwEA/5Zk1WwP9UvPmKo6BS/Dxq/7RGD1nZVrYnQUPZGSJOkeWRdTEoT+jbXumNqlCqwlas9JGafmYBP7e3yRf/6u0XEmmBc4SizkCkY3SaPPWUyqLd65zN5KJGH9EjGXvXD6XNWisjr1hUb7NAIfwxNcR9RiHFsOTg2oURSY4suwWaUBv+L4uQXz5FQIjaHJgn13U1sKcbmoDyZuxlnXjJYQPdM1WHDBhn9PeNhhzuR61v7WFJP9QOIRUx1Y9qQF9xg1lOc9zm5imwiYmigzBsiaxSsAc+RndRazlbbxz2Ecm63H/PCBDJpm6cMsp1c3K6bgOxDjqDHSSoA== 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=R65Ah20XzIJok8aG13wOACKQ/LWdt958C68NRemVeCs=; b=jdliVvX8XQyqxFmoBFWpCXhlrAIX7mdEX8IZtW6aGFoQkqyLFZDztxhLHh/LLz4/b+5mwqLPzsVOB5wjn9+qX8Mb424oypOJmkbj8c6lUgV5hpTaKmy+l9qiv0Uws2juYFQ64odeTnSxWt1J2SuWXSb7HpEp0vaJ/hDxQ940IQdhxYSqBiZlJ0OHgBRhVP/6WP0EwWA8g/ODnce/xCgLI/t5v5Atir/ftWOvD8tBYcIMo8QX7xBWdo4hY0mU6pZJFcG/mNSAjJRmEsscCa/poHQ1mf9ShE1ZwOFRZdB7FhrQeAtRtnaAsVkG7GF0njneKw97/PUzxPQ8ouHEirRLKg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0505.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:349::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.22; Sun, 2 Jun 2024 16:52:50 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%6]) with mapi id 15.20.7633.021; Sun, 2 Jun 2024 16:52:50 +0000 Message-ID: Date: Sun, 2 Jun 2024 18:52:48 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [EAQ1fiO+cGfJlbGpPkYletObXSH2PKpjHTDy8crlycg=] X-ClientProxiedBy: FR0P281CA0172.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b4::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <911c4f22-50c8-44c9-83fe-d4c689bccb5c@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0505:EE_ X-MS-Office365-Filtering-Correlation-Id: a6b222a7-3688-4635-55e5-08dc83246ff4 X-Microsoft-Antispam: BCL:0;ARA:14566002|461199019|3412199016|440099019; X-Microsoft-Antispam-Message-Info: w6CjPMZLvXu9Au6Z6X6690BUfvpx/RBfjv+8MLDHFmqzSP5j2jxuXSAuxosfVtZsx1d9clGZlu1ULyxIMkO68xq0BbpCGHKslGQziguDv+3Q2ItRIAxFQbKefZ6thvURmH5F8obljAMpoik2/PFKcFxgvnLey1abHZZfwUHYDFiIGv5F+3SpRjNoh8sr/kAe4Xhs+mIdvR99OdYLW7LJdStyAskKUi8ok8zUAlEx0YlqqxgKLJMtiPUunEWUe1sfzMRuVxV0L+galihoczJTC+Ipk6bQwTVeIgDtqODZxeDwuB12ybmdCPWg3PzuB8PQ5Kz2AwKNRF5hIsiHsTCXOxoHSKNVrM8dW89cJQEs0cFQ1dh3Vh5EWb+IBA0vG8vc0Fmw/itonboIVWWmYiZ20xEsQAR6Bix4rsCEPTW/2sHrWj5fvSTHWbAGgOpteSS2edECdKl+TLw+5XFNMCUniRGSGlbv+s7ruxejkdUslSZ1JZT8zKDlfARY9xQflBYf0tJohPddSGfWgEYnhpySjVz9HmI0nq31MBjxxD32iSKxlL8AJGzvQL4aY994Cdtj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UW1LM1p6SHI2c1diZVg1UnoxaVBrdGU2azhlWW11bWdGQ1M4eUpTd093MXZS?= =?utf-8?B?cW44aElDR2h1bDlsNlFIenl2ZHhXMkpsdXozeGljTlA2Q2I5anQ5OEgrWUlK?= =?utf-8?B?UnhERWRFbmVCYk8yblRZVHhnRE5DbXdOMnZ6Ylc2WUNqbVNrTndoNGk5MkdH?= =?utf-8?B?bVpsbnNFZTN3SGxyZHgxUTZpT05nUDZDa20vU2RLS3RUaE03Q3VvNmpsdzdS?= =?utf-8?B?SWw5aVlJV0g4b3lBR211dlFHN2hFUVhUSWZyd3M1QkZoTWpsRGFYeDEybFFM?= =?utf-8?B?OTRFZ1U1TnV4Q3h6VEgyNkhJVFJDVlJnNHFHTG1pMytKekc1cjVJTXZxRGk1?= =?utf-8?B?TVE0Nkh2OU5waHlTZTZPa2tPSDhqaEpjUkRjYUlSOWRmYWtXSzJYVVV2N3pi?= =?utf-8?B?QWNkbmRYSEsrY3ZqSDhTSXVhYkdIRDJlcEFSaWJMODBBYXY1bzFkY2JxajYw?= =?utf-8?B?M09Kbi9ldnRYVDFBa1g5L2FjOWJDQkZJUGFWc1N5dWpoeVBqUSsyaWxKdk4z?= =?utf-8?B?cjRNeVJGV1FvYkZtYjFLUkZ0ZUtPbFN1WDlkV0dRM0E2Qml5T2wzSjBtR0lV?= =?utf-8?B?anRUQUVNOEh3TStMT2laV3hrREoxMWRvWkM4Y1cyVkJqY0VCVEgvL2RJbjE0?= =?utf-8?B?TkQ3cytxTmp0VHJuWWo0cENYcFVsTmxqdUJqeTBBN2hVZjBoUkxzTXZLQjRn?= =?utf-8?B?L2NVaTRnQkZjdm9xN2dhZThQU0ZobDMwVWhKS2VGTHE0ZXFNZVROeU9qSFZM?= =?utf-8?B?c3JqSWNrWGtrSFAvTUYzajQ5bDBaQllWUUZkT3hmL3pLWUU2ZDhLZzBra2Vi?= =?utf-8?B?ZEhKenpRVjBOTTFuZDhtanVQQys5NURKYWU5QW9LZmpTQkh6YytrcVVFRFZE?= =?utf-8?B?MEw0UVExWno3S0VmK2JVdnpsbkdLV3NlcFdaSkhkOEtWVzNCM3VGS1dQdDZl?= =?utf-8?B?THY1NkdZUVgzckFEcTNVTUZPQ0plckFmaEwvUlB5ZS9jVUZCQ1NpQTdvNExj?= =?utf-8?B?V2lsYTBJVU9TeTRhZ21aMTl4UENpOEJNVnBHd0pZOHJORkozblRwYmpkVTJR?= =?utf-8?B?alA0OUtqRXRqMHdQangvb3hZTVJ4djRZOExUVk5vcUlKc3c3cG80QWJGclky?= =?utf-8?B?Rm8zRWduWElNb0NqUVlZZHJNUWV3eCtZZUdjYkRFOFBTUmt0OExWc2FwcDln?= =?utf-8?B?aE1zMzY3Q0ZMK1RhZHdES1NpOG8vVUg0VHdPaDNYODhNbmwybSszTzFDMHhH?= =?utf-8?B?ejU2OXpxczVzT1dMMFlsTndqWm9pVTUyTkU0eGFEbmZ6b3cyN3o3UUJ2R2p2?= =?utf-8?B?Q3hKN2RSblpyR2tBaTB0emxPU0NUbEZWU2pZd3QzMHZXR2RRVmJMQjlBU0lT?= =?utf-8?B?QVZaYkYrUUd1QkpldzBzK3BZZk1oWWlkR2Q2Qm5xcytyYzEzenhDUVBJdStw?= =?utf-8?B?VGFCK3lLc0x3VHJVRGpuRm5OYUxlc1QwMm9OVkJxaldaN3dWMENwbDhiVkd4?= =?utf-8?B?V2dkbnRGUitYSXJYZHlVbG0vUEdFRnNmNElrWXlFZ1ZwQ2JKUVB0WHN4QkZY?= =?utf-8?B?OEpXVlFoanpCQ0orYkEyQW1pckc4Q05SaTBzZzA0aENFYklFaE50UXBXeEw5?= =?utf-8?B?UldwMWNBUFhVS0V3STV5NHF3Uk14YTdwMzhuT3E2bGxyenpCSGFTV1BaZ21a?= =?utf-8?B?QWxBaW50WnIrRXNIYmxqSDBlZVJzZXB5SXJrYlhpWmFIdEFFYXhKWm5nPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6b222a7-3688-4635-55e5-08dc83246ff4 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2024 16:52:50.2106 (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: DU0P250MB0505 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: Andreas Rheinhardt: > 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){ Will apply this patch tomorrow unless there are objections. - 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".