AVFormatContext *ctx;
int stream_index;
- char id[20];
+ char *id;
char *lang;
int bandwidth;
AVRational framerate;
/* Flags for init section*/
int is_init_section_common_video;
int is_init_section_common_audio;
+ int is_init_section_common_subtitle;
} DASHContext;
static int ishttp(char *url)
{
const char *proto_name = avio_find_protocol_name(url);
- return av_strstart(proto_name, "http", NULL);
+ return proto_name && av_strstart(proto_name, "http", NULL);
}
static int aligned(int val)
return 0; /* parser error */
}
switch (type) {
- case 'D':
- days = (uint32_t)value;
- break;
- case 'H':
- hours = (uint32_t)value;
- break;
- case 'M':
- mins = (uint32_t)value;
- break;
- case 'S':
- secs = (uint32_t)value;
- break;
- default:
- // handle invalid type
- break;
+ case 'D':
+ days = (uint32_t)value;
+ break;
+ case 'H':
+ hours = (uint32_t)value;
+ break;
+ case 'M':
+ mins = (uint32_t)value;
+ break;
+ case 'S':
+ secs = (uint32_t)value;
+ break;
+ default:
+ // handle invalid type
+ break;
}
ptr += size;
}
av_freep(&pls->url_template);
av_freep(&pls->lang);
+ av_freep(&pls->id);
av_freep(&pls);
}
char *text;
char *url = NULL;
char *tmp_str = av_mallocz(max_url_size);
- char *tmp_str_2 = av_mallocz(max_url_size);
- if (!tmp_str || !tmp_str_2) {
+ if (!tmp_str)
return NULL;
- }
for (i = 0; i < n_baseurl_nodes; ++i) {
if (baseurl_nodes[i] &&
text = xmlNodeGetContent(baseurl_nodes[i]->children);
if (text) {
memset(tmp_str, 0, max_url_size);
- memset(tmp_str_2, 0, max_url_size);
- ff_make_absolute_url(tmp_str_2, max_url_size, tmp_str, text);
- av_strlcpy(tmp_str, tmp_str_2, max_url_size);
+ ff_make_absolute_url(tmp_str, max_url_size, "", text);
xmlFree(text);
}
}
}
end:
av_free(tmp_str);
- av_free(tmp_str_2);
return url;
}
size = strlen(root_url);
isRootHttp = ishttp(root_url);
- if (root_url[size - 1] != token) {
+ if (size > 0 && root_url[size - 1] != token) {
av_strlcat(root_url, "/", size + 2);
size += 2;
}
xmlNodePtr segmentlists_tab[3];
xmlNodePtr fragment_timeline_node = NULL;
xmlNodePtr fragment_templates_tab[5];
- char *duration_val = NULL;
- char *presentation_timeoffset_val = NULL;
- char *startnumber_val = NULL;
- char *timescale_val = NULL;
- char *initialization_val = NULL;
- char *media_val = NULL;
char *val = NULL;
xmlNodePtr baseurl_nodes[4];
xmlNodePtr representation_node = node;
- char *rep_id_val, *rep_bandwidth_val;
+ char *rep_bandwidth_val;
enum AVMediaType type = AVMEDIA_TYPE_UNKNOWN;
// try get information from representation
av_log(s, AV_LOG_VERBOSE, "Parsing '%s' - skipp not supported representation type\n", url);
return 0;
}
- // convert selected representation to our internal struct
- rep = av_mallocz(sizeof(struct representation));
- if (!rep)
+
+ // convert selected representation to our internal struct
+ rep = av_mallocz(sizeof(struct representation));
+ if (!rep)
+ return AVERROR(ENOMEM);
+ if (c->adaptionset_lang) {
+ rep->lang = av_strdup(c->adaptionset_lang);
+ if (!rep->lang) {
+ av_log(s, AV_LOG_ERROR, "alloc language memory failure\n");
+ av_freep(&rep);
return AVERROR(ENOMEM);
- if (c->adaptionset_lang) {
- rep->lang = av_strdup(c->adaptionset_lang);
- if (!rep->lang) {
- av_log(s, AV_LOG_ERROR, "alloc language memory failure\n");
- av_freep(&rep);
- return AVERROR(ENOMEM);
- }
}
- rep->parent = s;
- representation_segmenttemplate_node = find_child_node_by_name(representation_node, "SegmentTemplate");
- representation_baseurl_node = find_child_node_by_name(representation_node, "BaseURL");
- representation_segmentlist_node = find_child_node_by_name(representation_node, "SegmentList");
- rep_id_val = xmlGetProp(representation_node, "id");
- rep_bandwidth_val = xmlGetProp(representation_node, "bandwidth");
-
- baseurl_nodes[0] = mpd_baseurl_node;
- baseurl_nodes[1] = period_baseurl_node;
- baseurl_nodes[2] = adaptionset_baseurl_node;
- baseurl_nodes[3] = representation_baseurl_node;
-
- ret = resolve_content_path(s, url, &c->max_url_size, baseurl_nodes, 4);
- c->max_url_size = aligned(c->max_url_size
- + (rep_id_val ? strlen(rep_id_val) : 0)
- + (rep_bandwidth_val ? strlen(rep_bandwidth_val) : 0));
- if (ret == AVERROR(ENOMEM) || ret == 0)
- goto free;
- if (representation_segmenttemplate_node || fragment_template_node || period_segmenttemplate_node) {
- fragment_timeline_node = NULL;
- fragment_templates_tab[0] = representation_segmenttemplate_node;
- fragment_templates_tab[1] = adaptionset_segmentlist_node;
- fragment_templates_tab[2] = fragment_template_node;
- fragment_templates_tab[3] = period_segmenttemplate_node;
- fragment_templates_tab[4] = period_segmentlist_node;
-
- initialization_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "initialization");
- if (initialization_val) {
- rep->init_section = av_mallocz(sizeof(struct fragment));
- if (!rep->init_section) {
- xmlFree(initialization_val);
- goto enomem;
- }
- c->max_url_size = aligned(c->max_url_size + strlen(initialization_val));
- rep->init_section->url = get_content_url(baseurl_nodes, 4, c->max_url_size, rep_id_val, rep_bandwidth_val, initialization_val);
- xmlFree(initialization_val);
- if (!rep->init_section->url)
- goto enomem;
- rep->init_section->size = -1;
- }
- media_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "media");
- if (media_val) {
- c->max_url_size = aligned(c->max_url_size + strlen(media_val));
- rep->url_template = get_content_url(baseurl_nodes, 4, c->max_url_size, rep_id_val, rep_bandwidth_val, media_val);
- xmlFree(media_val);
- }
- presentation_timeoffset_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "presentationTimeOffset");
- if (presentation_timeoffset_val) {
- rep->presentation_timeoffset = (int64_t) strtoll(presentation_timeoffset_val, NULL, 10);
- av_log(s, AV_LOG_TRACE, "rep->presentation_timeoffset = [%"PRId64"]\n", rep->presentation_timeoffset);
- xmlFree(presentation_timeoffset_val);
- }
- duration_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "duration");
- if (duration_val) {
- rep->fragment_duration = (int64_t) strtoll(duration_val, NULL, 10);
- av_log(s, AV_LOG_TRACE, "rep->fragment_duration = [%"PRId64"]\n", rep->fragment_duration);
- xmlFree(duration_val);
- }
- timescale_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "timescale");
- if (timescale_val) {
- rep->fragment_timescale = (int64_t) strtoll(timescale_val, NULL, 10);
- av_log(s, AV_LOG_TRACE, "rep->fragment_timescale = [%"PRId64"]\n", rep->fragment_timescale);
- xmlFree(timescale_val);
- }
- startnumber_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "startNumber");
- if (startnumber_val) {
- rep->start_number = rep->first_seq_no = (int64_t) strtoll(startnumber_val, NULL, 10);
- av_log(s, AV_LOG_TRACE, "rep->first_seq_no = [%"PRId64"]\n", rep->first_seq_no);
- xmlFree(startnumber_val);
- }
- if (adaptionset_supplementalproperty_node) {
- if (!av_strcasecmp(xmlGetProp(adaptionset_supplementalproperty_node,"schemeIdUri"), "http://dashif.org/guidelines/last-segment-number")) {
- val = xmlGetProp(adaptionset_supplementalproperty_node,"value");
- if (!val) {
- av_log(s, AV_LOG_ERROR, "Missing value attribute in adaptionset_supplementalproperty_node\n");
- } else {
- rep->last_seq_no =(int64_t) strtoll(val, NULL, 10) - 1;
- xmlFree(val);
- }
- }
- }
-
- fragment_timeline_node = find_child_node_by_name(representation_segmenttemplate_node, "SegmentTimeline");
-
- if (!fragment_timeline_node)
- fragment_timeline_node = find_child_node_by_name(fragment_template_node, "SegmentTimeline");
- if (!fragment_timeline_node)
- fragment_timeline_node = find_child_node_by_name(adaptionset_segmentlist_node, "SegmentTimeline");
- if (!fragment_timeline_node)
- fragment_timeline_node = find_child_node_by_name(period_segmentlist_node, "SegmentTimeline");
- if (fragment_timeline_node) {
- fragment_timeline_node = xmlFirstElementChild(fragment_timeline_node);
- while (fragment_timeline_node) {
- ret = parse_manifest_segmenttimeline(s, rep, fragment_timeline_node);
- if (ret < 0)
- goto free;
- fragment_timeline_node = xmlNextElementSibling(fragment_timeline_node);
- }
- }
- } else if (representation_baseurl_node && !representation_segmentlist_node) {
- seg = av_mallocz(sizeof(struct fragment));
- if (!seg)
+ }
+ rep->parent = s;
+ representation_segmenttemplate_node = find_child_node_by_name(representation_node, "SegmentTemplate");
+ representation_baseurl_node = find_child_node_by_name(representation_node, "BaseURL");
+ representation_segmentlist_node = find_child_node_by_name(representation_node, "SegmentList");
+ rep_bandwidth_val = xmlGetProp(representation_node, "bandwidth");
+ val = xmlGetProp(representation_node, "id");
+ if (val) {
+ rep->id = av_strdup(val);
+ xmlFree(val);
+ if (!rep->id)
+ goto enomem;
+ }
+
+ baseurl_nodes[0] = mpd_baseurl_node;
+ baseurl_nodes[1] = period_baseurl_node;
+ baseurl_nodes[2] = adaptionset_baseurl_node;
+ baseurl_nodes[3] = representation_baseurl_node;
+
+ ret = resolve_content_path(s, url, &c->max_url_size, baseurl_nodes, 4);
+ c->max_url_size = aligned(c->max_url_size
+ + (rep->id ? strlen(rep->id) : 0)
+ + (rep_bandwidth_val ? strlen(rep_bandwidth_val) : 0));
+ if (ret == AVERROR(ENOMEM) || ret == 0)
+ goto free;
+ if (representation_segmenttemplate_node || fragment_template_node || period_segmenttemplate_node) {
+ fragment_timeline_node = NULL;
+ fragment_templates_tab[0] = representation_segmenttemplate_node;
+ fragment_templates_tab[1] = adaptionset_segmentlist_node;
+ fragment_templates_tab[2] = fragment_template_node;
+ fragment_templates_tab[3] = period_segmenttemplate_node;
+ fragment_templates_tab[4] = period_segmentlist_node;
+
+ val = get_val_from_nodes_tab(fragment_templates_tab, 4, "initialization");
+ if (val) {
+ rep->init_section = av_mallocz(sizeof(struct fragment));
+ if (!rep->init_section) {
+ xmlFree(val);
goto enomem;
- ret = av_dynarray_add_nofree(&rep->fragments, &rep->n_fragments, seg);
- if (ret < 0) {
- av_free(seg);
- goto free;
}
- seg->url = get_content_url(baseurl_nodes, 4, c->max_url_size, rep_id_val, rep_bandwidth_val, NULL);
- if (!seg->url)
+ c->max_url_size = aligned(c->max_url_size + strlen(val));
+ rep->init_section->url = get_content_url(baseurl_nodes, 4,
+ c->max_url_size, rep->id,
+ rep_bandwidth_val, val);
+ xmlFree(val);
+ if (!rep->init_section->url)
goto enomem;
- seg->size = -1;
- } else if (representation_segmentlist_node) {
- // TODO: https://www.brendanlong.com/the-structure-of-an-mpeg-dash-mpd.html
- // http://www-itec.uni-klu.ac.at/dash/ddash/mpdGenerator.php?fragmentlength=15&type=full
- xmlNodePtr fragmenturl_node = NULL;
- segmentlists_tab[0] = representation_segmentlist_node;
- segmentlists_tab[1] = adaptionset_segmentlist_node;
- segmentlists_tab[2] = period_segmentlist_node;
-
- duration_val = get_val_from_nodes_tab(segmentlists_tab, 3, "duration");
- timescale_val = get_val_from_nodes_tab(segmentlists_tab, 3, "timescale");
- startnumber_val = get_val_from_nodes_tab(segmentlists_tab, 3, "startNumber");
- if (duration_val) {
- rep->fragment_duration = (int64_t) strtoll(duration_val, NULL, 10);
- av_log(s, AV_LOG_TRACE, "rep->fragment_duration = [%"PRId64"]\n", rep->fragment_duration);
- xmlFree(duration_val);
- }
- if (timescale_val) {
- rep->fragment_timescale = (int64_t) strtoll(timescale_val, NULL, 10);
- av_log(s, AV_LOG_TRACE, "rep->fragment_timescale = [%"PRId64"]\n", rep->fragment_timescale);
- xmlFree(timescale_val);
- }
- if (startnumber_val) {
- rep->start_number = rep->first_seq_no = (int64_t) strtoll(startnumber_val, NULL, 10);
- av_log(s, AV_LOG_TRACE, "rep->first_seq_no = [%"PRId64"]\n", rep->first_seq_no);
- xmlFree(startnumber_val);
+ rep->init_section->size = -1;
+ }
+ val = get_val_from_nodes_tab(fragment_templates_tab, 4, "media");
+ if (val) {
+ c->max_url_size = aligned(c->max_url_size + strlen(val));
+ rep->url_template = get_content_url(baseurl_nodes, 4,
+ c->max_url_size, rep->id,
+ rep_bandwidth_val, val);
+ xmlFree(val);
+ }
+ val = get_val_from_nodes_tab(fragment_templates_tab, 4, "presentationTimeOffset");
+ if (val) {
+ rep->presentation_timeoffset = (int64_t) strtoll(val, NULL, 10);
+ av_log(s, AV_LOG_TRACE, "rep->presentation_timeoffset = [%"PRId64"]\n", rep->presentation_timeoffset);
+ xmlFree(val);
+ }
+ val = get_val_from_nodes_tab(fragment_templates_tab, 4, "duration");
+ if (val) {
+ rep->fragment_duration = (int64_t) strtoll(val, NULL, 10);
+ av_log(s, AV_LOG_TRACE, "rep->fragment_duration = [%"PRId64"]\n", rep->fragment_duration);
+ xmlFree(val);
+ }
+ val = get_val_from_nodes_tab(fragment_templates_tab, 4, "timescale");
+ if (val) {
+ rep->fragment_timescale = (int64_t) strtoll(val, NULL, 10);
+ av_log(s, AV_LOG_TRACE, "rep->fragment_timescale = [%"PRId64"]\n", rep->fragment_timescale);
+ xmlFree(val);
+ }
+ val = get_val_from_nodes_tab(fragment_templates_tab, 4, "startNumber");
+ if (val) {
+ rep->start_number = rep->first_seq_no = (int64_t) strtoll(val, NULL, 10);
+ av_log(s, AV_LOG_TRACE, "rep->first_seq_no = [%"PRId64"]\n", rep->first_seq_no);
+ xmlFree(val);
+ }
+ if (adaptionset_supplementalproperty_node) {
+ if (!av_strcasecmp(xmlGetProp(adaptionset_supplementalproperty_node,"schemeIdUri"), "http://dashif.org/guidelines/last-segment-number")) {
+ val = xmlGetProp(adaptionset_supplementalproperty_node,"value");
+ if (!val) {
+ av_log(s, AV_LOG_ERROR, "Missing value attribute in adaptionset_supplementalproperty_node\n");
+ } else {
+ rep->last_seq_no =(int64_t) strtoll(val, NULL, 10) - 1;
+ xmlFree(val);
+ }
}
+ }
- fragmenturl_node = xmlFirstElementChild(representation_segmentlist_node);
- while (fragmenturl_node) {
- ret = parse_manifest_segmenturlnode(s, rep, fragmenturl_node,
- baseurl_nodes,
- rep_id_val,
- rep_bandwidth_val);
- if (ret < 0)
- goto free;
- fragmenturl_node = xmlNextElementSibling(fragmenturl_node);
- }
+ fragment_timeline_node = find_child_node_by_name(representation_segmenttemplate_node, "SegmentTimeline");
+ if (!fragment_timeline_node)
+ fragment_timeline_node = find_child_node_by_name(fragment_template_node, "SegmentTimeline");
+ if (!fragment_timeline_node)
fragment_timeline_node = find_child_node_by_name(adaptionset_segmentlist_node, "SegmentTimeline");
- if (!fragment_timeline_node)
- fragment_timeline_node = find_child_node_by_name(period_segmentlist_node, "SegmentTimeline");
- if (fragment_timeline_node) {
- fragment_timeline_node = xmlFirstElementChild(fragment_timeline_node);
- while (fragment_timeline_node) {
- ret = parse_manifest_segmenttimeline(s, rep, fragment_timeline_node);
- if (ret < 0)
- goto free;
- fragment_timeline_node = xmlNextElementSibling(fragment_timeline_node);
- }
+ if (!fragment_timeline_node)
+ fragment_timeline_node = find_child_node_by_name(period_segmentlist_node, "SegmentTimeline");
+ if (fragment_timeline_node) {
+ fragment_timeline_node = xmlFirstElementChild(fragment_timeline_node);
+ while (fragment_timeline_node) {
+ ret = parse_manifest_segmenttimeline(s, rep, fragment_timeline_node);
+ if (ret < 0)
+ goto free;
+ fragment_timeline_node = xmlNextElementSibling(fragment_timeline_node);
}
- } else {
- av_log(s, AV_LOG_ERROR, "Unknown format of Representation node id[%s] \n", rep_id_val);
+ }
+ } else if (representation_baseurl_node && !representation_segmentlist_node) {
+ seg = av_mallocz(sizeof(struct fragment));
+ if (!seg)
+ goto enomem;
+ ret = av_dynarray_add_nofree(&rep->fragments, &rep->n_fragments, seg);
+ if (ret < 0) {
+ av_free(seg);
goto free;
}
+ seg->url = get_content_url(baseurl_nodes, 4, c->max_url_size,
+ rep->id, rep_bandwidth_val, NULL);
+ if (!seg->url)
+ goto enomem;
+ seg->size = -1;
+ } else if (representation_segmentlist_node) {
+ // TODO: https://www.brendanlong.com/the-structure-of-an-mpeg-dash-mpd.html
+ // http://www-itec.uni-klu.ac.at/dash/ddash/mpdGenerator.php?fragmentlength=15&type=full
+ xmlNodePtr fragmenturl_node = NULL;
+ segmentlists_tab[0] = representation_segmentlist_node;
+ segmentlists_tab[1] = adaptionset_segmentlist_node;
+ segmentlists_tab[2] = period_segmentlist_node;
+
+ val = get_val_from_nodes_tab(segmentlists_tab, 3, "duration");
+ if (val) {
+ rep->fragment_duration = (int64_t) strtoll(val, NULL, 10);
+ av_log(s, AV_LOG_TRACE, "rep->fragment_duration = [%"PRId64"]\n", rep->fragment_duration);
+ xmlFree(val);
+ }
+ val = get_val_from_nodes_tab(segmentlists_tab, 3, "timescale");
+ if (val) {
+ rep->fragment_timescale = (int64_t) strtoll(val, NULL, 10);
+ av_log(s, AV_LOG_TRACE, "rep->fragment_timescale = [%"PRId64"]\n", rep->fragment_timescale);
+ xmlFree(val);
+ }
+ val = get_val_from_nodes_tab(segmentlists_tab, 3, "startNumber");
+ if (val) {
+ rep->start_number = rep->first_seq_no = (int64_t) strtoll(val, NULL, 10);
+ av_log(s, AV_LOG_TRACE, "rep->first_seq_no = [%"PRId64"]\n", rep->first_seq_no);
+ xmlFree(val);
+ }
- if (rep->fragment_duration > 0 && !rep->fragment_timescale)
- rep->fragment_timescale = 1;
- rep->bandwidth = rep_bandwidth_val ? atoi(rep_bandwidth_val) : 0;
- strncpy(rep->id, rep_id_val ? rep_id_val : "", sizeof(rep->id));
- rep->framerate = av_make_q(0, 0);
- if (type == AVMEDIA_TYPE_VIDEO) {
- char *rep_framerate_val = xmlGetProp(representation_node, "frameRate");
- if (rep_framerate_val) {
- ret = av_parse_video_rate(&rep->framerate, rep_framerate_val);
- if (ret < 0)
- av_log(s, AV_LOG_VERBOSE, "Ignoring invalid frame rate '%s'\n", rep_framerate_val);
- xmlFree(rep_framerate_val);
- }
- }
+ fragmenturl_node = xmlFirstElementChild(representation_segmentlist_node);
+ while (fragmenturl_node) {
+ ret = parse_manifest_segmenturlnode(s, rep, fragmenturl_node,
+ baseurl_nodes, rep->id,
+ rep_bandwidth_val);
+ if (ret < 0)
+ goto free;
+ fragmenturl_node = xmlNextElementSibling(fragmenturl_node);
+ }
- switch (type) {
- case AVMEDIA_TYPE_VIDEO:
- ret = av_dynarray_add_nofree(&c->videos, &c->n_videos, rep);
- break;
- case AVMEDIA_TYPE_AUDIO:
- ret = av_dynarray_add_nofree(&c->audios, &c->n_audios, rep);
- break;
- case AVMEDIA_TYPE_SUBTITLE:
- ret = av_dynarray_add_nofree(&c->subtitles, &c->n_subtitles, rep);
- break;
+ fragment_timeline_node = find_child_node_by_name(adaptionset_segmentlist_node, "SegmentTimeline");
+ if (!fragment_timeline_node)
+ fragment_timeline_node = find_child_node_by_name(period_segmentlist_node, "SegmentTimeline");
+ if (fragment_timeline_node) {
+ fragment_timeline_node = xmlFirstElementChild(fragment_timeline_node);
+ while (fragment_timeline_node) {
+ ret = parse_manifest_segmenttimeline(s, rep, fragment_timeline_node);
+ if (ret < 0)
+ goto free;
+ fragment_timeline_node = xmlNextElementSibling(fragment_timeline_node);
}
+ }
+ } else {
+ av_log(s, AV_LOG_ERROR, "Unknown format of Representation node id '%s' \n",
+ rep->id ? rep->id : "");
+ goto free;
+ }
+
+ if (rep->fragment_duration > 0 && !rep->fragment_timescale)
+ rep->fragment_timescale = 1;
+ rep->bandwidth = rep_bandwidth_val ? atoi(rep_bandwidth_val) : 0;
+ rep->framerate = av_make_q(0, 0);
+ if (type == AVMEDIA_TYPE_VIDEO) {
+ char *rep_framerate_val = xmlGetProp(representation_node, "frameRate");
+ if (rep_framerate_val) {
+ ret = av_parse_video_rate(&rep->framerate, rep_framerate_val);
if (ret < 0)
- goto free;
+ av_log(s, AV_LOG_VERBOSE, "Ignoring invalid frame rate '%s'\n", rep_framerate_val);
+ xmlFree(rep_framerate_val);
+ }
+ }
+
+ switch (type) {
+ case AVMEDIA_TYPE_VIDEO:
+ ret = av_dynarray_add_nofree(&c->videos, &c->n_videos, rep);
+ break;
+ case AVMEDIA_TYPE_AUDIO:
+ ret = av_dynarray_add_nofree(&c->audios, &c->n_audios, rep);
+ break;
+ case AVMEDIA_TYPE_SUBTITLE:
+ ret = av_dynarray_add_nofree(&c->subtitles, &c->n_subtitles, rep);
+ break;
+ }
+ if (ret < 0)
+ goto free;
end:
- if (rep_id_val)
- xmlFree(rep_id_val);
if (rep_bandwidth_val)
xmlFree(rep_bandwidth_val);
}
err:
- av_freep(&c->adaptionset_lang);
+ xmlFree(c->adaptionset_lang);
+ c->adaptionset_lang = NULL;
return ret;
}
DASHContext *c = s->priv_data;
int ret = 0;
int close_in = 0;
- uint8_t *new_url = NULL;
int64_t filesize = 0;
AVBPrint buf;
AVDictionary *opts = NULL;
return ret;
}
- if (av_opt_get(in, "location", AV_OPT_SEARCH_CHILDREN, &new_url) >= 0) {
- c->base_url = av_strdup(new_url);
- } else {
+ if (av_opt_get(in, "location", AV_OPT_SEARCH_CHILDREN, (uint8_t**)&c->base_url) < 0)
c->base_url = av_strdup(url);
- }
filesize = avio_size(in);
filesize = filesize > 0 ? filesize : DEFAULT_MANIFEST_SIZE;
xmlFreeNode(mpd_baseurl_node);
}
- av_free(new_url);
av_bprint_finalize(&buf, NULL);
if (close_in) {
avio_close(in);
} else if (c->is_live && pls->fragment_duration) {
num = pls->first_seq_no + (((get_current_time_in_sec() - c->availability_start_time)) * pls->fragment_timescale) / pls->fragment_duration;
} else if (pls->fragment_duration) {
- num = pls->first_seq_no + (c->media_presentation_duration * pls->fragment_timescale) / pls->fragment_duration;
+ num = pls->first_seq_no + av_rescale_rnd(1, c->media_presentation_duration * pls->fragment_timescale, pls->fragment_duration, AV_ROUND_UP);
}
return num;
}
}
if (seg) {
- char *tmpfilename= av_mallocz(c->max_url_size);
+ char *tmpfilename;
+ if (!pls->url_template) {
+ av_log(pls->parent, AV_LOG_ERROR, "Cannot get fragment, missing template URL\n");
+ av_free(seg);
+ return NULL;
+ }
+ tmpfilename = av_mallocz(c->max_url_size);
if (!tmpfilename) {
+ av_free(seg);
return NULL;
}
ff_dash_fill_tmpl_params(tmpfilename, c->max_url_size, pls->url_template, 0, pls->cur_seq_no, 0, get_segment_start_time_based_on_timeline(pls, pls->cur_seq_no));
if (!seg->url) {
av_log(pls->parent, AV_LOG_ERROR, "Cannot resolve template url '%s'\n", pls->url_template);
av_free(tmpfilename);
+ av_free(seg);
return NULL;
}
}
static int reopen_demux_for_component(AVFormatContext *s, struct representation *pls)
{
DASHContext *c = s->priv_data;
- ff_const59 AVInputFormat *in_fmt = NULL;
+ const AVInputFormat *in_fmt = NULL;
AVDictionary *in_fmt_opts = NULL;
uint8_t *avio_ctx_buffer = NULL;
int ret = 0, i;
pls->ctx = NULL;
goto fail;
}
- if (c->is_live) {
- ffio_init_context(&pls->pb, avio_ctx_buffer , INITIAL_BUFFER_SIZE, 0, pls, read_data, NULL, NULL);
- } else {
- ffio_init_context(&pls->pb, avio_ctx_buffer , INITIAL_BUFFER_SIZE, 0, pls, read_data, NULL, seek_data);
- }
+ ffio_init_context(&pls->pb, avio_ctx_buffer, INITIAL_BUFFER_SIZE, 0,
+ pls, read_data, NULL, c->is_live ? NULL : seek_data);
pls->pb.seekable = 0;
if ((ret = ff_copy_whiteblacklists(pls->ctx, s)) < 0)
url_offset = first_init_section->url_offset;
size = pls[0]->init_section->size;
for (i=0;i<n_pls;i++) {
- if (av_strcasecmp(pls[i]->init_section->url,url) || pls[i]->init_section->url_offset != url_offset || pls[i]->init_section->size != size) {
+ if (!pls[i]->init_section)
+ continue;
+
+ if (av_strcasecmp(pls[i]->init_section->url, url) ||
+ pls[i]->init_section->url_offset != url_offset ||
+ pls[i]->init_section->size != size) {
return 0;
}
}
static int dash_close(AVFormatContext *s);
+static void move_metadata(AVStream *st, const char *key, char **value)
+{
+ if (*value) {
+ av_dict_set(&st->metadata, key, *value, AV_DICT_DONT_STRDUP_VAL);
+ *value = NULL;
+ }
+}
+
static int dash_read_header(AVFormatContext *s)
{
DASHContext *c = s->priv_data;
}
if (c->n_subtitles)
- c->is_init_section_common_audio = is_common_init_section_exist(c->subtitles, c->n_subtitles);
+ c->is_init_section_common_subtitle = is_common_init_section_exist(c->subtitles, c->n_subtitles);
for (i = 0; i < c->n_subtitles; i++) {
rep = c->subtitles[i];
- if (i > 0 && c->is_init_section_common_audio) {
+ if (i > 0 && c->is_init_section_common_subtitle) {
ret = copy_init_section(rep, c->subtitles[0]);
if (ret < 0)
goto fail;
}
/* Create a program */
- program = av_new_program(s, 0);
- if (!program) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
+ program = av_new_program(s, 0);
+ if (!program) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
- for (i = 0; i < c->n_videos; i++) {
- rep = c->videos[i];
- av_program_add_stream_index(s, 0, rep->stream_index);
- rep->assoc_stream = s->streams[rep->stream_index];
- if (rep->bandwidth > 0)
- av_dict_set_int(&rep->assoc_stream->metadata, "variant_bitrate", rep->bandwidth, 0);
- if (rep->id[0])
- av_dict_set(&rep->assoc_stream->metadata, "id", rep->id, 0);
- }
- for (i = 0; i < c->n_audios; i++) {
- rep = c->audios[i];
- av_program_add_stream_index(s, 0, rep->stream_index);
- rep->assoc_stream = s->streams[rep->stream_index];
- if (rep->bandwidth > 0)
- av_dict_set_int(&rep->assoc_stream->metadata, "variant_bitrate", rep->bandwidth, 0);
- if (rep->id[0])
- av_dict_set(&rep->assoc_stream->metadata, "id", rep->id, 0);
- if (rep->lang) {
- av_dict_set(&rep->assoc_stream->metadata, "language", rep->lang, 0);
- av_freep(&rep->lang);
- }
- }
- for (i = 0; i < c->n_subtitles; i++) {
- rep = c->subtitles[i];
- av_program_add_stream_index(s, 0, rep->stream_index);
- rep->assoc_stream = s->streams[rep->stream_index];
- if (rep->id[0])
- av_dict_set(&rep->assoc_stream->metadata, "id", rep->id, 0);
- if (rep->lang) {
- av_dict_set(&rep->assoc_stream->metadata, "language", rep->lang, 0);
- av_freep(&rep->lang);
- }
- }
+ for (i = 0; i < c->n_videos; i++) {
+ rep = c->videos[i];
+ av_program_add_stream_index(s, 0, rep->stream_index);
+ rep->assoc_stream = s->streams[rep->stream_index];
+ if (rep->bandwidth > 0)
+ av_dict_set_int(&rep->assoc_stream->metadata, "variant_bitrate", rep->bandwidth, 0);
+ move_metadata(rep->assoc_stream, "id", &rep->id);
+ }
+ for (i = 0; i < c->n_audios; i++) {
+ rep = c->audios[i];
+ av_program_add_stream_index(s, 0, rep->stream_index);
+ rep->assoc_stream = s->streams[rep->stream_index];
+ if (rep->bandwidth > 0)
+ av_dict_set_int(&rep->assoc_stream->metadata, "variant_bitrate", rep->bandwidth, 0);
+ move_metadata(rep->assoc_stream, "id", &rep->id);
+ move_metadata(rep->assoc_stream, "language", &rep->lang);
+ }
+ for (i = 0; i < c->n_subtitles; i++) {
+ rep = c->subtitles[i];
+ av_program_add_stream_index(s, 0, rep->stream_index);
+ rep->assoc_stream = s->streams[rep->stream_index];
+ move_metadata(rep->assoc_stream, "id", &rep->id);
+ move_metadata(rep->assoc_stream, "language", &rep->lang);
+ }
return 0;
fail:
.version = LIBAVUTIL_VERSION_INT,
};
-AVInputFormat ff_dash_demuxer = {
+const AVInputFormat ff_dash_demuxer = {
.name = "dash",
.long_name = NULL_IF_CONFIG_SMALL("Dynamic Adaptive Streaming over HTTP"),
.priv_class = &dash_class,
projects / ffmpeg / blobdiff