enum AVMediaType type;
char id[20];
int bandwidth;
+ AVRational framerate;
AVStream *assoc_stream; /* demuxer stream associated with this representation */
int n_fragments;
char *headers; ///< holds HTTP headers set as an AVOption to the HTTP protocol context
char *allowed_extensions;
AVDictionary *avio_opts;
+ int max_url_size;
} DASHContext;
+static int ishttp(char *url)
+{
+ const char *proto_name = avio_find_protocol_name(url);
+ return av_strstart(proto_name, "http", NULL);
+}
+
+static int aligned(int val)
+{
+ return ((val + 0x3F) >> 6) << 6;
+}
+
static uint64_t get_current_time_in_sec(void)
{
return av_gettime() / 1000000;
else if (strcmp(proto_name, "file") || !strncmp(url, "file,", 5))
return AVERROR_INVALIDDATA;
- ret = s->io_open(s, pb, url, AVIO_FLAG_READ, &tmp);
+ av_freep(pb);
+ ret = avio_open2(pb, url, AVIO_FLAG_READ, c->interrupt_callback, &tmp);
if (ret >= 0) {
// update cookies on http response with setcookies.
char *new_cookies = NULL;
static char *get_content_url(xmlNodePtr *baseurl_nodes,
int n_baseurl_nodes,
+ int max_url_size,
char *rep_id_val,
char *rep_bandwidth_val,
char *val)
int i;
char *text;
char *url = NULL;
- char tmp_str[MAX_URL_SIZE];
- char tmp_str_2[MAX_URL_SIZE];
+ char *tmp_str = av_mallocz(max_url_size);
+ char *tmp_str_2 = av_mallocz(max_url_size);
- memset(tmp_str, 0, sizeof(tmp_str));
+ if (!tmp_str || !tmp_str_2) {
+ return NULL;
+ }
for (i = 0; i < n_baseurl_nodes; ++i) {
if (baseurl_nodes[i] &&
baseurl_nodes[i]->children->type == XML_TEXT_NODE) {
text = xmlNodeGetContent(baseurl_nodes[i]->children);
if (text) {
- memset(tmp_str, 0, sizeof(tmp_str));
- memset(tmp_str_2, 0, sizeof(tmp_str_2));
- ff_make_absolute_url(tmp_str_2, MAX_URL_SIZE, tmp_str, text);
- av_strlcpy(tmp_str, tmp_str_2, sizeof(tmp_str));
+ 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);
xmlFree(text);
}
}
}
if (val)
- av_strlcat(tmp_str, (const char*)val, sizeof(tmp_str));
+ av_strlcat(tmp_str, (const char*)val, max_url_size);
if (rep_id_val) {
url = av_strireplace(tmp_str, "$RepresentationID$", (const char*)rep_id_val);
if (!url) {
- return NULL;
+ goto end;
}
- av_strlcpy(tmp_str, url, sizeof(tmp_str));
- av_free(url);
+ av_strlcpy(tmp_str, url, max_url_size);
}
if (rep_bandwidth_val && tmp_str[0] != '\0') {
+ // free any previously assigned url before reassigning
+ av_free(url);
url = av_strireplace(tmp_str, "$Bandwidth$", (const char*)rep_bandwidth_val);
if (!url) {
- return NULL;
+ goto end;
}
}
+end:
+ av_free(tmp_str);
+ av_free(tmp_str_2);
return url;
}
return type;
}
+static struct fragment * get_Fragment(char *range)
+{
+ struct fragment * seg = av_mallocz(sizeof(struct fragment));
+
+ if (!seg)
+ return NULL;
+
+ seg->size = -1;
+ if (range) {
+ char *str_end_offset;
+ char *str_offset = av_strtok(range, "-", &str_end_offset);
+ seg->url_offset = strtoll(str_offset, NULL, 10);
+ seg->size = strtoll(str_end_offset, NULL, 10) - seg->url_offset;
+ }
+
+ return seg;
+}
+
static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representation *rep,
xmlNodePtr fragmenturl_node,
xmlNodePtr *baseurl_nodes,
char *rep_id_val,
char *rep_bandwidth_val)
{
+ DASHContext *c = s->priv_data;
char *initialization_val = NULL;
char *media_val = NULL;
+ char *range_val = NULL;
+ int max_url_size = c ? c->max_url_size: MAX_URL_SIZE;
if (!av_strcasecmp(fragmenturl_node->name, (const char *)"Initialization")) {
initialization_val = xmlGetProp(fragmenturl_node, "sourceURL");
- if (initialization_val) {
- rep->init_section = av_mallocz(sizeof(struct fragment));
+ range_val = xmlGetProp(fragmenturl_node, "range");
+ if (initialization_val || range_val) {
+ rep->init_section = get_Fragment(range_val);
if (!rep->init_section) {
xmlFree(initialization_val);
+ xmlFree(range_val);
return AVERROR(ENOMEM);
}
rep->init_section->url = get_content_url(baseurl_nodes, 4,
+ max_url_size,
rep_id_val,
rep_bandwidth_val,
initialization_val);
+
if (!rep->init_section->url) {
av_free(rep->init_section);
xmlFree(initialization_val);
+ xmlFree(range_val);
return AVERROR(ENOMEM);
}
- rep->init_section->size = -1;
xmlFree(initialization_val);
+ xmlFree(range_val);
}
} else if (!av_strcasecmp(fragmenturl_node->name, (const char *)"SegmentURL")) {
media_val = xmlGetProp(fragmenturl_node, "media");
- if (media_val) {
- struct fragment *seg = av_mallocz(sizeof(struct fragment));
+ range_val = xmlGetProp(fragmenturl_node, "mediaRange");
+ if (media_val || range_val) {
+ struct fragment *seg = get_Fragment(range_val);
if (!seg) {
xmlFree(media_val);
+ xmlFree(range_val);
return AVERROR(ENOMEM);
}
seg->url = get_content_url(baseurl_nodes, 4,
+ max_url_size,
rep_id_val,
rep_bandwidth_val,
media_val);
if (!seg->url) {
av_free(seg);
xmlFree(media_val);
+ xmlFree(range_val);
return AVERROR(ENOMEM);
}
- seg->size = -1;
dynarray_add(&rep->fragments, &rep->n_fragments, seg);
xmlFree(media_val);
+ xmlFree(range_val);
}
}
return 0;
}
+static int resolve_content_path(AVFormatContext *s, const char *url, int *max_url_size, xmlNodePtr *baseurl_nodes, int n_baseurl_nodes) {
+
+ char *tmp_str = NULL;
+ char *path = NULL;
+ char *mpdName = NULL;
+ xmlNodePtr node = NULL;
+ char *baseurl = NULL;
+ char *root_url = NULL;
+ char *text = NULL;
+
+ int isRootHttp = 0;
+ char token ='/';
+ int start = 0;
+ int rootId = 0;
+ int updated = 0;
+ int size = 0;
+ int i;
+ int tmp_max_url_size = strlen(url);
+
+ for (i = n_baseurl_nodes-1; i >= 0 ; i--) {
+ text = xmlNodeGetContent(baseurl_nodes[i]);
+ if (!text)
+ continue;
+ tmp_max_url_size += strlen(text);
+ if (ishttp(text)) {
+ xmlFree(text);
+ break;
+ }
+ xmlFree(text);
+ }
+
+ tmp_max_url_size = aligned(tmp_max_url_size);
+ text = av_mallocz(tmp_max_url_size);
+ if (!text) {
+ updated = AVERROR(ENOMEM);
+ goto end;
+ }
+ av_strlcpy(text, url, strlen(url)+1);
+ while (mpdName = av_strtok(text, "/", &text)) {
+ size = strlen(mpdName);
+ }
+
+ path = av_mallocz(tmp_max_url_size);
+ tmp_str = av_mallocz(tmp_max_url_size);
+ if (!tmp_str || !path) {
+ updated = AVERROR(ENOMEM);
+ goto end;
+ }
+
+ av_strlcpy (path, url, strlen(url) - size + 1);
+ for (rootId = n_baseurl_nodes - 1; rootId > 0; rootId --) {
+ if (!(node = baseurl_nodes[rootId])) {
+ continue;
+ }
+ if (ishttp(xmlNodeGetContent(node))) {
+ break;
+ }
+ }
+
+ node = baseurl_nodes[rootId];
+ baseurl = xmlNodeGetContent(node);
+ root_url = (av_strcasecmp(baseurl, "")) ? baseurl : path;
+ if (node) {
+ xmlNodeSetContent(node, root_url);
+ updated = 1;
+ }
+
+ size = strlen(root_url);
+ isRootHttp = ishttp(root_url);
+
+ if (root_url[size - 1] != token) {
+ av_strlcat(root_url, "/", size + 2);
+ size += 2;
+ }
+
+ for (i = 0; i < n_baseurl_nodes; ++i) {
+ if (i == rootId) {
+ continue;
+ }
+ text = xmlNodeGetContent(baseurl_nodes[i]);
+ if (text) {
+ memset(tmp_str, 0, strlen(tmp_str));
+ if (!ishttp(text) && isRootHttp) {
+ av_strlcpy(tmp_str, root_url, size + 1);
+ }
+ start = (text[0] == token);
+ av_strlcat(tmp_str, text + start, tmp_max_url_size);
+ xmlNodeSetContent(baseurl_nodes[i], tmp_str);
+ updated = 1;
+ xmlFree(text);
+ }
+ }
+
+end:
+ if (tmp_max_url_size > *max_url_size) {
+ *max_url_size = tmp_max_url_size;
+ }
+ av_free(path);
+ av_free(tmp_str);
+ return updated;
+
+}
+
static int parse_manifest_representation(AVFormatContext *s, const char *url,
xmlNodePtr node,
xmlNodePtr adaptionset_node,
xmlNodePtr mpd_baseurl_node,
xmlNodePtr period_baseurl_node,
+ xmlNodePtr period_segmenttemplate_node,
+ xmlNodePtr period_segmentlist_node,
xmlNodePtr fragment_template_node,
xmlNodePtr content_component_node,
xmlNodePtr adaptionset_baseurl_node,
xmlNodePtr representation_segmentlist_node = NULL;
xmlNodePtr segmentlists_tab[2];
xmlNodePtr fragment_timeline_node = NULL;
- xmlNodePtr fragment_templates_tab[3];
+ xmlNodePtr fragment_templates_tab[5];
char *duration_val = NULL;
char *presentation_timeoffset_val = NULL;
char *startnumber_val = NULL;
xmlNodePtr representation_node = node;
char *rep_id_val = xmlGetProp(representation_node, "id");
char *rep_bandwidth_val = xmlGetProp(representation_node, "bandwidth");
+ char *rep_framerate_val = xmlGetProp(representation_node, "frameRate");
enum AVMediaType type = AVMEDIA_TYPE_UNKNOWN;
// try get information from representation
baseurl_nodes[2] = adaptionset_baseurl_node;
baseurl_nodes[3] = representation_baseurl_node;
- if (representation_segmenttemplate_node || fragment_template_node) {
+ ret = resolve_content_path(s, url, &c->max_url_size, baseurl_nodes, 4);
+ c->max_url_size = aligned(c->max_url_size + strlen(rep_id_val) + strlen(rep_bandwidth_val));
+ if (ret == AVERROR(ENOMEM) || ret == 0) {
+ goto end;
+ }
+ 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;
- presentation_timeoffset_val = get_val_from_nodes_tab(fragment_templates_tab, 3, "presentationTimeOffset");
- duration_val = get_val_from_nodes_tab(fragment_templates_tab, 3, "duration");
- startnumber_val = get_val_from_nodes_tab(fragment_templates_tab, 3, "startNumber");
- timescale_val = get_val_from_nodes_tab(fragment_templates_tab, 3, "timescale");
- initialization_val = get_val_from_nodes_tab(fragment_templates_tab, 3, "initialization");
- media_val = get_val_from_nodes_tab(fragment_templates_tab, 3, "media");
+ presentation_timeoffset_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "presentationTimeOffset");
+ duration_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "duration");
+ startnumber_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "startNumber");
+ timescale_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "timescale");
+ initialization_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "initialization");
+ media_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "media");
if (initialization_val) {
rep->init_section = av_mallocz(sizeof(struct fragment));
ret = AVERROR(ENOMEM);
goto end;
}
- rep->init_section->url = get_content_url(baseurl_nodes, 4, rep_id_val, rep_bandwidth_val, initialization_val);
+ 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);
if (!rep->init_section->url) {
av_free(rep->init_section);
av_free(rep);
}
if (media_val) {
- rep->url_template = get_content_url(baseurl_nodes, 4, rep_id_val, rep_bandwidth_val, 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);
}
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 = AVERROR(ENOMEM);
goto end;
}
- seg->url = get_content_url(baseurl_nodes, 4, rep_id_val, rep_bandwidth_val, NULL);
+ seg->url = get_content_url(baseurl_nodes, 4, c->max_url_size, rep_id_val, rep_bandwidth_val, NULL);
if (!seg->url) {
av_free(seg);
ret = AVERROR(ENOMEM);
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) {
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 && 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);
+ }
+
if (type == AVMEDIA_TYPE_VIDEO) {
rep->rep_idx = video_rep_idx;
dynarray_add(&c->videos, &c->n_videos, rep);
xmlFree(rep_id_val);
if (rep_bandwidth_val)
xmlFree(rep_bandwidth_val);
+ if (rep_framerate_val)
+ xmlFree(rep_framerate_val);
return ret;
}
static int parse_manifest_adaptationset(AVFormatContext *s, const char *url,
xmlNodePtr adaptionset_node,
xmlNodePtr mpd_baseurl_node,
- xmlNodePtr period_baseurl_node)
+ xmlNodePtr period_baseurl_node,
+ xmlNodePtr period_segmenttemplate_node,
+ xmlNodePtr period_segmentlist_node)
{
int ret = 0;
xmlNodePtr fragment_template_node = NULL;
adaptionset_node,
mpd_baseurl_node,
period_baseurl_node,
+ period_segmenttemplate_node,
+ period_segmentlist_node,
fragment_template_node,
content_component_node,
adaptionset_baseurl_node,
xmlNodePtr period_node = NULL;
xmlNodePtr mpd_baseurl_node = NULL;
xmlNodePtr period_baseurl_node = NULL;
+ xmlNodePtr period_segmenttemplate_node = NULL;
+ xmlNodePtr period_segmentlist_node = NULL;
xmlNodePtr adaptionset_node = NULL;
xmlAttrPtr attr = NULL;
char *val = NULL;
}
mpd_baseurl_node = find_child_node_by_name(node, "BaseURL");
+ if (!mpd_baseurl_node) {
+ mpd_baseurl_node = xmlNewNode(NULL, "BaseURL");
+ }
// at now we can handle only one period, with the longest duration
node = xmlFirstElementChild(node);
while (adaptionset_node) {
if (!av_strcasecmp(adaptionset_node->name, (const char *)"BaseURL")) {
period_baseurl_node = adaptionset_node;
+ } else if (!av_strcasecmp(adaptionset_node->name, (const char *)"SegmentTemplate")) {
+ period_segmenttemplate_node = adaptionset_node;
+ } else if (!av_strcasecmp(adaptionset_node->name, (const char *)"SegmentList")) {
+ period_segmentlist_node = adaptionset_node;
} else if (!av_strcasecmp(adaptionset_node->name, (const char *)"AdaptationSet")) {
- parse_manifest_adaptationset(s, url, adaptionset_node, mpd_baseurl_node, period_baseurl_node);
+ parse_manifest_adaptationset(s, url, adaptionset_node, mpd_baseurl_node, period_baseurl_node, period_segmenttemplate_node, period_segmentlist_node);
}
adaptionset_node = xmlNextElementSibling(adaptionset_node);
}
if (pls->n_fragments) {
num = pls->first_seq_no;
} else if (pls->n_timelines) {
- start_time_offset = get_segment_start_time_based_on_timeline(pls, 0xFFFFFFFF) - pls->timelines[pls->first_seq_no]->starttime; // total duration of playlist
- if (start_time_offset < 60 * pls->fragment_timescale)
- start_time_offset = 0;
- else
- start_time_offset = start_time_offset - 60 * pls->fragment_timescale;
-
- num = calc_next_seg_no_from_timelines(pls, pls->timelines[pls->first_seq_no]->starttime + start_time_offset);
+ start_time_offset = get_segment_start_time_based_on_timeline(pls, 0xFFFFFFFF) - 60 * pls->fragment_timescale; // 60 seconds before end
+ num = calc_next_seg_no_from_timelines(pls, start_time_offset);
if (num == -1)
num = pls->first_seq_no;
+ else
+ num += pls->first_seq_no;
} else if (pls->fragment_duration){
if (pls->presentation_timeoffset) {
num = pls->presentation_timeoffset * pls->fragment_timescale / pls->fragment_duration;
}
}
if (seg) {
- char tmpfilename[MAX_URL_SIZE];
-
- ff_dash_fill_tmpl_params(tmpfilename, sizeof(tmpfilename), pls->url_template, 0, pls->cur_seq_no, 0, get_segment_start_time_based_on_timeline(pls, pls->cur_seq_no));
+ char *tmpfilename= av_mallocz(c->max_url_size);
+ if (!tmpfilename) {
+ 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));
seg->url = av_strireplace(pls->url_template, pls->url_template, tmpfilename);
if (!seg->url) {
av_log(pls->parent, AV_LOG_WARNING, "Unable to resolve template url '%s', try to use origin template\n", pls->url_template);
seg->url = av_strdup(pls->url_template);
if (!seg->url) {
av_log(pls->parent, AV_LOG_ERROR, "Cannot resolve template url '%s'\n", pls->url_template);
+ av_free(tmpfilename);
return NULL;
}
}
-
+ av_free(tmpfilename);
seg->size = -1;
}
static int open_input(DASHContext *c, struct representation *pls, struct fragment *seg)
{
AVDictionary *opts = NULL;
- char url[MAX_URL_SIZE];
- int ret;
+ char *url = NULL;
+ int ret = 0;
+ url = av_mallocz(c->max_url_size);
+ if (!url) {
+ goto cleanup;
+ }
set_httpheader_options(c, &opts);
if (seg->size >= 0) {
/* try to restrict the HTTP request to the part we want
av_dict_set_int(&opts, "end_offset", seg->url_offset + seg->size, 0);
}
- ff_make_absolute_url(url, MAX_URL_SIZE, c->base_url, seg->url);
+ ff_make_absolute_url(url, c->max_url_size, c->base_url, seg->url);
av_log(pls->parent, AV_LOG_VERBOSE, "DASH request for url '%s', offset %"PRId64", playlist %d\n",
url, seg->url_offset, pls->rep_idx);
ret = open_url(pls->parent, &pls->input, url, c->avio_opts, opts, NULL);
goto cleanup;
}
- /* Seek to the requested position. If this was a HTTP request, the offset
- * should already be where want it to, but this allows e.g. local testing
- * without a HTTP server. */
- if (!ret && seg->url_offset) {
- int64_t seekret = avio_seek(pls->input, seg->url_offset, SEEK_SET);
- if (seekret < 0) {
- av_log(pls->parent, AV_LOG_ERROR, "Unable to seek to offset %"PRId64" of DASH fragment '%s'\n", seg->url_offset, seg->url);
- ret = (int) seekret;
- ff_format_io_close(pls->parent, &pls->input);
- }
- }
-
cleanup:
+ av_free(url);
av_dict_free(&opts);
pls->cur_seg_offset = 0;
pls->cur_seg_size = seg->size;
if (ret > 0)
goto end;
- if (!v->is_restart_needed)
- v->cur_seq_no++;
- v->is_restart_needed = 1;
+ if (c->is_live || v->cur_seq_no < v->last_seq_no) {
+ if (!v->is_restart_needed)
+ v->cur_seq_no++;
+ v->is_restart_needed = 1;
+ }
end:
return ret;
AVInputFormat *in_fmt = NULL;
AVDictionary *in_fmt_opts = NULL;
uint8_t *avio_ctx_buffer = NULL;
- int ret = 0;
+ int ret = 0, i;
if (pls->ctx) {
close_demux_for_component(pls);
if (ret < 0)
goto fail;
if (pls->n_fragments) {
+#if FF_API_R_FRAME_RATE
+ if (pls->framerate.den) {
+ for (i = 0; i < pls->ctx->nb_streams; i++)
+ pls->ctx->streams[i]->r_frame_rate = pls->framerate;
+ }
+#endif
+
ret = avformat_find_stream_info(pls->ctx, NULL);
if (ret < 0)
goto fail;
return 0;
}
-static int dash_seek(AVFormatContext *s, struct representation *pls, int64_t seek_pos_msec, int flags)
+static int dash_seek(AVFormatContext *s, struct representation *pls, int64_t seek_pos_msec, int flags, int dry_run)
{
int ret = 0;
int i = 0;
int j = 0;
int64_t duration = 0;
- av_log(pls->parent, AV_LOG_VERBOSE, "DASH seek pos[%"PRId64"ms], playlist %d\n", seek_pos_msec, pls->rep_idx);
+ av_log(pls->parent, AV_LOG_VERBOSE, "DASH seek pos[%"PRId64"ms], playlist %d%s\n",
+ seek_pos_msec, pls->rep_idx, dry_run ? " (dry)" : "");
// single fragment mode
if (pls->n_fragments == 1) {
pls->cur_timestamp = 0;
pls->cur_seg_offset = 0;
+ if (dry_run)
+ return 0;
ff_read_frame_flush(pls->ctx);
return av_seek_frame(pls->ctx, -1, seek_pos_msec * 1000, flags);
}
pls->cur_timestamp = 0;
pls->cur_seg_offset = 0;
pls->init_sec_buf_read_offset = 0;
- ret = reopen_demux_for_component(s, pls);
+ ret = dry_run ? 0 : reopen_demux_for_component(s, pls);
return ret;
}
static int dash_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)
{
- int ret, i;
+ int ret = 0, i;
DASHContext *c = s->priv_data;
int64_t seek_pos_msec = av_rescale_rnd(timestamp, 1000,
s->streams[stream_index]->time_base.den,
if ((flags & AVSEEK_FLAG_BYTE) || c->is_live)
return AVERROR(ENOSYS);
- ret = AVERROR_EOF;
+ /* Seek in discarded streams with dry_run=1 to avoid reopening them */
for (i = 0; i < c->n_videos; i++) {
- if (c->videos[i]->stream_index == stream_index) {
- ret = dash_seek(s, c->videos[i], seek_pos_msec, flags);
- }
+ if (!ret)
+ ret = dash_seek(s, c->videos[i], seek_pos_msec, flags, !c->videos[i]->ctx);
}
for (i = 0; i < c->n_audios; i++) {
- if (c->audios[i]->stream_index == stream_index) {
- ret = dash_seek(s, c->audios[i], seek_pos_msec, flags);
- }
+ if (!ret)
+ ret = dash_seek(s, c->audios[i], seek_pos_msec, flags, !c->audios[i]->ctx);
}
return ret;
projects / ffmpeg / blobdiff