From bc79ded75a63ae79a1119f5ca578d41fca04b283 Mon Sep 17 00:00:00 2001 From: Kevin Mitchell Date: Sun, 13 Apr 2014 05:01:55 -0700 Subject: mp_tags: move generic mp_tags stuff into its own .c/.h files in common/ rename add_metadata to the more genera/descriptive mp_tags_copy_items_from_av_dictionary Signed-off-by: wm4 --- demux/demux_lavf.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'demux/demux_lavf.c') diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index ceff978afb..90fde22eba 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -41,6 +41,7 @@ #include "options/options.h" #include "common/msg.h" +#include "common/tags.h" #include "common/av_opts.h" #include "common/av_common.h" #include "bstr/bstr.h" @@ -560,13 +561,6 @@ static void add_new_streams(demuxer_t *demuxer) handle_stream(demuxer, priv->num_streams); } -static void add_metadata(struct mp_tags *tags, AVDictionary *metadata) -{ - AVDictionaryEntry *t = NULL; - while ((t = av_dict_get(metadata, "", t, AV_DICT_IGNORE_SUFFIX))) - mp_tags_set_str(tags, t->key, t->value); -} - static void update_metadata(demuxer_t *demuxer, AVPacket *pkt) { #if HAVE_AVCODEC_METADATA_UPDATE_SIDE_DATA @@ -578,7 +572,7 @@ static void update_metadata(demuxer_t *demuxer, AVPacket *pkt) av_packet_unpack_dictionary(md, md_size, &dict); if (dict) { mp_tags_clear(demuxer->metadata); - add_metadata(demuxer->metadata, dict); + mp_tags_copy_from_av_dictionary(demuxer->metadata, dict); av_dict_free(&dict); } } @@ -706,19 +700,19 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check) t = av_dict_get(c->metadata, "title", NULL, 0); int index = demuxer_add_chapter(demuxer, t ? bstr0(t->value) : bstr0(""), start, end, i); - add_metadata(demuxer->chapters[index].metadata, c->metadata); + mp_tags_copy_from_av_dictionary(demuxer->chapters[index].metadata, c->metadata); } add_new_streams(demuxer); - add_metadata(demuxer->metadata, avfc->metadata); + mp_tags_copy_from_av_dictionary(demuxer->metadata, avfc->metadata); // Often useful with OGG audio-only files, which have metadata in the audio // track metadata instead of the main metadata. if (demuxer->num_streams == 1) { for (int n = 0; n < priv->num_streams; n++) { if (priv->streams[n]) - add_metadata(demuxer->metadata, avfc->streams[n]->metadata); + mp_tags_copy_from_av_dictionary(demuxer->metadata, avfc->streams[n]->metadata); } } -- cgit v1.2.3