On Sun, 29 Jan 2017, Peter Große wrote:
Signed-off-by: Peter Große <[email protected]> --- v2: add metadata field to AdaptionSet here --- libavformat/dashenc.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-)diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index a0ea9a6..4116fc8 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -61,6 +61,7 @@ typedef struct Segment { typedef struct AdaptationSet { char id[10]; enum AVMediaType media_type; + AVDictionary *metadata; } AdaptationSet; typedef struct OutputStream { @@ -186,6 +187,10 @@ static void dash_free(AVFormatContext *s) int i, j; if (c->as) { + for (i = 0; i < c->nb_as; i++) { + if (&c->as[i].metadata) + av_dict_free(&c->as[i].metadata); + } av_freep(&c->as); c->nb_as = 0; } @@ -454,10 +459,19 @@ static int write_adaptation_set(AVFormatContext *s, AVIOContext *out, int as_ind { DASHContext *c = s->priv_data; AdaptationSet *as = &c->as[as_index]; + AVDictionaryEntry *lang, *role; int i; - avio_printf(out, "\t\t<AdaptationSet id=\"%s\" contentType=\"%s\" segmentAlignment=\"true\" bitstreamSwitching=\"true\">\n", + avio_printf(out, "\t\t<AdaptationSet id=\"%s\" contentType=\"%s\" segmentAlignment=\"true\" bitstreamSwitching=\"true\"", as->id, as->media_type == AVMEDIA_TYPE_VIDEO ? "video" : "audio"); + lang = av_dict_get(as->metadata, "language", NULL, 0); + if (lang) + avio_printf(out, " lang=\"%s\"", lang->value); + avio_printf(out, ">\n"); + + role = av_dict_get(as->metadata, "role", NULL, 0); + if (role) + avio_printf(out, "\t\t\t<Role schemeIdUri=\"urn:mpeg:dash:role:2011\" value=\"%s\"/>\n", role->value); for (i = 0; i < s->nb_streams; i++) { OutputStream *os = &c->streams[i]; @@ -694,6 +708,14 @@ static int write_manifest(AVFormatContext *s, int final) return ff_rename(temp_filename, s->filename); } +static int dict_copy_entry(AVDictionary **dst, const AVDictionary *src, const char *key) +{ + AVDictionaryEntry *entry = av_dict_get(src, key, NULL, 0); + if (entry) + av_dict_set(dst, key, entry->value, AV_DICT_DONT_OVERWRITE); + return 0; +} + static int dash_write_header(AVFormatContext *s) { DASHContext *c = s->priv_data; @@ -738,6 +760,7 @@ static int dash_write_header(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { OutputStream *os = &c->streams[i]; + AdaptationSet *as = &c->as[os->as_idx - 1]; AVFormatContext *ctx; AVStream *st; AVDictionary *opts = NULL; @@ -757,6 +780,10 @@ static int dash_write_header(AVFormatContext *s) } } + // copy AdaptationSet language and role from stream metadata + dict_copy_entry(&as->metadata, s->streams[i]->metadata, "language"); + dict_copy_entry(&as->metadata, s->streams[i]->metadata, "role"); + ctx = avformat_alloc_context(); if (!ctx) { ret = AVERROR(ENOMEM); -- 2.10.2
The language part was ok'd by Anton, as for role I'm a little less sure that it isn't a hack in principle. But I guess we can let it slip - it's at least not as bad as passing bitrate in metadata.
// Martin _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
