From patchwork Thu Nov 23 02:24:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 6287 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp226369jah; Wed, 22 Nov 2017 18:32:45 -0800 (PST) X-Google-Smtp-Source: AGs4zMbEsX22H++0bi5m9CpYQf5gp5lnxKEbx9G70cyA/VoJUTonMl2GQwBSsh933pswPaB/8kiq X-Received: by 10.28.151.14 with SMTP id z14mr6382763wmd.5.1511404365555; Wed, 22 Nov 2017 18:32:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511404365; cv=none; d=google.com; s=arc-20160816; b=mp8HICLQqVYLFuwbEqmDacZqm7T2FFjkXvmHwDRDIrJf8QTWQBuCpiek5ArMpAv9ur Wm27k5XshMwHeZEyxpzyoKx1dZoPo9RFqESE0BPAVAQ5a1zMPOGUniEdsf9PwBDZ8Y2r Pw2DA7qQF9cqHk4pozwgQ4DZN/uQ7EzvNP9ja2Ah6PDvNi2eOQhJzNxVPC/8Alkx5Qs8 PVaZDf9BTlt7woBHkW3/Shf+L+OF2hm+TttpL8BOl5SP2pJJL6OOP+Zzn9OyHsOL2ULo cPQTJoNblGI2WyBdobiY0Ulj66ciEi0PLs0TyhWct3hgHSgoTo25NkDeYQck+Bsl6TZ0 D+Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:to:message-id:date:from:references:in-reply-to :mime-version:dkim-signature:delivered-to:arc-authentication-results; bh=WazsC+6vdHJ1MLLQtlcKtXkhgPqg3xHWUEfjNCfUySQ=; b=pNrEDR36AA6GpjOK/XqAQ2OsK2fXLWLlegYnW2JJqVtsM9hG01pGmKJVJsnKzSj38K X1Cygkxll/tdRJDqLXgWvLZpbVu0Uendv9/XGqqrjt0zok9/89++Lag1zmkmKPCcRolu nvwIqCdOZAkuLLySFSsxEXqeeMESkBrYhIcAuEnxPAAOR46TFSusqGj4ehb7m2uNC435 AGCO1QEWr45vcuhlGERpkZnDnmWFGY8oLlzPNePbGjSG8iM0o0MHHft+GzPlLXlHgUhD FVIgx/JzxQBZgdU6WQE1UetBPInlZhYkhHmzNunbAYL15cf+sRDv2Jc4h2CLohlVfxb6 WRWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OE+5pOPK; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m127si4269856wma.43.2017.11.22.18.32.43; Wed, 22 Nov 2017 18:32:45 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OE+5pOPK; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 17FF868A143; Thu, 23 Nov 2017 04:32:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f44.google.com (mail-oi0-f44.google.com [209.85.218.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1794689DD3 for ; Thu, 23 Nov 2017 04:32:35 +0200 (EET) Received: by mail-oi0-f44.google.com with SMTP id v123so12273937oif.12 for ; Wed, 22 Nov 2017 18:32:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=z4TLpmrNIqrfXYncv+1pOA1vlCcRS+VHVo38AiCqiXA=; b=OE+5pOPKUwngYMSYsf/sIgXkGVKqdladCh26p2akPxYtBsg1ATvZbll1UOINENybwo cU0fJ/L+/LGE5kREGlZvmGO3Q9zClQxnI/hHn6OeSJEVWxnKfN8k2Bi2GQoCzXdT+LX6 Gs4cei19eo1Dt9y4kPyiG/XDsjDMB7/5H4NgOT9shBOKdYvfr6vIC2c1t6KfDmxBZDJ2 Oa32RBo+0/31Icrnnzum3/nHc1JeZhPl026i/ScbVjKR6u7FjAZANElFZS0IWE87dH5T rCU8CGr7DQZ8AGP9WPoDsasPGMZhxo4hQzVS8JaAP7MeXIaAXQh+8tOGDhr3lHWpE/LA izoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=z4TLpmrNIqrfXYncv+1pOA1vlCcRS+VHVo38AiCqiXA=; b=DbmTD/mK8p8kbR8MAeQnqRXQK6qxZWkkyBJpj93z1++W6YpUKdVOJmabGLeiq4NQda QTKqiaHwJcqCf1gO/Y5kjN0NCi3lzSoIr+bPndOOWE8kvEX9NKRcUrHLSaLYp3fWtPNM Sb3nxsEM3KznDtsrsTJFriZgs+jgwWreaN92VRa1YMafmdOyJWsKp+iMgiFnnmQjHxNp RP2rB3FzgUdwlKCfok4tWj2nbsvhcW69Pibd8mDCLaywwVvV1wKomkrZjxk9BzyrKxWO lOfCd8/Lw1JnLaL77xYAqWaKVL9i5Kc5NdE4oh5I8yJ5fR13h+eEgyITN6Iu8OS62SPG P/wQ== X-Gm-Message-State: AJaThX61knO1aL9yuhync26MBOUts8u3pZo9iF/3rt+UMdQTx4TysmVx QKbc5+tfjOIfuIuQDg5kNFULvd6wPIN52qKPf8UcJQ== X-Received: by 10.202.73.134 with SMTP id w128mr5348686oia.320.1511403883658; Wed, 22 Nov 2017 18:24:43 -0800 (PST) MIME-Version: 1.0 Received: by 10.74.82.10 with HTTP; Wed, 22 Nov 2017 18:24:43 -0800 (PST) In-Reply-To: References: From: Steven Liu Date: Thu, 23 Nov 2017 10:24:43 +0800 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [Patch] Fix for ticket 6658 (Dash demuxer segfault) X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 2017-11-23 9:16 GMT+08:00 Colin NG : > Clean up coding style. > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > struct tm timeinfo; @@ -392,7 +397,8 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, 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; @@ -639,6 +645,78 @@ static int parse_manifest_segmenttimeline(AVFormatContext *s, struct representat return 0; } +static int resolve_content_path(AVFormatContext *s, const char *url, xmlNodePtr *baseurl_nodes, int n_baseurl_nodes) + { + int i; + char *text; + char tmp_str[MAX_URL_SIZE]; + char tmp_str_2[MAX_URL_SIZE]; + + char *path = av_mallocz(MAX_URL_SIZE); + int nameSize = 0; + int updated = 0; + + av_strlcpy(tmp_str, url, strlen(url)+1); + char *mpdName = strtok(tmp_str, "/"); + + while ((mpdName = strtok(NULL, "/"))) { + nameSize = strlen(mpdName); + } + + av_strlcpy(path, url, strlen(url)-nameSize+1); + + int rootId = 0; + xmlNodePtr *node = NULL; + for (rootId = n_baseurl_nodes-1; rootId > 0; rootId--) { + if (!(node = baseurl_nodes[rootId])) { + continue; + } + if (ishttp(xmlNodeGetContent(node))) { + break; + } + } + + node = baseurl_nodes[rootId]; + char *baseurl = xmlNodeGetContent(node); + char *root_url = (!av_strcasecmp(baseurl, ""))? path: baseurl; + + if (node) { + xmlNodeSetContent(node, root_url); + } + + int size = strlen(root_url); + char *isRootHttp = ishttp(root_url); + + char token = '/'; + if (strncmp(&root_url[size-1], &token, 1) != 0) { why not av_strncasecmp? + 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); + } + int start = (strncmp(text, &token, 1) == 0) ? 1: 0; why not av_strncasecmp? + memset(tmp_str_2, 0, strlen(tmp_str_2)); + av_strlcat(tmp_str, text+start, MAX_URL_SIZE); + xmlFree(text); + xmlNodeSetContent(baseurl_nodes[i], tmp_str); + updated = 1; + } + } + + av_free(path); + return updated; + +} static int parse_manifest_representation(AVFormatContext *s, const char *url, xmlNodePtr node, xmlNodePtr adaptionset_node, @@ -698,6 +776,8 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url, baseurl_nodes[2] = adaptionset_baseurl_node; baseurl_nodes[3] = representation_baseurl_node; + resolve_content_path(s, url, baseurl_nodes, 4); check this call return value. If there are no return value, make it void type. + if (representation_segmenttemplate_node || fragment_template_node) { fragment_timeline_node = NULL; fragment_templates_tab[0] = representation_segmenttemplate_node; @@ -993,6 +1073,9 @@ static int parse_manifest(AVFormatContext *s, const char *url, AVIOContext *in) } mpd_baseurl_node = find_child_node_by_name(node, "BaseURL"); + if (!mpd_baseurl_node) { + mpd_baseurl_node = xmlNewNode(node, "BaseURL"); + } // at now we can handle only one period, with the longest duration node = xmlFirstElementChild(node); BTW: use command looks like this: 1. git commit -a 2. git format-patch -1 or git format-patch -s -2 to make patch. refer to: https://ffmpeg.org/developer.html#Submitting-patches-1 Thanks diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 3798649..7e7ae52 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -148,6 +148,11 @@ static uint64_t get_current_time_in_sec(void) return av_gettime() / 1000000; } +static char *ishttp(char *url) { + char *proto_name = avio_find_protocol_name(url); + return av_strstart(proto_name, "http", NULL); +} + static uint64_t get_utc_date_time_insec(AVFormatContext *s, const char *datetime) {