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 ESMTPS id B84AB4D294 for ; Wed, 19 Feb 2025 05:26:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C179168C1EB; Wed, 19 Feb 2025 07:25:23 +0200 (EET) Received: from mail-yw1-f171.google.com (mail-yw1-f171.google.com [209.85.128.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8C4068C1C5 for ; Wed, 19 Feb 2025 07:25:22 +0200 (EET) Received: by mail-yw1-f171.google.com with SMTP id 00721157ae682-6fb8de54da9so14953197b3.3 for ; Tue, 18 Feb 2025 21:25:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739942721; x=1740547521; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BnUIpGK0NYOqMsAhXf9MxzFmAg16pXSG3UoiHXDfv3A=; b=bkfEkQ1iY8fdRq0tulKzTmb6GI6CWBgeRXWygrJvR1VUyBAOcnvuia1PXbTaA2GJ3N IcqrzxvBwtheoxuO0ZqRV0qMOty8DILAl/zSK/EiO31X3q89TrGdEz+/rXWSTvY8PCaq /7UF2RaUZSjcZRj4WqOytlUODR6m2ff9BLVc/cNyCus7dg4xRZry9egt0vTCQAd5iXgi 3LjkpacVtt2VDV7eZOhzvfJwv8DTzxIJ2aqg8YPY0UPbbdX5F01JZubbuxDYjDpVeawn m6SvFwS2nJ8gPYhfGwmqGiNOmN7bvL7qDk9RoJtJoxdUvvqVcBCCXIq5FTWxso/ESqkh t3/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739942721; x=1740547521; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BnUIpGK0NYOqMsAhXf9MxzFmAg16pXSG3UoiHXDfv3A=; b=OmPpLF0DPKQ5Ujm9pmfTV6QSfgBkBu/XSjC7+YNbRXKosfGMeTsq5xktzhaFgmJd2c Ush+Jv8PipWuwk9Z+LkW2StIE0xjCa7g6OyolArzN77l915levTS+AD11x4foU5x7+Zq M7Z0Q2w8sbe8ClPxrGszvLuXvbYPRtldMcSCKtXddQlHSsL/EFKnOpcRQu/1DpZMbIR1 AyDfYjPgvzn7vCfwrv1YXc1Pysycpkt4VCyDAQGrRFbWX4isd6Kr2lZGUo1R3d3e94pM Kquk4nph+r858gq+IWJMy8JE8gFgeQ9NqlOTSaS28Qu2ou8K3EV+QQaPbTr0smKbDr4u ZB8w== X-Gm-Message-State: AOJu0Yykqpj+tqkAdCW8zzc4mpXbojYwMcPy5V0+QWaqAbMQZqVXwz4e e1niuQDe4S5aa6tqxeIoqXsqdrDVkCkXmH3ZscxIXdxpvxnb3tWgr7omkg== X-Gm-Gg: ASbGnctiM4Nvw0rf7SdP9TDFrY/B8IbxSyR/0eGqc0YXlKgx2XeKR0nYVInuyG4lm5D M25aUUphD5iq12JVL5QEXtVGI4YbJEXS+biRUJdk5yXSNOAuWNv00Rf6YVb2zXHnCWKXhiylJNH Yx+KZMFwZh4eKqVS0Jnx/msN1d34D958RzNlcc/Iqk4IKger0xw7+7Lx8Q6/Nsw2CyBUVzZhxdr Ke2/Q93sCqMBp8Vfkk5FYinFQ0CL59yZMAS15LJeR+4+ipv7mRpL4wsFU1GXzQDjCPdRT6LMOEJ 2DvCvZEpMDOG4q2TyZIYx4y+uiWaMBwfc4Qu+0u+x0zyWzvWsQ9K X-Google-Smtp-Source: AGHT+IEk23SY/DGiRcnh+/xFI24+08kMOAzeIzTeVNrBNcKFCNgR1auTIQ0bomgOJHLTs7GC8jZzZw== X-Received: by 2002:a05:690c:25c3:b0:6f9:4f93:c805 with SMTP id 00721157ae682-6fb582a7776mr151419327b3.21.1739942720861; Tue, 18 Feb 2025 21:25:20 -0800 (PST) Received: from localhost.localdomain ([2607:fb91:fe2:71a6:2854:c007:54e:fca]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6fb5a15f082sm20783537b3.54.2025.02.18.21.25.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Feb 2025 21:25:19 -0800 (PST) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Feb 2025 23:24:44 -0600 Message-Id: <20250219052445.86383-9-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250219052445.86383-1-romain.beauxis@gmail.com> References: <20250219052445.86383-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 8/9] libavformat/oggparseopus.c: Parse comments from secondary chained streams header packet. 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 Cc: Romain Beauxis 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: --- libavformat/oggparseopus.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c index 218e9df581..fe25ad44f3 100644 --- a/libavformat/oggparseopus.c +++ b/libavformat/oggparseopus.c @@ -29,6 +29,7 @@ struct oggopus_private { int need_comments; + int comments_parsed; unsigned pre_skip; int64_t cur_dts; }; @@ -81,7 +82,17 @@ static int opus_header(AVFormatContext *avf, int idx) if (priv->need_comments) { if (os->psize < 8 || memcmp(packet, "OpusTags", 8)) return AVERROR_INVALIDDATA; - ff_vorbis_stream_comment(avf, st, packet + 8, os->psize - 8); + + if (!priv->comments_parsed) { + ff_vorbis_stream_comment(avf, st, packet + 8, os->psize - 8); + priv->comments_parsed = 1; + } else { + ret = ff_vorbis_update_metadata(avf, st, packet + 8, os->psize - 8); + + if (ret < 0) + return ret; + } + priv->need_comments--; return 1; } -- 2.39.5 (Apple Git-154) _______________________________________________ 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".