sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-10-24 02:09:03 +03:00
Code Activity

avformat/mpegts: update stream metadata from timed_id3 packets

Browse Source 
Set AVSTREAM_EVENT_FLAG_METADATA_UPDATED so applications can detect
mid-stream metadata changes without inspecting packet side data.
This commit is contained in:
Romain Beauxis
2026-04-22 21:00:52 -05:00
parent f6838b8636
commit 80375ca773
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libavformat/mpegts.c
View File

@@ -43,6 +43,7 @@
#include "demux.h"
#include "mpeg.h"
#include "isom.h"
#include "id3v2.h"
#if CONFIG_ICONV
#include <iconv.h>
#endif
@@ -1029,6 +1030,30 @@ static void new_data_packet(const uint8_t *buffer, int len, AVPacket *pkt)
pkt->size = len;
}
static int timed_id3_update_metadata(AVStream *s, AVPacket *pkt)
{
FFIOContext id3_buf;
ID3v2ExtraMeta *extra_meta = NULL;
AVDictionary *metadata = NULL;
int ret = 0;
ffio_init_read_context(&id3_buf, pkt->data, pkt->size);
ff_id3v2_read_dict(&id3_buf.pub, &metadata, ID3v2_DEFAULT_MAGIC, &extra_meta);
ret = ff_id3v2_parse_priv_dict(&metadata, extra_meta);
ff_id3v2_free_extra_meta(&extra_meta);
if (ret < 0 || !av_dict_count(metadata))
goto end;
ret = av_dict_copy(&s->metadata, metadata, 0);
if (ret == 0)
s->event_flags |= AVSTREAM_EVENT_FLAG_METADATA_UPDATED;
end:
av_dict_free(&metadata);
return ret;
}
static int new_pes_packet(PESContext *pes, AVPacket *pkt)
{
uint8_t *sd;
@@ -1083,6 +1108,12 @@ static int new_pes_packet(PESContext *pes, AVPacket *pkt)
return AVERROR(ENOMEM);
*sd = pes->stream_id;
if (pes->st->codecpar->codec_id == AV_CODEC_ID_TIMED_ID3) {
int ret = timed_id3_update_metadata(pes->st, pkt);
if (ret < 0)
return ret;
}
return 0;
}

2
tests/ref/fate/ts-timed-id3-demux
View File

@@ -1,4 +1,4 @@
packet|codec_type=data|stream_index=0|pts=126000|pts_time=1.400000|dts=126000|dts_time=1.400000|duration=N/A|duration_time=N/A|size=26|pos=564|flags=K__|data_hash=CRC32:469f474b|side_datum/mpegts_stream_id:side_data_type=MPEGTS Stream ID|side_datum/mpegts_stream_id:id=189
packet|codec_type=data|stream_index=0|pts=577350|pts_time=6.415000|dts=577350|dts_time=6.415000|duration=N/A|duration_time=N/A|size=26|pos=1316|flags=K__|data_hash=CRC32:469f474b|side_datum/mpegts_stream_id:side_data_type=MPEGTS Stream ID|side_datum/mpegts_stream_id:id=189
stream|index=0|codec_name=timed_id3|profile=unknown|codec_type=data|codec_tag_string=ID3 |codec_tag=0x20334449|ts_id=1|ts_packetsize=188|id=0x100|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/90000|start_pts=126000|start_time=1.400000|duration_ts=451350|duration=5.015000|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=2|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|disposition:multilayer=0
stream|index=0|codec_name=timed_id3|profile=unknown|codec_type=data|codec_tag_string=ID3 |codec_tag=0x20334449|ts_id=1|ts_packetsize=188|id=0x100|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/90000|start_pts=126000|start_time=1.400000|duration_ts=451350|duration=5.015000|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=2|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|disposition:multilayer=0|tag:title=test
format|filename=id3.ts|nb_streams=1|nb_programs=1|nb_stream_groups=0|format_name=mpegts|start_time=1.400000|duration=5.015000|size=1504|bit_rate=2399|probe_score=2