From patchwork Thu Dec 21 02:39:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 6882 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp321694jad; Wed, 20 Dec 2017 18:39:27 -0800 (PST) X-Google-Smtp-Source: ACJfBovBx7RxQrpV6oirGvJNErKLQ8MoqKqctEU4YsQu+kYZB0TuFxvn/1e8a3bz58GdtENTz8pS X-Received: by 10.223.139.94 with SMTP id v30mr2500174wra.166.1513823966978; Wed, 20 Dec 2017 18:39:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513823966; cv=none; d=google.com; s=arc-20160816; b=az+AenQre1n83/9iba4JYhjVwdL8TL7MKZYz5oJGG0nvheVIEfBwhb+wZ8bmGZkru0 SJWwrhnEUp5axAE5C24CNZsThET5PfdQkeyRb2/JnVYl5JxReo2GMYp9RCW/AZGJGdwT nv237CmTzU+pOiFD7dFrmouO2OuW8mWNOueAy11q17zdrZk0rJFU5vwusORDp62avWYE UQiULISbvWYtDoIrg8REX33kuJcVuE3ZbxsL/HG1A5f/SOS34T6uCRq3NkLdZcGpGeBh lfZ3NjxxvI9hyVmNP7ytRPQkq9WsdAkN/JZ9riF7ysyr3kP0n1njtCZ9M8HB6BZupQZX dUtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:spamdiagnosticmetadata :spamdiagnosticoutput:content-language:accept-language:message-id :date:thread-index:thread-topic:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=Os2m6DVvblukqgzfn+qcezmq5+teTB+3ol8W+KFtkNk=; b=qLygeEdCeV9zeOjtOIcrRykGm2AmRTYysZW7EZef616/Maeu54Uqadx/ojYdvgTDP0 RZJLoRB4FZHzkwhWWNPIwe6rdOs6o2A1t/zFeylBSFsVHqzY46dNS9TZebc5/SA9O/uu JBu+QdrIXdDDUwdVltIBCZxyXMc24EkHW9LBHC4ot6Yk+Hw+GXM1fUhC2jA7QW2wU8Kx PM/fr0mQwr/bsYhJ4N0dsFwASLDFU4bBKxpUXBhLSXPqHXhf82KKXMkUqIcdRrgeu65b /5woOs2XEz7AG7ZM30PKfkf0vpIe1QacyimT5f3a15+vO8B2J0lVrT9XceZkxS3F+zxS snBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=h1/fCmfj; 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 19si14976022wrx.524.2017.12.20.18.39.26; Wed, 20 Dec 2017 18:39:26 -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=h1/fCmfj; 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 82313680D30; Thu, 21 Dec 2017 04:39:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-oln040092004066.outbound.protection.outlook.com [40.92.4.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C76F0680457 for ; Thu, 21 Dec 2017 04:39:06 +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=NsUBpVKyWKsdLRSM8FiZPbH1XJ6m3Wr7CJMAQrax8CU=; b=h1/fCmfjrqKDbDK3CI8wykQ+ip2q4ucS/QDFDhCv7upWTVeGeARFcnalwE+/bPxynlXiQ7Ktf4K/qOe9uTpMsd091sT627RBgcF8qGJMIIEmE365xMVYRFLlk3CdcUfDuHf4xRz/Qx+XWoiEY73ekaBmFEyh20kJcdNSxLSOHkdVL4qdgNNZCjCWJln4WfX/bbP7ZuuwUTR9boQlpQxdksPZuIqzOUFXIOTv+fnSsEwMSRM/6y53yPVDT0tmPWEMHKxIRp1By+bDrLRczg1UReFo9fZLSWRp6fjFadNgiofO7tYRleIqT3M4eohCtcW9wnAF+w8hY9HGD38Xk31gYw== Received: from CY1NAM02FT054.eop-nam02.prod.protection.outlook.com (10.152.74.53) by CY1NAM02HT046.eop-nam02.prod.protection.outlook.com (10.152.74.124) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.282.5; Thu, 21 Dec 2017 02:39:15 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.74.56) by CY1NAM02FT054.mail.protection.outlook.com (10.152.74.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.302.6 via Frontend Transport; Thu, 21 Dec 2017 02:39:15 +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.0323.018; Thu, 21 Dec 2017 02:39:15 +0000 From: Colin NG To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/dashdec: Fix for ticket 6658 (Dash demuxer segfault) - Add function 'resolve_content_path' to propagate the baseURL from upper level nodes. * if no baseURL is available, the path of mpd file will be set as the baseURL. - Remove chec... Thread-Index: AQHTegTkDdjrk219REe/+lrgCqEjaQ== Date: Thu, 21 Dec 2017 02:39:15 +0000 Message-ID: Accept-Language: en-CA, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:E71BD86E2CF4CF746D0413BAC528AD11C76612C191A7A5D88454CD043DD62267; UpperCasedChecksum:8A241956E7FEAB4591DFD8D2C732B869CB2DC71AB286A0C2FCB4576DBDCFE3DD; SizeAsReceived:7328; Count:45 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [D1omZNz9C7opgUFR8isBRUbQjEltMwVm] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CY1NAM02HT046; 6:cQaZsI4EftFJ8JCYuijUoL9W/FiIMQQbke5Aqa7eK82mSUKyRj9fxvia3/7AnA3XwDoGJvE6P4mVmqaLxllZ/nHykOuAP98DKIFNiRZQz/uNEWfFUfcvmvjURDEIXSjGBMxy3Jw1Dhj+teAVMFYsJg82x3Avqg4TotQwgjEmahQBJR+IjoJ7tPijyzGsUXzwro1D0DXnfpHLbGiX3WXksGy8GQ9qTYuUH7+tj+vpzExwpZsQn8d6PqHujG9IqTeaUfIkVyv20JQebb5VZ32TaXfX91PSKc3we0Ndew7HEHARoVcEos4xti7anE0raJwVE6fTsn2tRXC1q/yTfTyFD4eVXSWCAKlTyDKsQCuxtw4=; 5:YcBAkXUooZNX/j/CJwrdlBNPnn5yjg6M3k6XEY9oqKy3it/2hGFkhPSu0O8w+oLmVuKOX7ex2+TW5uga02EfbcKNzE/icD9f9RvlAhI2IQm5QKc8zt06HkFeANmLS0WT/Kg4ZtSBDW2VWc/YDmV8oc9slbSXwfs7XgYmyWB66MA=; 24:zP9DKT69Sl3SnSA5roem8zXcWNPjrHjad27JRDW7//Ptg2OIbpoqTWW8YMG8ws3o6KVLu/P2Wh4rVGjFG2i7DZMaFjyFr7Mka83IrFuOlEI=; 7:Mm28auHFrIa8Jg5YyRtkay+S30a1H2lNxksESJ64CAnJDbd6PtI4W9sZCgGbvX70vQh4oj9Gl8FKTSu1Y5xcB2ZrENBV3VltB8BYwZJn4qjmtrq/yi1MEtS2S4+WsVilFkSi95fHnryTXPMe6gTGe2czsubYk5PmvO3Ne/gTb5NDnrXNzMwjqV2pVcykqwNlTrFsqwp28nVzw6NDmRoi1bysMra/2rovsvTR6wAT9upeWXvAjGKDBsaxE6EtxYXU x-incomingheadercount: 45 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(201702181274)(2017031322404)(1603101448)(1601125374)(1701031045); SRVR:CY1NAM02HT046; x-ms-exchange-slblob-mailprops: 3tYrFWTD79DsMKuRZxA9ZHRqWqfISs6Snaxpm7oqLE7bt5GLzKdplLok8+XM7Q7UrHBT1ri/Hcf4Xlzy0P+2MUnbDBOrx/dgRf2gn2v0S1x29G6ayIWpgjlHiRd2EZqka0agNy9GU+tLrMbBN8mKAex+/ZKJvivh86h++uKkBA6JMkeo9cyUepH/+2sBv6sL+2QT3xqOMrKU+kw6zTc8HONmjM56ygV/05ZZ/loh7nLTnNXOxg2G2XSjGvLJ5tF3x/KRRjbIC4N+XMW5q7T0DZLz1IcG/2+l5s4yt9bvoXiDfdMBDsw5ZYFaiywff95Go3ejyKGxbitEKBnlhJmdIxBDDE6/mRdZvVr5xCPeAAcacjD3UiZu5vcptbbKRrOoVPaUsJoPfoiMpuJEht35IDqTIrIbOtQoyO0WZadmxRZvoxUudoJRlthFucFLmfeQ8R54mi8R4eEydUiY3Tyb3r38ABw8+rh8krlPc1+ouePmz6Mp2a1EuAbv27BtFSQj85O5nc/By0+SjIj9gBXyYG7sUJvSDCIdTRxh7YbPyID3yw3EGND6vXg9eVF9CpoyhexaO0ylxpAhObC5I1pK7yl7aLiEdpu879BrLZxk3ZtrVlI3fkdOAlMHqHr3/MVAIPIAkpxd20TJNq6oN4kDC3rlwuMhfLcBee1miFxExn8/MMZzqb4Kh3ciIafJKOWISulsQp7dFRgVlDikRUhelojVbV9UIIBgHOBeewvzSkagYO+zCB0sqvwOYSb71d34NwDbuzzgtgestpK/OJLAApZ+hm4yfZnI x-ms-traffictypediagnostic: CY1NAM02HT046: x-ms-office365-filtering-correlation-id: d319c58e-677d-4b66-14c9-08d5481c0664 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:CY1NAM02HT046; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:CY1NAM02HT046; x-forefront-prvs: 0528942FD8 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:CY1NAM02HT046; 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: d319c58e-677d-4b66-14c9-08d5481c0664 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Dec 2017 02:39:15.5518 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1NAM02HT046 Subject: [FFmpeg-devel] [PATCH] libavformat/dashdec: Fix for ticket 6658 (Dash demuxer segfault) - Add function 'resolve_content_path' to propagate the baseURL from upper level nodes. * if no baseURL is available, the path of mpd file will be set as the baseURL. - Remove chec... 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 Cc: Colin NG Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/dashdec.c | 116 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 103 insertions(+), 13 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 3798649..cdb9f67 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 int ishttp(char *url) { + const 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; @@ -639,6 +646,91 @@ 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) { + + char *tmp_str = av_mallocz(MAX_URL_SIZE); + char *tmp_str_2= av_mallocz(MAX_URL_SIZE); + char *path = av_mallocz(MAX_URL_SIZE); + 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; + + if (!tmp_str || !tmp_str_2 || !path) { + updated = AVERROR(ENOMEM); + goto end; + } + + av_strlcpy(tmp_str, url, strlen(url)+1); + mpdName = strtok (tmp_str," /"); + + while ((mpdName =strtok (NULL, "/"))) { + size = strlen(mpdName); + } + + 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, ""))? path: baseurl; + + if (node) { + xmlNodeSetContent(node, root_url); + } + + 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) ? 1: 0; + memset(tmp_str_2, 0, strlen(tmp_str_2)); + av_strlcat(tmp_str, text+start, MAX_URL_SIZE); + xmlNodeSetContent(baseurl_nodes[i], tmp_str); + updated = 1; + xmlFree(text); + } + } + +end: + av_free(path); + av_free(tmp_str); + av_free(tmp_str_2); + return updated; + +} static int parse_manifest_representation(AVFormatContext *s, const char *url, xmlNodePtr node, xmlNodePtr adaptionset_node, @@ -698,6 +790,12 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url, baseurl_nodes[2] = adaptionset_baseurl_node; baseurl_nodes[3] = representation_baseurl_node; + ret = resolve_content_path(s, url, baseurl_nodes, 4); + + if (ret == AVERROR(ENOMEM) || ret == 0) { + goto end; + } + if (representation_segmenttemplate_node || fragment_template_node) { fragment_timeline_node = NULL; fragment_templates_tab[0] = representation_segmenttemplate_node; @@ -993,6 +1091,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(NULL, "BaseURL"); + } // at now we can handle only one period, with the longest duration node = xmlFirstElementChild(node); @@ -1315,6 +1416,7 @@ static int read_from_url(struct representation *pls, struct fragment *seg, } else { ret = avio_read(pls->input, buf, buf_size); } + if (ret > 0) pls->cur_seg_offset += ret; @@ -1343,18 +1445,6 @@ static int open_input(DASHContext *c, struct representation *pls, struct fragmen 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_dict_free(&opts); pls->cur_seg_offset = 0;