Le mar. 18 févr. 2025 à 23:25, Romain Beauxis <romain.beau...@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-requ...@ffmpeg.org with subject "unsubscribe".
