Merge commit 'dce2929efa8e82b0832a828f7e8cb81ff8c20a4e'

[ffmpeg.git] / libavformat / dashenc.c

diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index 5a966fe..ab6bf21 100644 (file)
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -54,6 +54,7 @@ typedef struct Segment {
 typedef struct AdaptationSet {
     char id[10];
     enum AVMediaType media_type;
 typedef struct AdaptationSet {
     char id[10];
     enum AVMediaType media_type;

+    AVDictionary *metadata;

 } AdaptationSet;
 
 typedef struct OutputStream {
 } AdaptationSet;
 
 typedef struct OutputStream {


@@ -181,6 +182,8 @@ static void dash_free(AVFormatContext *s)
     int i, j;
 
     if (c->as) {
     int i, j;
 
     if (c->as) {

+        for (i = 0; i < c->nb_as; i++)
+            av_dict_free(&c->as[i].metadata);

         av_freep(&c->as);
         c->nb_as = 0;
     }
         av_freep(&c->as);
         c->nb_as = 0;
     }


@@ -336,14 +339,22 @@ static int write_adaptation_set(AVFormatContext *s, AVIOContext *out, int as_ind
 {
     DASHContext *c = s->priv_data;
     AdaptationSet *as = &c->as[as_index];
 {
     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\"",
                 as->id, as->media_type == AVMEDIA_TYPE_VIDEO ? "video" : "audio");
     if (as->media_type == AVMEDIA_TYPE_VIDEO && c->max_frame_rate.num && !c->ambiguous_frame_rate)
         avio_printf(out, " %s=\"%d/%d\"", (av_cmp_q(c->min_frame_rate, c->max_frame_rate) < 0) ? "maxFrameRate" : "frameRate", c->max_frame_rate.num, c->max_frame_rate.den);
     int i;
 
     avio_printf(out, "\t\t<AdaptationSet id=\"%s\" contentType=\"%s\" segmentAlignment=\"true\" bitstreamSwitching=\"true\"",
                 as->id, as->media_type == AVMEDIA_TYPE_VIDEO ? "video" : "audio");
     if (as->media_type == AVMEDIA_TYPE_VIDEO && c->max_frame_rate.num && !c->ambiguous_frame_rate)
         avio_printf(out, " %s=\"%d/%d\"", (av_cmp_q(c->min_frame_rate, c->max_frame_rate) < 0) ? "maxFrameRate" : "frameRate", c->max_frame_rate.num, c->max_frame_rate.den);

+    lang = av_dict_get(as->metadata, "language", NULL, 0);
+    if (lang)
+        avio_printf(out, " lang=\"%s\"", lang->value);

     avio_printf(out, ">\n");
 
     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];
 
     for (i = 0; i < s->nb_streams; i++) {
         OutputStream *os = &c->streams[i];
 


@@ -596,6 +607,14 @@ static int write_manifest(AVFormatContext *s, int final)
     return 0;
 }
 
     return 0;
 }
 

+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_init(AVFormatContext *s)
 {
     DASHContext *c = s->priv_data;
 static int dash_init(AVFormatContext *s)
 {
     DASHContext *c = s->priv_data;


@@ -637,6 +656,7 @@ static int dash_init(AVFormatContext *s)
 
     for (i = 0; i < s->nb_streams; i++) {
         OutputStream *os = &c->streams[i];
 
     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;
         AVFormatContext *ctx;
         AVStream *st;
         AVDictionary *opts = NULL;


@@ -654,6 +674,10 @@ static int dash_init(AVFormatContext *s)
                 return AVERROR(EINVAL);
         }
 
                 return AVERROR(EINVAL);
         }
 

+        // 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)
             return AVERROR(ENOMEM);
         ctx = avformat_alloc_context();
         if (!ctx)
             return AVERROR(ENOMEM);