From: Romain Beauxis <romain.beauxis@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH v6 4/9] tests: Add chained ogg/vorbis stream dump test.
Date: Wed, 19 Feb 2025 11:53:24 -0600
Message-ID: <CABWZ6OQLnTEAgbjtYHsZhfGbznEEoWPVLUJEwXaGz2gQBbuxDQ@mail.gmail.com> (raw)
In-Reply-To: <20250219052445.86383-5-romain.beauxis@gmail.com>
Le mar. 18 févr. 2025 à 23:25, Romain Beauxis
<romain.beauxis@gmail.com> a écrit :
>
> Samples available at: https://www.dropbox.com/scl/fo/xrtrna2rxr1j354hrtymq/AGwemlxHYecBLNmQ8Fsy--4?rlkey=lzilr4m9w4gfdqygoe172vvy8&dl=0
>
> Before the changes:
> Stream ID: 0, codec name: vorbis, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream
> Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream
> Stream ID: 0, packet PTS: 128, packet DTS: 128, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream
> Stream ID: 0, frame PTS: 128, metadata:
> Stream ID: 0, packet PTS: 704, packet DTS: 704, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream
> Stream ID: 0, frame PTS: 704, metadata:
> Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream
> Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis:title=First Stream;Second Stream;Second Stream
> Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis:title=First Stream;Second Stream;Second Stream
> Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis:title=First Stream;Second Stream;Second Stream
> Stream ID: 0, frame PTS: 0, metadata:
> Stream ID: 0, packet PTS: 128, packet DTS: 128, metadata: encoder=Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis:title=First Stream;Second Stream;Second Stream
> Stream ID: 0, frame PTS: 128, metadata:
> Stream ID: 0, packet PTS: 704, packet DTS: 704, metadata: encoder=Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis;Lavc61.19.100 libvorbis:title=First Stream;Second Stream;Second Stream
> Stream ID: 0, frame PTS: 704, metadata:
>
> After the changes:
> Stream ID: 0, codec name: vorbis, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream
> Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream
> Stream ID: 0, packet PTS: 128, packet DTS: 128, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream
> Stream ID: 0, frame PTS: 128, metadata:
> Stream ID: 0, packet PTS: 704, packet DTS: 704, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream
> Stream ID: 0, frame PTS: 704, metadata:
> Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=First Stream
> Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream
> Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream
> Stream ID: 0, packet PTS: 0, packet DTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream
> Stream ID: 0, frame PTS: 0, metadata:
> Stream ID: 0, packet PTS: 128, packet DTS: 128, metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream
> Stream ID: 0, frame PTS: 128, metadata:
> Stream ID: 0, packet PTS: 704, packet DTS: 704, metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream
> Stream ID: 0, frame PTS: 704, metadata:
>
> ---
> tests/Makefile | 1 +
> tests/api/api-dump-stream-meta-test.c | 14 ++++++++++----
> tests/fate/ogg-vorbis.mak | 11 +++++++++++
> 3 files changed, 22 insertions(+), 4 deletions(-)
> create mode 100644 tests/fate/ogg-vorbis.mak
>
> diff --git a/tests/Makefile b/tests/Makefile
> index 1f7e5003c2..cffa586e8d 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -219,6 +219,7 @@ include $(SRC_PATH)/tests/fate/mpeg4.mak
> include $(SRC_PATH)/tests/fate/mpegps.mak
> include $(SRC_PATH)/tests/fate/mpegts.mak
> include $(SRC_PATH)/tests/fate/mxf.mak
> +include $(SRC_PATH)/tests/fate/ogg-vorbis.mak
> include $(SRC_PATH)/tests/fate/oma.mak
> include $(SRC_PATH)/tests/fate/opus.mak
> include $(SRC_PATH)/tests/fate/pcm.mak
> diff --git a/tests/api/api-dump-stream-meta-test.c b/tests/api/api-dump-stream-meta-test.c
> index 4ffdfe8213..10570fa495 100644
> --- a/tests/api/api-dump-stream-meta-test.c
> +++ b/tests/api/api-dump-stream-meta-test.c
> @@ -36,6 +36,7 @@ static int dump_stream_meta(const char *input_filename)
> AVFormatContext *fmt_ctx = NULL;
> AVCodecContext *ctx = NULL;
> AVCodecParameters *origin_par = NULL;
> + AVStream *st;
> int audio_stream;
> int result;
> char *metadata;
> @@ -62,9 +63,9 @@ static int dump_stream_meta(const char *input_filename)
> }
>
> origin_par = fmt_ctx->streams[audio_stream]->codecpar;
> + st = fmt_ctx->streams[audio_stream];
>
> - result = av_dict_get_string(
> - fmt_ctx->streams[audio_stream]->metadata, &metadata, '=', ':');
> + result = av_dict_get_string(st->metadata, &metadata, '=', ':');
> if (result < 0)
> goto end;
>
> @@ -121,8 +122,13 @@ static int dump_stream_meta(const char *input_filename)
> continue;
> }
>
> - printf("Stream ID: %d, packet PTS: %s, packet DTS: %s\n",
> - pkt->stream_index, av_ts2str(pkt->pts), av_ts2str(pkt->dts));
> + result = av_dict_get_string(st->metadata, &metadata, '=', ':');
> + if (result < 0)
> + goto end;
> +
> + printf("Stream ID: %d, packet PTS: %s, packet DTS: %s, metadata: %s\n",
> + pkt->stream_index, av_ts2str(pkt->pts), av_ts2str(pkt->dts),
> + metadata);
This is a rebase mistake. Happy to re-send a final, cleaned up series
if the rest of the patchset is ok.
> result = avcodec_send_packet(ctx, pkt);
> av_packet_unref(pkt);
> diff --git a/tests/fate/ogg-vorbis.mak b/tests/fate/ogg-vorbis.mak
> new file mode 100644
> index 0000000000..55052fe3d1
> --- /dev/null
> +++ b/tests/fate/ogg-vorbis.mak
> @@ -0,0 +1,11 @@
> +FATE_OGG_VORBIS += fate-ogg-vorbis-chained-meta
> +fate-ogg-vorbis-chained-meta: REF = $(SAMPLES)/ogg-vorbis/chained-meta.txt
> +fate-ogg-vorbis-chained-meta: CMD = $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(TARGET_SAMPLES)/ogg-vorbis/chained-meta.ogg
> +
> +FATE_OGG_VORBIS-$(call DEMDEC, OGG, VORBIS) += $(FATE_OGG_VORBIS)
> +
> +FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_VORBIS-yes)
> +
> +FATE_EXTERN += $(FATE_OGG_VORBIS-yes)
> +
> +fate-ogg-vorbis: $(FATE_OGG_VORBIS-yes)
> --
> 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".
next prev parent reply other threads:[~2025-02-19 17:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-19 5:24 [FFmpeg-devel] [PATCH v6 0/9] Properly decode ogg metadata in ogg/{vorbis, flac, opus} chained bitstreams Romain Beauxis
2025-02-19 5:24 ` [FFmpeg-devel] [PATCH v6 1/9] libavcodec/decode.c: Add generic metadata injection using AV_PKT_DATA_METADATA_UPDATE Romain Beauxis
2025-02-19 5:24 ` [FFmpeg-devel] [PATCH v6 2/9] tests: Add stream dump test API util Romain Beauxis
2025-02-19 5:24 ` [FFmpeg-devel] [PATCH v6 3/9] libavformat/oggparsevorbis.c: Don't append new metadata Romain Beauxis
2025-02-19 5:24 ` [FFmpeg-devel] [PATCH v6 4/9] tests: Add chained ogg/vorbis stream dump test Romain Beauxis
2025-02-19 17:53 ` Romain Beauxis [this message]
2025-02-19 5:24 ` [FFmpeg-devel] [PATCH v6 5/9] libavformat/oggdec.h, libavformat/oggparsevorbis.c: Factor out vorbis metadata update mechanism Romain Beauxis
2025-02-19 5:24 ` [FFmpeg-devel] [PATCH v6 6/9] libavformat/oggparseflac.c: Parse ogg/flac comments in new ogg packets, add them to ogg stream new_metadata Romain Beauxis
2025-02-19 5:24 ` [FFmpeg-devel] [PATCH v6 7/9] tests: Add chained ogg/flac stream dump test Romain Beauxis
2025-02-21 11:01 ` Michael Niedermayer
2025-02-21 15:40 ` Romain Beauxis
2025-02-19 5:24 ` [FFmpeg-devel] [PATCH v6 8/9] libavformat/oggparseopus.c: Parse comments from secondary chained streams header packet Romain Beauxis
2025-02-19 5:24 ` [FFmpeg-devel] [PATCH v6 9/9] tests: Add chained ogg/opus stream dump test Romain Beauxis
2025-02-19 18:17 ` [FFmpeg-devel] [PATCH v6 0/9] Properly decode ogg metadata in ogg/{vorbis, flac, opus} chained bitstreams Lynne
2025-02-19 18:57 ` Romain Beauxis
2025-02-21 15:41 ` Romain Beauxis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABWZ6OQLnTEAgbjtYHsZhfGbznEEoWPVLUJEwXaGz2gQBbuxDQ@mail.gmail.com \
--to=romain.beauxis@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git