virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

Merge commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18'

Browse Source 
* commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18':
  dashenc: add mandatory id to AdaptationSet and Period in manifest

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-05-20 16:37:04 +02:00
commit 77a20cff36
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/dashenc.c
View File

@ -443,7 +443,7 @@ static int write_manifest(AVFormatContext *s, int final)
DASHContext *c = s->priv_data; DASHContext *c = s->priv_data;
AVIOContext *out; AVIOContext *out;
char temp_filename[1024]; char temp_filename[1024];
int ret, i; int ret, i, as_id = 0;
const char *proto = avio_find_protocol_name(s->filename); const char *proto = avio_find_protocol_name(s->filename);
int use_rename = proto && !strcmp(proto, "file"); int use_rename = proto && !strcmp(proto, "file");
static unsigned int warned_non_file = 0; static unsigned int warned_non_file = 0;
@ -504,15 +504,15 @@ static int write_manifest(AVFormatContext *s, int final)
OutputStream *os = &c->streams[0]; OutputStream *os = &c->streams[0];
int start_index = FFMAX(os->nb_segments - c->window_size, 0); int start_index = FFMAX(os->nb_segments - c->window_size, 0);
int64_t start_time = av_rescale_q(os->segments[start_index]->time, s->streams[0]->time_base, AV_TIME_BASE_Q); int64_t start_time = av_rescale_q(os->segments[start_index]->time, s->streams[0]->time_base, AV_TIME_BASE_Q);
avio_printf(out, "\t<Period start=\""); avio_printf(out, "\t<Period id=\"0\" start=\"");
write_time(out, start_time); write_time(out, start_time);
avio_printf(out, "\">\n"); avio_printf(out, "\">\n");
} else { } else {
avio_printf(out, "\t<Period start=\"PT0.0S\">\n"); avio_printf(out, "\t<Period id=\"0\" start=\"PT0.0S\">\n");
} }
if (c->has_video) { 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\"", as_id++);
if (c->max_frame_rate.num && !c->ambiguous_frame_rate) 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, " %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"); avio_printf(out, ">\n");
@ -535,7 +535,7 @@ static int write_manifest(AVFormatContext *s, int final)
avio_printf(out, "\t\t</AdaptationSet>\n"); avio_printf(out, "\t\t</AdaptationSet>\n");
} }
if (c->has_audio) { if (c->has_audio) {
avio_printf(out, "\t\t<AdaptationSet contentType=\"audio\" segmentAlignment=\"true\" bitstreamSwitching=\"true\">\n"); avio_printf(out, "\t\t<AdaptationSet id=\"%d\" contentType=\"audio\" segmentAlignment=\"true\" bitstreamSwitching=\"true\">\n", as_id++);
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i]; AVStream *st = s->streams[i];
OutputStream *os = &c->streams[i]; OutputStream *os = &c->streams[i];