Merge commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18'
authorClément Bœsch <u@pkh.me>
Sat, 20 May 2017 14:37:04 +0000 (16:37 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 20 May 2017 14:37:04 +0000 (16:37 +0200)
* commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18':
  dashenc: add mandatory id to AdaptationSet and Period in manifest

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavformat/dashenc.c

@@@ -443,16 -439,10 +443,16 @@@ static int write_manifest(AVFormatConte
      DASHContext *c = s->priv_data;
      AVIOContext *out;
      char temp_filename[1024];
-     int ret, i;
+     int ret, i, as_id = 0;
 +    const char *proto = avio_find_protocol_name(s->filename);
 +    int use_rename = proto && !strcmp(proto, "file");
 +    static unsigned int warned_non_file = 0;
      AVDictionaryEntry *title = av_dict_get(s->metadata, "title", NULL, 0);
  
 -    snprintf(temp_filename, sizeof(temp_filename), "%s.tmp", s->filename);
 +    if (!use_rename && !warned_non_file++)
 +        av_log(s, AV_LOG_ERROR, "Cannot use rename on non file protocol, this may lead to races and temporary partial files\n");
 +
 +    snprintf(temp_filename, sizeof(temp_filename), use_rename ? "%s.tmp" : "%s", s->filename);
      ret = s->io_open(s, &out, temp_filename, AVIO_FLAG_WRITE, NULL);
      if (ret < 0) {
          av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", temp_filename);
      }
  
      if (c->has_video) {
-         avio_printf(out, "\t\t<AdaptationSet contentType=\"video\" segmentAlignment=\"true\" bitstreamSwitching=\"true\"");
 -        avio_printf(out, "\t\t<AdaptationSet id=\"%d\" contentType=\"video\" segmentAlignment=\"true\" bitstreamSwitching=\"true\">\n", as_id++);
++        avio_printf(out, "\t\t<AdaptationSet id=\"%d\" contentType=\"video\" segmentAlignment=\"true\" bitstreamSwitching=\"true\"", as_id++);
 +        if (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);
 +        avio_printf(out, ">\n");
 +
          for (i = 0; i < s->nb_streams; i++) {
              AVStream *st = s->streams[i];
              OutputStream *os = &c->streams[i];