From patchwork Wed Nov 15 02:54:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 6076 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4062681jah; Tue, 14 Nov 2017 18:54:30 -0800 (PST) X-Google-Smtp-Source: AGs4zMbIv/K/Qib/7AzUW6M2GI40yz92ALNZI7TZQC7S9DIB5kJTle0r2gUY+PGKGajc8GmQMgPP X-Received: by 10.28.125.11 with SMTP id y11mr623605wmc.115.1510714470792; Tue, 14 Nov 2017 18:54:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510714470; cv=none; d=google.com; s=arc-20160816; b=PF9hX00JgB69t/l4sDaqsWX1g4gcccw4Iemd5uo0RrF9Tk4w7Q0j3m62ru2bJfLA44 ozMwpFdi/tCok/GRovvhEj5pE6F+TO11UNaUF4/A6LugFTXk1odyt8M+j3nhe17uWg9U zeC1jyVuVgp2h7NWgjlzXBAKK1/zVJI1G30nlpMiqUrMq08hy+mrxvykBci4ysmcGPm9 QGlzgat3gxH/lsCwKheFI5oLd6P3fZnG9/5UlgldLjwpXij2Xqa71CJWP5swbNlrdLQg cRPQIFbZXEN3b9bc99wfFH+5gBhnRZCpeQ1ms2/Sks+blGKEdqVUtfSalz8qjHnPlHO4 0Iiw== 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=2Jkvjy8O2JWFFlle36sRXDU2wC6IvtSuOIG9lTRPrvs=; b=xzh0CMmFVrRVAyMTb10/NaVDci+QiAaID3YbuXYqdb30KQWzeaC5Vl9km7+r+6kSf+ /uM+20LZzr8SkozOyC45hLcqDeU2A+J/JRw69WsY2c/TB0dcJ8pUkskB0TYHD0sIc3S1 5dDEg6T2BXnLVfUx8zbk3N7UPKC+6LGSg4b6GfGELO5YKmW9EzbH34zMtJgM6INiZww3 +S8KRtYtFWZ/uirM4pC7gzu5+oUKmDBbXsc7K607CJPQqTr40CDeoOk7IgrlyfnEgz2H TJr6VSGjk9MzbmtOaREGPeU1AB/wY0yyRx9RaXATlZ8Dbb01EnAwcBjsA5U4cuF/WR7F lGzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=UNeA1msW; 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 h3si5750371wmc.276.2017.11.14.18.54.30; Tue, 14 Nov 2017 18:54:30 -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=UNeA1msW; 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 9143D689E9C; Wed, 15 Nov 2017 04:54:14 +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-oln040092009014.outbound.protection.outlook.com [40.92.9.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC11B689D92 for ; Wed, 15 Nov 2017 04:54:07 +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=i44FTOZ7dCHhKCzrFX/uS8SNFOx0Ozc+L5yaPg8acK8=; b=UNeA1msWj/pxyA+6DfZrhrixhPOHWtxzNXrlVO4n058PHr9zDz4+OmSUm799hVTrasXJl2jg2GPgBlY//5sA8EK9qKeWCghD25EW4jVD3MKjsZF2qFBkMNjAPEbwh/Pal7ysGqpyM7pBfOV8kYoR/lzQSr+vO+FFj9eK7W6EJf4XibZjA3kqzPZt97oMpCfYXv39Vr2YW4qvRsMxeUe4WgW3YVmAErORw0EZEEJCzuzPEBAOeNdlwp5KTBBtgx2UwmVNf8mJvGqpLwFXFb9zUjQoGFdFBoYr+oRoUapcBenMCe7x9CyFcNyHvghaaWFZdnn7czS3IiIF1rDQ8K25Ow== Received: from SN1NAM04FT064.eop-NAM04.prod.protection.outlook.com (10.152.88.59) by SN1NAM04HT136.eop-NAM04.prod.protection.outlook.com (10.152.89.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.197.9; Wed, 15 Nov 2017 02:54:21 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.88.53) by SN1NAM04FT064.mail.protection.outlook.com (10.152.89.198) 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; Wed, 15 Nov 2017 02:54:21 +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.0218.015; Wed, 15 Nov 2017 02:54:21 +0000 From: Colin NG To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [Patch] Fix for ticket 6658 (Dash demuxer segfault) Thread-Index: AQHTWO7ObpKbc3otekKLmAa76Xt2w6MUx8MP Date: Wed, 15 Nov 2017 02:54:21 +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:65CE62E8E07CE8EC2721B15FDCC510984AE7DDD99C69F2A9613893A379D8E357; UpperCasedChecksum:90BE66E10C4FD07220A37FE13F9DFD57BCDE89FFDB2EFCF71138164720B26585; SizeAsReceived:7066; Count:46 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [xtTy2xveiP/Bpu3IiAAXkIq7+rKGk71/] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; SN1NAM04HT136; 6:SOeUbIYKYBGuzoGWWtQ8EAiYveww0hWjQObWqKckgwBTA09PgXsBHRnLZEZSTQBk+VBc7ltOuxqfzxZu1TSLPX50Wh0k2vOkbriaZZ5z8jSVhSFpOPliTUgwqrSEg+rLJ8dMelvuPTSaY2nGgJI6jh/vl3+yZxno/MrvxMv16hoaeROvxemVzwD1EwQUHgFGiv78nYSdAVi4ba1VwJDr9FHDAqyTKLiJFuHnsL6ZpAzXNoSZ6h4LM5o+pCGvlxZ6kAQfYaviCAIooLOaeF6hPKgCxfBr/J4urxwRolzPhSXDEmmMY74tVP4jhA2u6jipFQSBT0mK3voIPLuvereY3L32T4C68pSlTOBbWD7L3/Y=; 5:rysFljpcPo2DU7xYJCU0M5P2K8Fb2YQVKHJlKh/BBprqjDOHgzIA6hqXRDnRm6tnE2Ac4Yr6NqMfbhhOjI5DNecIZgdKgFGahMN323No+szvKcdIrgJzaCcg5uf++MCGd1VqfomG9jrlSsuT3FUMzW9OutYapAx4zLhg244G0qY=; 24:DYtPxvniM+v+m83veb5sb+vo6S46D1VC7bQ/OQ4r2uTWlGKwIqZdxKqHABRwAt7j2qlZcWmVQ2AP/ExMN6vPYrPXKJZC05yvln6MALzXjCU=; 7:58RzA1xgKJM1RrszGpMZhEJBYC9r78vdou6bD5VkepdUXNvymfpB6EpxfPjSz9SousfUYyBm5OYlS77M0kEtf2XJHYbtmjdd9oLWb8+7S0SU86qAUguPOwv4QdYlf59iMcTvOnfXCnuf8NxSqyJZOTy4dhhD4u4VQJxEAlGH9KnBTkAZD7+GCvOoyNZE693X8WPdac9bwddrwopmvCLmHYpwZJhNIGN5EVPpF3RKrO4pmNmkCxTJZvXzbfgu6v4h x-incomingheadercount: 46 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: 8ba1094c-7cde-4420-0795-08d52bd42c08 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1603101448)(1601125374)(1701031045); SRVR:SN1NAM04HT136; x-ms-traffictypediagnostic: SN1NAM04HT136: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(444000031); SRVR:SN1NAM04HT136; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1NAM04HT136; x-forefront-prvs: 0492FD61DD x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:SN1NAM04HT136; 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: 8ba1094c-7cde-4420-0795-08d52bd42c08 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Nov 2017 02:54:21.3171 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM04HT136 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [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" - Add a function to handle the base URL Processing described in section 5.6.5 of IEC_23009-1. - Fix for downloading dash content with byte range info diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 0e3afd2..0be8a49 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -148,6 +148,10 @@ static uint64_t get_current_time_in_sec(void) return av_gettime() / 1000000; } +static int ishttp(char *url) { + return (av_strstart(url, "http://", NULL) || av_strstart(url, "https://", NULL)) ; +} + static uint64_t get_utc_date_time_insec(AVFormatContext *s, const char *datetime) { struct tm timeinfo; @@ -392,7 +396,10 @@ 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); + if (pb) av_freep(pb); + set_httpheader_options(c, &tmp); + 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; @@ -522,6 +529,22 @@ static enum AVMediaType get_content_type(xmlNodePtr node) return type; } +static struct fragment * getFragment(char *range) +{ + struct fragment * seg = av_mallocz(sizeof(struct fragment)); + + memset(seg, 0, sizeof(struct fragment)); + 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, @@ -530,11 +553,13 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati { char *initialization_val = NULL; char *media_val = NULL; + char *range_val = NULL; 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 = getFragment(range_val);// byte range on if (!rep->init_section) { xmlFree(initialization_val); return AVERROR(ENOMEM); @@ -550,11 +575,13 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati } 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 = getFragment(range_val);// byte range on if (!seg) { xmlFree(media_val); return AVERROR(ENOMEM); @@ -571,6 +598,7 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati seg->size = -1; dynarray_add(&rep->fragments, &rep->n_fragments, seg); xmlFree(media_val); + xmlFree(range_val); } } @@ -613,6 +641,86 @@ 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, "/")) != NULL) + { + nameSize = strlen(mpdName); + } + + memset(path, 0, MAX_URL_SIZE* sizeof(char)); + 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])== NULL) continue; + + if (ishttp(xmlNodeGetContent(node)) == TRUE) { + 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); + int isRootHttp= ishttp(root_url); + + char token ='/'; + if (strncmp(&root_url[size-1],&token, 1) != 0) + { + strcat(root_url, "/"); + size++; + } + + for (i = 0; i < n_baseurl_nodes; ++i) + { + if (i==rootId) continue; + text = xmlNodeGetContent(baseurl_nodes[i]); + if (text) + { + memset(tmp_str, 0, sizeof(tmp_str)); + + if (ishttp(text) == FALSE && isRootHttp == TRUE) + { + av_strlcpy(tmp_str, root_url, size+1); + } + if (text) + { + int start = (strncmp(text, &token, 1) == 0) ? 1: 0; + memset(tmp_str_2, 0, sizeof(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, @@ -672,6 +780,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; @@ -966,7 +1076,12 @@ static int parse_manifest(AVFormatContext *s, const char *url, AVIOContext *in) xmlFree(val); } - mpd_baseurl_node = find_child_node_by_name(node, "BaseURL"); + + if ((mpd_baseurl_node = find_child_node_by_name(node, "BaseURL")) == NULL) + { + mpd_baseurl_node = xmlNewNode(node, "BaseURL"); + } + // at now we can handle only one period, with the longest duration node = xmlFirstElementChild(node);