PR #20890 opened by toots URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20890 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20890.patch
>From 7993a24cf4062fc4ed943ec5f3e66b0bbb325741 Mon Sep 17 00:00:00 2001 From: Romain Beauxis <[email protected]> Date: Fri, 14 Mar 2025 00:27:04 -0500 Subject: [PATCH] Re-initialize stream on new metadata. --- libavformat/oggenc.c | 62 ++++++++++++++++++++++++++++++++++----- tests/fate-run.sh | 9 ++++++ tests/fate/ogg-flac.mak | 5 ++++ tests/fate/ogg-opus.mak | 5 ++++ tests/fate/ogg-vorbis.mak | 5 ++++ 5 files changed, 79 insertions(+), 7 deletions(-) diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index e1bb7dd972..943fc71c12 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -40,6 +40,9 @@ #define MAX_PAGE_SIZE 65025 +static int ogg_write_trailer(AVFormatContext *s); +static void ogg_deinit(AVFormatContext *s); + typedef struct OGGPage { int64_t start_granule; int64_t granule; @@ -634,13 +637,57 @@ static int ogg_write_header(AVFormatContext *s) return 0; } +static int ogg_check_new_metadata(AVFormatContext *s, AVPacket *pkt) +{ + int ret = 0; + size_t size; + AVStream *st = s->streams[pkt->stream_index]; + const uint8_t *side_metadata = av_packet_get_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA, &size); + + if (!side_metadata) + return 0; + + if (s->nb_streams > 1) { + av_log(s, AV_LOG_WARNING, "Multiple streams present: cannot insert new metadata!\n"); + return 0; + } + + if (st->codecpar->codec_id != AV_CODEC_ID_VORBIS && + st->codecpar->codec_id != AV_CODEC_ID_FLAC && + st->codecpar->codec_id != AV_CODEC_ID_OPUS) { + av_log(s, AV_LOG_WARNING, "Inserting in-base metadata is only supported for vorbis, flac and opus streams!\n"); + return 0; + } + + ret = ogg_write_trailer(s); + if (ret < 0) + return ret; + + ogg_deinit(s); + + av_dict_free(&st->metadata); + ret = av_packet_unpack_dictionary(side_metadata, size, &st->metadata); + if (ret < 0) + return ret; + + ret = ogg_init(s); + if (ret < 0) + return ret; + + return ogg_write_header(s); +} + static int ogg_write_packet_internal(AVFormatContext *s, AVPacket *pkt) { AVStream *st = s->streams[pkt->stream_index]; - OGGStreamContext *oggstream = st->priv_data; + OGGStreamContext *oggstream; int ret; int64_t granule; + ogg_check_new_metadata(s, pkt); + + oggstream = st->priv_data; + if (st->codecpar->codec_id == AV_CODEC_ID_THEORA) { int64_t pts = oggstream->vrev < 1 ? pkt->pts : pkt->pts + pkt->duration; int pframe_count; @@ -720,7 +767,7 @@ static int ogg_write_trailer(AVFormatContext *s) return 0; } -static void ogg_free(AVFormatContext *s) +static void ogg_deinit(AVFormatContext *s) { OGGContext *ogg = s->priv_data; OGGPageList *p = ogg->page_list; @@ -738,6 +785,7 @@ static void ogg_free(AVFormatContext *s) av_freep(&oggstream->header[0]); } av_freep(&oggstream->header[1]); + av_freep(&st->priv_data); } while (p) { @@ -772,7 +820,7 @@ const FFOutputFormat ff_ogg_muxer = { .write_header = ogg_write_header, .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, - .deinit = ogg_free, + .deinit = ogg_deinit, .p.flags = AVFMT_TS_NEGATIVE | AVFMT_TS_NONSTRICT, .p.priv_class = &ogg_muxer_class, .flags_internal = FF_OFMT_FLAG_ALLOW_FLUSH, @@ -791,7 +839,7 @@ const FFOutputFormat ff_oga_muxer = { .write_header = ogg_write_header, .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, - .deinit = ogg_free, + .deinit = ogg_deinit, .p.flags = AVFMT_TS_NEGATIVE, .p.priv_class = &ogg_muxer_class, .flags_internal = FF_OFMT_FLAG_ALLOW_FLUSH, @@ -813,7 +861,7 @@ const FFOutputFormat ff_ogv_muxer = { .write_header = ogg_write_header, .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, - .deinit = ogg_free, + .deinit = ogg_deinit, .p.flags = AVFMT_TS_NEGATIVE | AVFMT_TS_NONSTRICT, .p.priv_class = &ogg_muxer_class, .flags_internal = FF_OFMT_FLAG_ALLOW_FLUSH, @@ -832,7 +880,7 @@ const FFOutputFormat ff_spx_muxer = { .write_header = ogg_write_header, .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, - .deinit = ogg_free, + .deinit = ogg_deinit, .p.flags = AVFMT_TS_NEGATIVE, .p.priv_class = &ogg_muxer_class, .flags_internal = FF_OFMT_FLAG_ALLOW_FLUSH, @@ -851,7 +899,7 @@ const FFOutputFormat ff_opus_muxer = { .write_header = ogg_write_header, .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, - .deinit = ogg_free, + .deinit = ogg_deinit, .p.flags = AVFMT_TS_NEGATIVE, .p.priv_class = &ogg_muxer_class, .flags_internal = FF_OFMT_FLAG_ALLOW_FLUSH, diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 6d1fe1185c..7e1c97c839 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -94,6 +94,15 @@ runecho(){ $target_exec $target_path/"$@" >&3 } +run_with_temp(){ + tmpfile=`mktemp` + trap 'rm -rf "$tmpfile"' EXIT + create_tmp=$1 + run $create_tmp $tmpfile + process_tmp=$2 + run $process_tmp $tmpfile +} + probefmt(){ run ffprobe${PROGSUF}${EXECSUF} -bitexact -threads $threads -show_entries format=format_name -print_format default=nw=1:nk=1 "$@" } diff --git a/tests/fate/ogg-flac.mak b/tests/fate/ogg-flac.mak index 07bdb232cb..516ebadf52 100644 --- a/tests/fate/ogg-flac.mak +++ b/tests/fate/ogg-flac.mak @@ -2,6 +2,11 @@ FATE_OGG_FLAC += fate-ogg-flac-chained-meta fate-ogg-flac-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-flac-chained-meta.txt fate-ogg-flac-chained-meta: CMD = run $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(TARGET_SAMPLES)/ogg-flac/chained-meta.ogg +FATE_OGG_FLAC += fate-ogg-flac-copy-chained-meta +fate-ogg-flac-copy-chained-meta: $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(FFMPEG) +fate-ogg-flac-copy-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-flac-chained-meta.txt +fate-ogg-flac-copy-chained-meta: CMD = run_with_temp "$(FFMPEG) -nostdin -hide_banner -loglevel quiet -i $(TARGET_SAMPLES)/ogg-flac/chained-meta.ogg -c copy -f ogg -y" "$(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF)" + FATE_OGG_FLAC-$(call DEMDEC, OGG, FLAC, FLAC_PARSER) += $(FATE_OGG_FLAC) FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_FLAC-yes) diff --git a/tests/fate/ogg-opus.mak b/tests/fate/ogg-opus.mak index 54b6fbabde..b8faabef4e 100644 --- a/tests/fate/ogg-opus.mak +++ b/tests/fate/ogg-opus.mak @@ -2,6 +2,11 @@ FATE_OGG_OPUS += fate-ogg-opus-chained-meta fate-ogg-opus-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-opus-chained-meta.txt fate-ogg-opus-chained-meta: CMD = run $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(TARGET_SAMPLES)/ogg-opus/chained-meta.ogg +FATE_OGG_OPUS += fate-ogg-opus-copy-chained-meta +fate-ogg-opus-copy-chained-meta: $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(FFMPEG) +fate-ogg-opus-copy-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-opus-chained-meta.txt +fate-ogg-opus-copy-chained-meta: CMD = run_with_temp "$(FFMPEG) -nostdin -hide_banner -loglevel quiet -i $(TARGET_SAMPLES)/ogg-opus/chained-meta.ogg -c copy -f ogg -y" "$(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF)" + FATE_OGG_OPUS-$(call DEMDEC, OGG, OPUS) += $(FATE_OGG_OPUS) FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_OPUS-yes) diff --git a/tests/fate/ogg-vorbis.mak b/tests/fate/ogg-vorbis.mak index 74805d591e..131c1362a8 100644 --- a/tests/fate/ogg-vorbis.mak +++ b/tests/fate/ogg-vorbis.mak @@ -2,6 +2,11 @@ FATE_OGG_VORBIS += fate-ogg-vorbis-chained-meta fate-ogg-vorbis-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-vorbis-chained-meta.txt fate-ogg-vorbis-chained-meta: CMD = run $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(TARGET_SAMPLES)/ogg-vorbis/chained-meta.ogg +FATE_OGG_VORBIS += fate-ogg-vorbis-copy-chained-meta +fate-ogg-vorbis-copy-chained-meta: $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(FFMPEG) +fate-ogg-vorbis-copy-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-vorbis-chained-meta.txt +fate-ogg-vorbis-copy-chained-meta: CMD = run_with_temp "$(FFMPEG) -nostdin -hide_banner -loglevel quiet -i $(TARGET_SAMPLES)/ogg-vorbis/chained-meta.ogg -c copy -f ogg -y" "$(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF)" + FATE_OGG_VORBIS-$(call DEMDEC, OGG, VORBIS) += $(FATE_OGG_VORBIS) FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_VORBIS-yes) -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
