From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 33A7C4BD08 for ; Wed, 1 Oct 2025 13:40:13 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'W40z3Sb4n84MSvfNKRo2Qu/TAhKXgslhUoA8dtG16hM=', expected b'Pmeitg3VSS9UIuJQToSZ0y5EIkmrVLpSkQ0i1k8rBwg=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1759325993; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=W40z3Sb4n84MSvfNKRo2Qu/TAhKXgslhUoA8dtG16hM=; b=WHo7LS/BgESoubjMOTRTTH+PGUza7+7LFEZ2vHC+z35w31JO50t//qDpGZBJ99YwQeV/R p9Q4HJglLniOFm8BU4OxibsHJ/DfdX4TksxOYyZJVO5YkaPs0EUjlFSFV0TAhtTYCtKkkwn COzokRJgponQUG2759SHVPqiG/SLwg01z4vA4dsjuM3FLSG4hCSGd7FSnDTbWdr7kq1Bzxe ObTYDm9Kzq1lsDaYa4xddI71W9yax+8xIMpoVVXZ3lmnhSMvThmLEm7jmEEBFgQWhuYfSR0 BL2ubCtWipNI1mGNHBaFTflKJzvz75tLt7I1teoeQrxoEpW+QnK7oLqlX0zg== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 728D168EFC9; Wed, 1 Oct 2025 16:39:53 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1759325980; b=RyMxOE8d1/KadpMjmGk1An2ysqMenBdEnCyAmcGQXEZ0VMAi3YyXLhueiPouIT0LMYCNu fsOucMbnMX8qC9ppD+OLgWxBgb/FgmK6zNLz1halMuidCpA3cvgOod07R40SqnjQ13gXrBv bg2MTaIGXwQ5hAkU5JlwaYIR9tP+0M9xE3sAPT/M3942hATqqalN4F1dPEChyp8C+ZiPGJQ b/vWvr7pZbsW16fnB8A/J5/1SeLIbwkX6FlxrMZtjoI9TCAGj8idG7NwH7dVRkYxmbxKsyb c7QkvQMcjJjWPIlYC1MlVz1TX2ewI+9f5YA951PWtLL+TRotoL0hg55MROUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1759325980; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=ym/9nDbu56Xzj9cNEWeVNmwf8S5VXrXkvq6GULvJ40s=; b=LVFp0f1hnpRtq9C6jRFe6tBsXzejBD3K4a9sOmlEcXYJZ6xdttqE1++gzJUExp7EL/aIA Aifcq5FNGH5YDD34FjiqEmJziJiPeo/00CcctQK3kujR9fSju6k+i9CzNxS/j18IIvkzCYC OHCQUd5lqFjfKVQ7PsDWY+e/mXrxoKYeTcL989+z34unAbzFYmnD3te+qoXgNWLO9qnytx1 a0ib/VlE/rYGbHumkUSCxK6dR+Jrx+T7imi0iFT/hl/OoXyS2CP/NP7jCCKKZpgZNOhbBIZ dZH68IDfquFtaBSabYw77CBqcgWd0a5mhR6ZDifz8Xkz8z8rn/MyknIeHjuQ== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1759325974; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=Pmeitg3VSS9UIuJQToSZ0y5EIkmrVLpSkQ0i1k8rBwg=; b=GQxM9YHSRDAXvqI/l/UP4Byzd2pk50hgd5TsH7goYtS5FdKfzQBDC818yrTumw+9dxPkk stgpKYDQpvAe9pwclhQo6njnsIxWevOz9JJ/2Txc5GGP029L0H+lKW+UUeqbtIvxIPD82Bs /K2wJJHDiI5lRY0t6BC0k9IVm+8faz3mUleog9gCe42q4EkgqAbM/Hx0bTUj6eFRPdA57kL wUL6q2qZIKhV+i32MNVPbiI93h5+DmB8kweI9R8REiY91plqZmaJbaed0/lA5CdImq3kXiY 3x50IcB56UYYg0EEGX/UfXtp7rM9i1PsI7NkzIpn/jS/ty9fbD3eEf+jWpUA== Received: from 13289e625de8 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id BC26068EF32 for ; Wed, 1 Oct 2025 16:39:34 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Wed, 01 Oct 2025 13:39:34 -0000 Message-ID: <175932597489.69.6704807222620492780@bf249f23a2c8> Message-ID-Hash: IV3BKZN6US3KZ7GT2M3XX6GIL7J5XUC6 X-Message-ID-Hash: IV3BKZN6US3KZ7GT2M3XX6GIL7J5XUC6 X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] Don't reset last{pts,dts} on new sequentialized ogg streams. (PR #20637) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: toots via ffmpeg-devel Cc: toots Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20637 opened by toots URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20637 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20637.patch This fixes PTS/DTS discontinuity on sequentialized ogg streams. >>From 98c89233807a1efae0ebaa1cb9ae4ff6c09b8969 Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Mon, 4 Aug 2025 09:00:28 -0500 Subject: [PATCH 1/6] ogg/vorbis: implement header packet skip in chained ogg bitstreams. --- doc/APIchanges | 4 + libavformat/oggparsevorbis.c | 85 +++++++++++++++++++++- tests/ref/fate/ogg-vorbis-chained-meta.txt | 3 - 3 files changed, 85 insertions(+), 7 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 9d629f766f..6e7f5d2037 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,10 @@ The last version increases of all libraries were on 2025-03-28 API changes, most recent first: +2025-08-xx - xxxxxxxxxx - lavf 62.6.100 - oggparsevorbis.h oggparseopus.h oggparseflac.h + Drop header packets from secondary chained ogg/{flac, opus, vorbis} streams + from demuxer output. + 2025-09-xx - xxxxxxxxxx - lavu 60.13.100 - hwcontext_d3d12va.h Add resource_flags and heap_flags to AVD3D12VADeviceContext Add heap_flags to AVD3D12VAFramesContext diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 62cc2da6de..1af2f21a82 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -215,6 +215,12 @@ struct oggvorbis_private { AVVorbisParseContext *vp; int64_t final_pts; int final_duration; + uint8_t *header; + int header_size; + uint8_t *comment; + int comment_size; + uint8_t *setup; + int setup_size; }; static int fixup_vorbis_headers(AVFormatContext *as, @@ -260,6 +266,10 @@ static void vorbis_cleanup(AVFormatContext *s, int idx) av_vorbis_parse_free(&priv->vp); for (i = 0; i < 3; i++) av_freep(&priv->packet[i]); + + av_freep(&priv->header); + av_freep(&priv->comment); + av_freep(&priv->setup); } } @@ -434,6 +444,9 @@ static int vorbis_packet(AVFormatContext *s, int idx) struct ogg_stream *os = ogg->streams + idx; struct oggvorbis_private *priv = os->private; int duration, flags = 0; + int skip_packet = 0; + int ret, new_extradata_size; + PutByteContext pb; if (!priv->vp) return AVERROR_INVALIDDATA; @@ -496,10 +509,50 @@ static int vorbis_packet(AVFormatContext *s, int idx) if (duration < 0) { os->pflags |= AV_PKT_FLAG_CORRUPT; return 0; - } else if (flags & VORBIS_FLAG_COMMENT) { - vorbis_update_metadata(s, idx); - flags = 0; } + + if (flags & VORBIS_FLAG_HEADER) { + ret = vorbis_parse_header(s, s->streams[idx], os->buf + os->pstart, os->psize); + if (ret < 0) + return ret; + + ret = av_reallocp(&priv->header, os->psize); + if (ret < 0) + return ret; + + memcpy(priv->header, os->buf + os->pstart, os->psize); + priv->header_size = os->psize; + + skip_packet = 1; + } + + if (flags & VORBIS_FLAG_COMMENT) { + ret = vorbis_update_metadata(s, idx); + if (ret < 0) + return ret; + + ret = av_reallocp(&priv->comment, os->psize); + if (ret < 0) + return ret; + + memcpy(priv->comment, os->buf + os->pstart, os->psize); + priv->comment_size = os->psize; + + flags = 0; + skip_packet = 1; + } + + if (flags & VORBIS_FLAG_SETUP) { + ret = av_reallocp(&priv->setup, os->psize); + if (ret < 0) + return ret; + + memcpy(priv->setup, os->buf + os->pstart, os->psize); + priv->setup_size = os->psize; + + skip_packet = 1; + } + os->pduration = duration; } @@ -521,7 +574,31 @@ static int vorbis_packet(AVFormatContext *s, int idx) priv->final_duration += os->pduration; } - return 0; + if (priv->header && priv->comment && priv->setup) { + new_extradata_size = priv->header_size + priv->comment_size + priv->setup_size + 6; + + ret = av_reallocp(&os->new_extradata, new_extradata_size); + if (ret < 0) + return ret; + + os->new_extradata_size = new_extradata_size; + bytestream2_init_writer(&pb, os->new_extradata, new_extradata_size); + bytestream2_put_be16(&pb, priv->header_size); + bytestream2_put_buffer(&pb, priv->header, priv->header_size); + bytestream2_put_be16(&pb, priv->comment_size); + bytestream2_put_buffer(&pb, priv->comment, priv->comment_size); + bytestream2_put_be16(&pb, priv->setup_size); + bytestream2_put_buffer(&pb, priv->setup, priv->setup_size); + + av_freep(&priv->header); + priv->header_size = 0; + av_freep(&priv->comment); + priv->comment_size = 0; + av_freep(&priv->setup); + priv->setup_size = 0; + } + + return skip_packet; } const struct ogg_codec ff_vorbis_codec = { diff --git a/tests/ref/fate/ogg-vorbis-chained-meta.txt b/tests/ref/fate/ogg-vorbis-chained-meta.txt index b7a97c90e2..1206f86c1f 100644 --- a/tests/ref/fate/ogg-vorbis-chained-meta.txt +++ b/tests/ref/fate/ogg-vorbis-chained-meta.txt @@ -6,10 +6,7 @@ Stream ID: 0, frame PTS: 128, metadata: N/A Stream ID: 0, packet PTS: 704, packet DTS: 704 Stream ID: 0, frame PTS: 704, metadata: N/A Stream ID: 0, packet PTS: 0, packet DTS: 0 -Stream ID: 0, packet PTS: 0, packet DTS: 0 Stream ID: 0, new metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream -Stream ID: 0, packet PTS: 0, packet DTS: 0 -Stream ID: 0, packet PTS: 0, packet DTS: 0 Stream ID: 0, frame PTS: 0, metadata: N/A Stream ID: 0, packet PTS: 128, packet DTS: 128 Stream ID: 0, frame PTS: 128, metadata: N/A -- 2.49.1 >>From cc31466a5016d3e4b2cfe2858fb84601a318c857 Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Tue, 18 Feb 2025 22:32:03 -0600 Subject: [PATCH 2/6] libavformat/oggdec.h, libavformat/oggparsevorbis.c: Factor out vorbis metadata update mechanism. --- libavformat/oggdec.h | 14 ++++++++++++++ libavformat/oggparsevorbis.c | 25 +++++++++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 256a17c5e3..6776782ddf 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -160,6 +160,20 @@ int ff_vorbis_comment(AVFormatContext *ms, AVDictionary **m, int ff_vorbis_stream_comment(AVFormatContext *as, AVStream *st, const uint8_t *buf, int size); +/** + * Parse Vorbis comments, add metadata to an AVStream + * + * This function also attaches the metadata to the next decoded + * packet as AV_PKT_DATA_METADATA_UPDATE + * + * @note The buffer will be temporarily modified by this function, + * so it needs to be writable. Furthermore it must be padded + * by a single byte (not counted in size). + * All changes will have been reverted upon return. + */ +int ff_vorbis_update_metadata(AVFormatContext *s, AVStream *st, + const uint8_t *buf, int size); + static inline int ogg_find_stream (struct ogg * ogg, int serial) { diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 1af2f21a82..7c4f7624f8 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -273,20 +273,16 @@ static void vorbis_cleanup(AVFormatContext *s, int idx) } } -static int vorbis_update_metadata(AVFormatContext *s, int idx) +int ff_vorbis_update_metadata(AVFormatContext *s, AVStream *st, + const uint8_t *buf, int size) { struct ogg *ogg = s->priv_data; - struct ogg_stream *os = ogg->streams + idx; - AVStream *st = s->streams[idx]; + struct ogg_stream *os = ogg->streams + st->index; int ret; - if (os->psize <= 8) - return 0; - /* New metadata packet; release old data. */ av_dict_free(&st->metadata); - ret = ff_vorbis_stream_comment(s, st, os->buf + os->pstart + 7, - os->psize - 8); + ret = ff_vorbis_stream_comment(s, st, buf, size); if (ret < 0) return ret; @@ -359,6 +355,19 @@ static int vorbis_parse_header(AVFormatContext *s, AVStream *st, return 1; } +static int vorbis_update_metadata(AVFormatContext *s, int idx) +{ + struct ogg *ogg = s->priv_data; + struct ogg_stream *os = ogg->streams + idx; + AVStream *st = s->streams[idx]; + + if (os->psize <= 8) + return 0; + + return ff_vorbis_update_metadata(s, st, os->buf + os->pstart + 7, + os->psize - 8); +} + static int vorbis_header(AVFormatContext *s, int idx) { struct ogg *ogg = s->priv_data; -- 2.49.1 >>From 18b8507cb606d95f440df239485dd75df6b33678 Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Fri, 14 Feb 2025 09:39:45 -0600 Subject: [PATCH 3/6] libavformat/oggdec.c: Use AV_PKT_DATA_STRINGS_METADATA to pass metadata updates. --- libavformat/oggdec.c | 2 +- libavformat/oggdec.h | 2 +- tests/ref/fate/ogg-vorbis-chained-meta.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 9dc2c62035..9f3a92a5ea 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -880,7 +880,7 @@ retry: } if (os->new_metadata) { - ret = av_packet_add_side_data(pkt, AV_PKT_DATA_METADATA_UPDATE, + ret = av_packet_add_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA, os->new_metadata, os->new_metadata_size); if (ret < 0) return ret; diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 6776782ddf..b051b651e3 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -164,7 +164,7 @@ int ff_vorbis_stream_comment(AVFormatContext *as, AVStream *st, * Parse Vorbis comments, add metadata to an AVStream * * This function also attaches the metadata to the next decoded - * packet as AV_PKT_DATA_METADATA_UPDATE + * packet as AV_PKT_DATA_STRINGS_METADATA * * @note The buffer will be temporarily modified by this function, * so it needs to be writable. Furthermore it must be padded diff --git a/tests/ref/fate/ogg-vorbis-chained-meta.txt b/tests/ref/fate/ogg-vorbis-chained-meta.txt index 1206f86c1f..60d9aeb9fa 100644 --- a/tests/ref/fate/ogg-vorbis-chained-meta.txt +++ b/tests/ref/fate/ogg-vorbis-chained-meta.txt @@ -7,7 +7,7 @@ Stream ID: 0, packet PTS: 704, packet DTS: 704 Stream ID: 0, frame PTS: 704, metadata: N/A Stream ID: 0, packet PTS: 0, packet DTS: 0 Stream ID: 0, new metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream -Stream ID: 0, frame PTS: 0, metadata: N/A +Stream ID: 0, frame PTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream Stream ID: 0, packet PTS: 128, packet DTS: 128 Stream ID: 0, frame PTS: 128, metadata: N/A Stream ID: 0, packet PTS: 704, packet DTS: 704 -- 2.49.1 >>From 1787d758be0fef7f030104a7b14e12c67e24181a Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Tue, 4 Feb 2025 07:03:49 -0500 Subject: [PATCH 4/6] libavformat/oggparseflac.c: Parse ogg/flac comments in new ogg packets, add them to ogg stream new_metadata. --- libavformat/oggparseflac.c | 7 +++++++ tests/ref/fate/ogg-flac-chained-meta.txt | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c index d66b85b09e..e81e4021a1 100644 --- a/libavformat/oggparseflac.c +++ b/libavformat/oggparseflac.c @@ -85,6 +85,8 @@ flac_packet (AVFormatContext * s, int idx) { struct ogg *ogg = s->priv_data; struct ogg_stream *os = ogg->streams + idx; + AVStream *st = s->streams[idx]; + int ret; if (os->psize > OGG_FLAC_MAGIC_SIZE && !memcmp( @@ -95,6 +97,11 @@ flac_packet (AVFormatContext * s, int idx) if (os->psize > 0 && ((os->buf[os->pstart] & 0x7F) == FLAC_METADATA_TYPE_VORBIS_COMMENT)) { + ret = ff_vorbis_update_metadata(s, st, os->buf + os->pstart + 4, + os->psize - 4); + if (ret < 0) + return ret; + return 1; } diff --git a/tests/ref/fate/ogg-flac-chained-meta.txt b/tests/ref/fate/ogg-flac-chained-meta.txt index 28e22aa29e..5abf37dcee 100644 --- a/tests/ref/fate/ogg-flac-chained-meta.txt +++ b/tests/ref/fate/ogg-flac-chained-meta.txt @@ -5,6 +5,7 @@ Stream ID: 0, frame PTS: 0, metadata: N/A Stream ID: 0, packet PTS: 4608, packet DTS: 4608 Stream ID: 0, frame PTS: 4608, metadata: N/A Stream ID: 0, packet PTS: 0, packet DTS: 0 -Stream ID: 0, frame PTS: 0, metadata: N/A +Stream ID: 0, new metadata: encoder=Lavc61.19.100 flac:title=Second Stream +Stream ID: 0, frame PTS: 0, metadata: encoder=Lavc61.19.100 flac:title=Second Stream Stream ID: 0, packet PTS: 4608, packet DTS: 4608 Stream ID: 0, frame PTS: 4608, metadata: N/A -- 2.49.1 >>From ccfe1e3ba86a95c8c80455b1c7864b291b928dcb Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Mon, 10 Feb 2025 11:48:03 -0600 Subject: [PATCH 5/6] libavformat/oggparseopus.c: Parse comments from secondary chained streams header packet. --- libavformat/oggparseopus.c | 5 +++++ tests/ref/fate/ogg-opus-chained-meta.txt | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c index 65b93b4053..ae4ff22c53 100644 --- a/libavformat/oggparseopus.c +++ b/libavformat/oggparseopus.c @@ -154,6 +154,11 @@ static int opus_packet(AVFormatContext *avf, int idx) } if (os->psize > 8 && !memcmp(packet, "OpusTags", 8)) { + ret = ff_vorbis_update_metadata(avf, st, os->buf + os->pstart + 8, + os->psize - 8); + if (ret < 0) + return ret; + priv->need_comments = 0; return 1; } diff --git a/tests/ref/fate/ogg-opus-chained-meta.txt b/tests/ref/fate/ogg-opus-chained-meta.txt index addc41c1eb..aad9b83700 100644 --- a/tests/ref/fate/ogg-opus-chained-meta.txt +++ b/tests/ref/fate/ogg-opus-chained-meta.txt @@ -13,7 +13,8 @@ Stream ID: 0, frame PTS: 3528, metadata: N/A Stream ID: 0, packet PTS: 4488, packet DTS: 4488 Stream ID: 0, frame PTS: 4488, metadata: N/A Stream ID: 0, packet PTS: -312, packet DTS: -312 -Stream ID: 0, frame PTS: -312, metadata: N/A +Stream ID: 0, new metadata: encoder=Lavc61.19.100 libopus:title=Second Stream +Stream ID: 0, frame PTS: -312, metadata: encoder=Lavc61.19.100 libopus:title=Second Stream Stream ID: 0, packet PTS: 648, packet DTS: 648 Stream ID: 0, frame PTS: 648, metadata: N/A Stream ID: 0, packet PTS: 1608, packet DTS: 1608 -- 2.49.1 >>From 0d75fa2fcc76601c80f26e53f97b6c17d64643d8 Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Tue, 30 Sep 2025 20:23:04 -0500 Subject: [PATCH 6/6] Don't reset last{pts,dts} on new sequentialized ogg streams. This fixes PTS/DTS discontinuity on sequentialized ogg streams. --- libavformat/oggdec.c | 2 -- tests/ref/fate/ogg-flac-chained-meta.txt | 8 ++++---- tests/ref/fate/ogg-opus-chained-meta.txt | 24 +++++++++++----------- tests/ref/fate/ogg-vorbis-chained-meta.txt | 12 +++++------ 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 9f3a92a5ea..28a22fac9f 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -235,8 +235,6 @@ static int ogg_replace_stream(AVFormatContext *s, uint32_t serial, char *magic, os->serial = serial; os->codec = codec; os->serial = serial; - os->lastpts = 0; - os->lastdts = 0; os->start_trimming = 0; os->end_trimming = 0; diff --git a/tests/ref/fate/ogg-flac-chained-meta.txt b/tests/ref/fate/ogg-flac-chained-meta.txt index 5abf37dcee..877b3f3173 100644 --- a/tests/ref/fate/ogg-flac-chained-meta.txt +++ b/tests/ref/fate/ogg-flac-chained-meta.txt @@ -4,8 +4,8 @@ Stream ID: 0, new metadata: encoder=Lavc61.19.100 flac:title=First Stream Stream ID: 0, frame PTS: 0, metadata: N/A Stream ID: 0, packet PTS: 4608, packet DTS: 4608 Stream ID: 0, frame PTS: 4608, metadata: N/A -Stream ID: 0, packet PTS: 0, packet DTS: 0 +Stream ID: 0, packet PTS: 8820, packet DTS: 8820 Stream ID: 0, new metadata: encoder=Lavc61.19.100 flac:title=Second Stream -Stream ID: 0, frame PTS: 0, metadata: encoder=Lavc61.19.100 flac:title=Second Stream -Stream ID: 0, packet PTS: 4608, packet DTS: 4608 -Stream ID: 0, frame PTS: 4608, metadata: N/A +Stream ID: 0, frame PTS: 8820, metadata: encoder=Lavc61.19.100 flac:title=Second Stream +Stream ID: 0, packet PTS: 13428, packet DTS: 13428 +Stream ID: 0, frame PTS: 13428, metadata: N/A diff --git a/tests/ref/fate/ogg-opus-chained-meta.txt b/tests/ref/fate/ogg-opus-chained-meta.txt index aad9b83700..5c2b9d0d44 100644 --- a/tests/ref/fate/ogg-opus-chained-meta.txt +++ b/tests/ref/fate/ogg-opus-chained-meta.txt @@ -12,16 +12,16 @@ Stream ID: 0, packet PTS: 3528, packet DTS: 3528 Stream ID: 0, frame PTS: 3528, metadata: N/A Stream ID: 0, packet PTS: 4488, packet DTS: 4488 Stream ID: 0, frame PTS: 4488, metadata: N/A -Stream ID: 0, packet PTS: -312, packet DTS: -312 +Stream ID: 0, packet PTS: 4800, packet DTS: 4800 Stream ID: 0, new metadata: encoder=Lavc61.19.100 libopus:title=Second Stream -Stream ID: 0, frame PTS: -312, metadata: encoder=Lavc61.19.100 libopus:title=Second Stream -Stream ID: 0, packet PTS: 648, packet DTS: 648 -Stream ID: 0, frame PTS: 648, metadata: N/A -Stream ID: 0, packet PTS: 1608, packet DTS: 1608 -Stream ID: 0, frame PTS: 1608, metadata: N/A -Stream ID: 0, packet PTS: 2568, packet DTS: 2568 -Stream ID: 0, frame PTS: 2568, metadata: N/A -Stream ID: 0, packet PTS: 3528, packet DTS: 3528 -Stream ID: 0, frame PTS: 3528, metadata: N/A -Stream ID: 0, packet PTS: 4488, packet DTS: 4488 -Stream ID: 0, frame PTS: 4488, metadata: N/A +Stream ID: 0, frame PTS: 4800, metadata: encoder=Lavc61.19.100 libopus:title=Second Stream +Stream ID: 0, packet PTS: 5760, packet DTS: 5760 +Stream ID: 0, frame PTS: 5760, metadata: N/A +Stream ID: 0, packet PTS: 6720, packet DTS: 6720 +Stream ID: 0, frame PTS: 6720, metadata: N/A +Stream ID: 0, packet PTS: 7680, packet DTS: 7680 +Stream ID: 0, frame PTS: 7680, metadata: N/A +Stream ID: 0, packet PTS: 8640, packet DTS: 8640 +Stream ID: 0, frame PTS: 8640, metadata: N/A +Stream ID: 0, packet PTS: 9600, packet DTS: 9600 +Stream ID: 0, frame PTS: 9600, metadata: N/A diff --git a/tests/ref/fate/ogg-vorbis-chained-meta.txt b/tests/ref/fate/ogg-vorbis-chained-meta.txt index 60d9aeb9fa..5ec756663d 100644 --- a/tests/ref/fate/ogg-vorbis-chained-meta.txt +++ b/tests/ref/fate/ogg-vorbis-chained-meta.txt @@ -5,10 +5,10 @@ Stream ID: 0, packet PTS: 128, packet DTS: 128 Stream ID: 0, frame PTS: 128, metadata: N/A Stream ID: 0, packet PTS: 704, packet DTS: 704 Stream ID: 0, frame PTS: 704, metadata: N/A -Stream ID: 0, packet PTS: 0, packet DTS: 0 +Stream ID: 0, packet PTS: 1323, packet DTS: 1323 Stream ID: 0, new metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream -Stream ID: 0, frame PTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream -Stream ID: 0, packet PTS: 128, packet DTS: 128 -Stream ID: 0, frame PTS: 128, metadata: N/A -Stream ID: 0, packet PTS: 704, packet DTS: 704 -Stream ID: 0, frame PTS: 704, metadata: N/A +Stream ID: 0, frame PTS: 1323, metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream +Stream ID: 0, packet PTS: 1451, packet DTS: 1451 +Stream ID: 0, frame PTS: 1451, metadata: N/A +Stream ID: 0, packet PTS: 2027, packet DTS: 2027 +Stream ID: 0, frame PTS: 2027, metadata: N/A -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org