From patchwork Wed Dec 6 01:42:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 6562 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp6379778jah; Tue, 5 Dec 2017 17:42:40 -0800 (PST) X-Google-Smtp-Source: AGs4zMYC2bOQUvveB0WmKtJW42Y9xWNkRpaa+hgMzcIHBxmbzniV5/ivdTCN7c8VUBm7VZks5fb1 X-Received: by 10.28.142.75 with SMTP id q72mr11094217wmd.45.1512524560197; Tue, 05 Dec 2017 17:42:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512524560; cv=none; d=google.com; s=arc-20160816; b=MlzeshmcW+8Bd5xxxNacxxB/0rvtJ2QmiA/+m6UZEkCVILMrpgn6nk190XEvmSnrRd buU9w91V/fUusRBelnmDae8gcI0I5n8DISvHtjrI7kp7eBu6yvUvrRo/gVYAgsLvc2yR R1s4RI067aWf3/tLKgjbeDQEBq7DmM6Iw/23LLXDxuOViK5dHtG4gac7iADvhUIi0uuw 7lKcr2txtHRgaU0w2DQiq6dbQQ0Yxzhq1uXlV45ulSyAOkFdnq2X1UdfH2ydIco1tdLf BMSgg0z3WNFCJWtV/kXFBuxH1fzpR1fvYaM8cmuUnhrZzAFl1nLd0Up3Ru+l8kd/LlgV aLQw== 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=ZPJWP/CeHvM3R0TL4SNqm82RHZgS8RI6VOuQ1+H4Nl0=; b=WCU5avn/UoC+J6Sk8tHly5q7qbmCO5gmflnO8tDoqbqL5WF0f+HL75zSr+6RIW+jxa EaLS+djm9CmOhHJfunAO7TTely3E9CazFWZc+Tsg/3nM704w1Ql2RwqC+5l8jT/kNnXn jss2YW3u8rL6W/EeI3KlVygUo2aBHWmeviWeLSaaWtHO3TWXPZ57QufgMsTuCALO0+6O oN6Ent7qNg7lix4c8Hlp3LvFIzZi3XO7y1UMkvnbh123ESU6deSKvSvs2YXYGhWFxV1Z FQl++6D7oWE5q4RTG0Ge5eNRuahRA8jx+N3sZZkwdcqy78aWjNxEnw7dPfUvJQNKRptC umkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=mnGSEA82; 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 h17si1082473wrc.120.2017.12.05.17.42.39; Tue, 05 Dec 2017 17:42:40 -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=mnGSEA82; 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 6D73B68A381; Wed, 6 Dec 2017 03:42:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-oln040092002048.outbound.protection.outlook.com [40.92.2.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE394688270 for ; Wed, 6 Dec 2017 03:42:26 +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=IWrC7de4mKnltdegYcq02RgdQU4HkfqD4kH77h1XsQo=; b=mnGSEA82STAHK9FdUwqUhdfJKX6TyWGpltPg/qifxad0QQJ2oqovPL5p33Y7q6NUEXZwacMOlm2e/QjuXV4ARl86535c8ZriKgLpJstizJ62NzxMyL6sAXlhV1qm5ATtFNH34YqmakkkgcllEFay/jE4sZjxelE6/FQu4/ZAto9l/gbyqdRCh3CghO+nKnojo+rWo87/J/WmHNwfQXu1JmzwOkqccTVgAFY21c2xaNJeBN3Mr6IYUJ4SNrWs2+RhDBS1E9RJ4DhjD516px9HoSTwgdahxqbfU+NrNiE9r3zWW20e/egRdnqNFTTI8FEvIoZujVa9KvjADo5TQPwrMg== Received: from BY2NAM01FT029.eop-nam01.prod.protection.outlook.com (10.152.68.58) by BY2NAM01HT180.eop-nam01.prod.protection.outlook.com (10.152.69.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.239.4; Wed, 6 Dec 2017 01:42:29 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.68.51) by BY2NAM01FT029.mail.protection.outlook.com (10.152.69.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.282.5 via Frontend Transport; Wed, 6 Dec 2017 01:42:29 +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.0282.012; Wed, 6 Dec 2017 01:42:29 +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 c... Thread-Index: AQHTbjN5GrfLuUqdHUq08kUHHoGv3g== Date: Wed, 6 Dec 2017 01:42:29 +0000 Message-ID: Accept-Language: en-CA, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:5689EB20E11507F8031EAFBEFB54262E9DEE5338DD91C3BBE7FBF7D031B85B19; UpperCasedChecksum:FDC1E7A0E73FD52DC2C1434D23BB654433F8D10AFAFFA29FBFDCDE30287041D6; SizeAsReceived:7338; Count:45 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [GJiylDp08LpKj50TFIQCRP3DVBVZGO71] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BY2NAM01HT180; 6:8ZLu6MknnZmiG6IAuDtl3AqvA/1E4oamA5UwmCtZv1+jAcCOjg1mog/9xNtmnD/zIXSNwARvJU3xdv6PLXoyF3O8lRa2oG4608DHYJReu6leaP6/GFk0+lP2BwyYIKy+zFSzxHCOEZcWq0xfnHvPsWgBFqeWZl7NG9ZoTsL6qNsEAxvu+EUVhj94mRCXxrTTdQe5B0bpoBttQf9/lztZSFZgGdpcS9ttpCstSsMlLc95qxUpr/ZLldVq3vAhHoncWRk2ArxUOdrbvnpL8A4VoFNFS7epZSWHcVF+/81+5Ns8gtcEXrWCBU9S8n+p3nzh/cKClcN/C8fDaQjWhhcLAc8LBUoOU08w22BPbb1jXgo=; 5:2f3WizXD2+YH7ZjnxQI6Cwnc2f0pqegTxEVuWy8W1vJuozsC31szU4QwsZZPHrC05fCuCmG+BXjVBaCSFEjphJT0+Sp3GDQBYXeU+LSIbgzImIEuWc9SKpXKC8j7o6FIhm7ZuhJTjRh+ue8JAqlZeYrZOsRYKoV7m9EVk6KRCvo=; 24:345JJAy0P49AdpOx7Gr3W4DwviBc9s3FAXzKlVyHnoeYs6rbuisGwW8wGshM+KWxLD0vBqnGRb6Z1SEAhwBOi6Dy6R4w5RFOy6y4QDgIvWA=; 7:HEkz0HNNwRp572biygVqmBweNSUtglwOs8zNhDwyYLWN1nfLeDo5nfN3bLfHV6gjR59SGauWEtLOnFb+FXRcjCIA607u+2jE3LGKl8r1AaoRz+NONKTWWybA/0eQGj1olXx4SNGcGyv3eeFpSSRhutB5Y6CwlL70fo2pwyWA7kdlIg6Z5WyAFT97jKdMPBcv9SIIoI+4UE80aIb8HwvvYTdnMiyilmBjQ2KyTs56He8LkJRGA3XTOMec1IFbsi7V 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:BY2NAM01HT180; x-ms-exchange-slblob-mailprops: +LiGfBxqLEsdIHHT6tlUF5C8KqA5s+GTz939/hlzfCNh7vwiAdrE3IieiWjZ/UQHoLp3xv4q6KPRoMzbLDvCAEbJ94md8ONq1mDfTkq9VgNL7oT++mM0thfPa55Is5g0sALs3o9UgCX1Tb22E9Os7S4TvekGSJEE1Bq9NQVbcRiQ8xQKyt6ApqPDNqZts3QE4Ubaha+7GElXwuW3EnZGpG5dIQou1YPURtnQXF85ftToiYCsh1MNKCI2OrIVLQBnWJ1nQD0IECrD+vzKWyrJU4k9xKx2LUOD952fPYTB9vc++BYHgwnC3ImSJ0NNKQ3dyTQXhn4PCwVbC0qqFcaRqd9xe3qBsRBv4CGZKomXx0CVjGhSkh7DEYlnTEzl6+kTv322QIHPrQjWjrM/+ug1Lbf+Nk1OM+/l3UqAyaX5EtumvRx0Iv45bargbYfoaVM99u6ApYQicbGrm711QORbyP3ZPn7kcBvRjc8UHi9A79BoQc94zUKbZm+JaAZuQCGgrsBGaR0BAFcwLzHVlfOaMLYhLoSfos0AkIuPFem1JOW8u02lWYiY4hW5IQ/dUovWcm6P5QETIJs0iWasgRFradJBOW2OIf28a2/eqxFF8RnjgiIsmsBvPxMRFgXmom00ymNunBE3/EwkQKbuAMv1OrXe/RbsVvmJ/4Dphe4J3fA0MznqwfXRHNIisGoc7I0xA9/OLKZL3ePj994FnUraDoBnfJt8NL5aCYSEKlxfm8OAyCLP57ZLm9ItxIhbDUE9Xp4WGnHfQBoA4EItzO+Cr0HjcS3/mUxj x-ms-traffictypediagnostic: BY2NAM01HT180: x-ms-office365-filtering-correlation-id: 1ede4a43-05ca-4366-1ada-08d53c4a9bfc x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:BY2NAM01HT180; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:BY2NAM01HT180; x-forefront-prvs: 05134F8B4F x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:BY2NAM01HT180; 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: 1ede4a43-05ca-4366-1ada-08d53c4a9bfc X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Dec 2017 01:42:29.3780 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2NAM01HT180 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 c... 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 | 111 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 98 insertions(+), 13 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 3798649..6e35e91 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; @@ -639,6 +646,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 = av_mallocz(MAX_URL_SIZE); + char *tmp_str_2= av_mallocz(MAX_URL_SIZE); + + char *path = av_mallocz(MAX_URL_SIZE); + int nameSize = 0; + int updated = 0; + + if (!tmp_str || !tmp_str_2 || !path) { + updated = AVERROR(ENOMEM); + goto end; + } + + 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 (root_url[size] == 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); + } + int start = (text[0]==token) ? 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; + } + } + +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 +785,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 +1086,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); @@ -1315,6 +1411,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 +1440,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;