From patchwork Sat Nov 18 00:16:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 6151 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1258916jah; Fri, 17 Nov 2017 16:16:43 -0800 (PST) X-Google-Smtp-Source: AGs4zMbtjK03xdzKe6XoHNliHB6Q9HaUBCb/hWZzGpWQ3EM+HbAwHwdlc8/ZaJgsgGr/uGd/a1R/ X-Received: by 10.28.33.136 with SMTP id h130mr4960331wmh.151.1510964203201; Fri, 17 Nov 2017 16:16:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510964203; cv=none; d=google.com; s=arc-20160816; b=fSzDEqW1BYJfd+jWXA0cjBT5amuaIfrO2fqZK3U27SyEGhPzqnTyszZe9slpl6eICw kS2gEku+nu2QMW91nXk9FdG6Wtd4Dpm42bfMiUGw4ik+jpLR9X09jE1VpimsMc/iqkyH h5KgI4AjHD3T5PLGTrGzKDvNq4mHPV2J3zIi3HIUkAWLz/sdhItfHov3AuidVLYaE2/h fdw/uxvFZJi5q6bH2anl7+plWpZdnfKUcBUg1d+VerRHpNBKlrTldVD5XYqbv0kG1z9/ OKN5m45nOVmZbVPZENUahIt9MWqtgacn/gZCvur3KcpOYj7iV6n1SED8icMYNrmbBiLd H5Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:spamdiagnosticmetadata:spamdiagnosticoutput :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=iaMGGriNGjMdgzx4DHiwf8wbdgrYIam2dvu/AxASfhI=; b=ENDBWa3I3uqsyof/4r0b4y4uCj/j1LG20DTsSAr0yL4q+2ugBTK/K+64ZVtvCkaOrW ggvJi+trjmLrv4X6GrewCIrk9fOjnFW8WNLOnwa6PnmbFLEyM4c83p1JLGogjrdV+0f6 1Hj5ioVp72Flf3CZW4AWUXZLiCOcMUf7n13hSvor8Jgv2O1RrWnJggHe3Fb1E4lGcgTY LE4AjZcwc11eN8cwTgbCLksFTD2liD9O3qiP2Ik4k8uhFNdZKb9LicH6KHZY3O4VM/y0 0qMxaxmtg/7+A2aKW3Oi8hXUuTDTEkDVhcbJhvNyqhsZzj90c+148TsQd2rCHxbiqgWD xx1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=pB1VlYIc; 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=QUARANTINE dis=NONE) header.from=hotmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h15si3935409wrb.551.2017.11.17.16.16.42; Fri, 17 Nov 2017 16:16:43 -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=@hotmail.com header.s=selector1 header.b=pB1VlYIc; 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=QUARANTINE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D93C0689A4A; Sat, 18 Nov 2017 02:16:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-oln040092009040.outbound.protection.outlook.com [40.92.9.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E31A689A2A for ; Sat, 18 Nov 2017 02:16:19 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=YW7jnwWioGu0eGoQUpQ+NXQbxAqKYLb5xCVRnUJBqfw=; b=pB1VlYIc8psamKNhXiyr2o9A+UnDEATrZHQiXHfzzH5o0otqyMea6MgvcKJlP2TXPhzcGuC4rdcx3wjHYlvQPpSpwe4NDyla5C+ipsumh18duoLYhLLfecLjUJN4wuwVRMiz1OQggrha4t5Qvir6YH0YLK6/5WGc4gDl6f1CLE8SbvFoBaxgVknKgg0gAKNF2LXX9mZj6IPOJcQT3GUdEMTPL5Z7A+xvuuICjDHGXvSqji9B5aSLC6+FPZXNK7NrWoVP5fTHd5hpuqtsC7Y+RU3w+ddfW04hEpydFFseVTEU8EAWFhO0OCBc6MWKXWceH4J1rsFIHR8xFkK7BH+Lmg== Received: from SN1NAM04FT004.eop-NAM04.prod.protection.outlook.com (10.152.88.55) by SN1NAM04HT023.eop-NAM04.prod.protection.outlook.com (10.152.89.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.197.9; Sat, 18 Nov 2017 00:16:34 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.88.53) by SN1NAM04FT004.mail.protection.outlook.com (10.152.88.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.197.9 via Frontend Transport; Sat, 18 Nov 2017 00:16:34 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com ([10.172.189.151]) by DM5PR22MB0681.namprd22.prod.outlook.com ([10.172.189.151]) with mapi id 15.20.0239.007; Sat, 18 Nov 2017 00:16:33 +0000 From: Colin NG To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [Patch] Fix for ticket 6658 (Dash demuxer segfault) Thread-Index: AQHTX45dAPGQW7fdaEK8eN/duXED16MZRXQO Date: Sat, 18 Nov 2017 00:16:33 +0000 Message-ID: References: , In-Reply-To: Accept-Language: en-CA, en-US Content-Language: en-CA X-MS-Has-Attach: yes X-MS-TNEF-Correlator: authentication-results: ffmpeg.org; dkim=none (message not signed) header.d=none; ffmpeg.org; dmarc=none action=none header.from=hotmail.com; x-incomingtopheadermarker: OriginalChecksum:97A2C10DCBCD7CCF8274B30D605AC8057E22D6F4D7BA21A03BCC6A4EE070AC04; UpperCasedChecksum:B6D54625A42A56A687EF0F698CE3DB05C9F9200539B7E7B2BE6293905743129E; SizeAsReceived:7499; Count:46 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [gsHppfWDrmLWImF29WQSd1hRuaVa++uR] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; SN1NAM04HT023; 6:Z5z/rwk1c+NxhDouxmj6upzj/R/z1LvYDMZ7eSL5O0NRZvt9YLHOYaE01v//yw6xY1TUY0B+Lr9CnUSyHus4/nFhnfTUTzXMjwhxbmd1YivoJBia/JFm1oUWeBn5wAeeRuQy1T5JKjIkvwbZO/zaJl9FBJ8k8xHwLrerfbRUFY4S18q4zPBanVB8BgEy87XNRqYPwALPjtoP+yhdASgqKYY0cGA/SP6NfMHgvImY0dfI+9yZuQaVuqrjKYkbTpwQHJZMsNI+TLKVlaw4IgVSTqPY2pG2Qa6Rk5AnUMptmG098AQbJ7nWM3i510v9nFs08vylOC2rneLd7TQpDWJPjMotuhp2U1ecCn+f2yvZ7y8=; 5:HbzaFyni22lwiGQUp88mYF/czkv5ClOj5LUDBskGF4i2DbzUA3hSJXrU4YPFZgHX30j55YLO4m5JLkatQtdhAkYCR/S2CnRfbmfAqq7kr3y1+CU2qVM6/9llbl0NbC40E3dPKMMuzn01BDvBnnuYlv35torI+5rrLjPbxLL/Mbk=; 24:icwlRNr0wXronVMNBS4ULtg0Tg+vgs1fmNB4Ek7drmnCHPbeB22a0eWRRDGNVFvu8pU951cHqc0aVQWYkwqcWXWcbB53he+VpEF+b5weCLc=; 7:U02LUGz4m/bdmQ0bCENJTpCu0ZdBW3ToRMYevXtwITOSe09JSKKsOrikepMmKi0lzA3nUqVV2rwq2mgshWfNM8/BwSAJrM15ADaA9E4m9dWQnFQK6dtX7faCDkxADeWrl6q87fsEH7NUJmJICNx+QSdOmwus2f+tY+qbJgcIQy4i8465R4/h54Lv3AmLDoJvDo/4ROAxE6gFDyMiCvzDUeZ59JZoYsvPcl74tL+I3+TH7DKIQ5Mx7O7uMiw1b9ML x-incomingheadercount: 46 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: 46bac550-a159-4ebc-2fa2-08d52e19a00e x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1603101448)(1601125374)(1701031045); SRVR:SN1NAM04HT023; x-ms-traffictypediagnostic: SN1NAM04HT023: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(444000031); SRVR:SN1NAM04HT023; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1NAM04HT023; x-forefront-prvs: 04953B1F22 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:SN1NAM04HT023; H:DM5PR22MB0681.namprd22.prod.outlook.com; FPR:; SPF:None; LANG:; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-Network-Message-Id: 46bac550-a159-4ebc-2fa2-08d52e19a00e X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Nov 2017 00:16:33.6356 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM04HT023 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 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" Cleaned the code up. diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 671ae9d..9bdfefd 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) { struct tm timeinfo; @@ -392,7 +397,9 @@ 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; @@ -640,6 +647,74 @@ 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) { + 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; + 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, @@ -699,6 +774,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); + if (representation_segmenttemplate_node || fragment_template_node) { fragment_timeline_node = NULL; fragment_templates_tab[0] = representation_segmenttemplate_node; @@ -994,6 +1071,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);