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 D67E74B137 for ; Thu, 30 May 2024 00:22:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CF40768D3EB; Thu, 30 May 2024 03:22:50 +0300 (EEST) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECEB568CA1F for ; Thu, 30 May 2024 03:22:44 +0300 (EEST) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-7022e0cd0aeso400169b3a.0 for ; Wed, 29 May 2024 17:22:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717028562; x=1717633362; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=gHSZ2qCHC7RJ4OZZMhWhp5oUJznZLakajM9Peh/FaKo=; b=c3VIcuRs5VgmD0YSY8NNe+WfRvXab4CrG9+keQZO+9H4kLZtmEsUnQzLJK2jrBEmzX g9DCnr9Op5VnpBGyVOUN1kcQNGxcCDERPCYNV0R5yj9Loe6vcWDdeUGi63myADdVUUBR W5tzltRKgss/xoPm93bTRL9eeAcAKmdb+BL1zBBUca5HzoXuR8XQ60wVfPr1+Sdj7llD Py1lu5k5pCfszqAyVXnR+sjekGzLb8xQst7vSd2e3VK0Dcp6hD0/nMhaf+0ilcliZtSS Jw3m5YHvgkOVXnXhGcB3PBr4wmDOIfHFbrH3kymwwZwSnzDeVBoBFNRYtG8Nt+5KDGQ4 nV0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717028562; x=1717633362; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gHSZ2qCHC7RJ4OZZMhWhp5oUJznZLakajM9Peh/FaKo=; b=K76pG2FYPORfHzVglciPclPrCSN4QQJ1EECmSRSNBtRAEAFfRUzVRPREaW4vELEhtW yjT2gIVW4/GOikOuYA6C/eeL6gAX0W1B11iZJ+hR1Duz/IU/Au5hMc9wY5xYJPu7bLI/ CND+udH9koclkW8ad8vFDexloN27/6804hhyC2Z7lJ11fVEe3TJtqJI+RrkppLKxos9o A099EfpUl+Ydi01Hckb5lEhowqhx19P29fo1a23cNW7/Z7SQ4c2yv9unc3+z4y9ntDAO vv1Z8KvMc3JlML1bjgLR1K2PZ+mEpOEgMhejA7g72F9y0GJHXaNjlHZpGxSrZmjwXB4i e5Nw== X-Gm-Message-State: AOJu0YxHxRpiFVzKy4TTRs1qVSSztzOUAFWFhW961Myz41LPORVPmBgI ChxqEgxBEKW7iyoINHfAbwp9WyKtWZONGL4LHi/KUROszo+6ytZEiLnBLA== X-Google-Smtp-Source: AGHT+IHups4p2gekqJGYotbqteZYeF14ph2jdkURnnk1Ola+k0dQzqdKxAmKixRXYKIHYY/Gep1wIw== X-Received: by 2002:a05:6a21:338f:b0:1a7:878f:e9a3 with SMTP id adf61e73a8af0-1b2646c7acbmr693181637.22.1717028561952; Wed, 29 May 2024 17:22:41 -0700 (PDT) Received: from [192.168.0.10] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f8fcbeadc5sm8587207b3a.119.2024.05.29.17.22.40 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 May 2024 17:22:41 -0700 (PDT) Message-ID: <3a0311de-a9e3-44e4-a30b-d4adedb609d6@gmail.com> Date: Wed, 29 May 2024 21:22:41 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: James Almer In-Reply-To: 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 5/29/2024 9:14 PM, 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){ LGTM. Should be backported too. _______________________________________________ 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".