From patchwork Thu Jan 4 00:42:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 7113 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp16537943jad; Wed, 3 Jan 2018 16:42:54 -0800 (PST) X-Google-Smtp-Source: ACJfBosdw+MESoD1AbdTJu0VXAByMOhOQqCFe6H0dpFiBC5oh0+BmQ0QBuPD/9MWGmDWypFrywIC X-Received: by 10.28.87.78 with SMTP id l75mr2432794wmb.98.1515026574716; Wed, 03 Jan 2018 16:42:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515026574; cv=none; d=google.com; s=arc-20160816; b=c+2KHZMVB+jAIkg5Ft1dlKO/zDREASkcPOnSWYtB0/VH4jw4NSfI0YP8CbZLbiFvch ngKngTsqmX2qXlOrX31+5cQoLAwBgaozfautHaauwTsGg9uxAqJSPUQibiwxW4SVXs+t oK1v+t+4OCH7YgJGC2od2L8Qf5rD5/ZYUp+iQBaMHrVxouddBLccJHWBRv0X+xNJTYEE NxKeVNwINVxXqK54t3nsJjAM8lSfnWnZ5j2w3g9OgxPSZJvyrZG3wSrD2YgHDswozINT t/XSrG3aGgWVOVjcbvaDs5lKA5DBHUYFOZppLU1xlxTcWRldii3F+ZPiGUn0ksM4OInp vRaA== 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=IFgTf0alIh6u5OfzzXp1APMYrrZ24BnM7dkt0tQ7hiE=; b=RBVp6jv/NqN33R8orJtACcIx/q4rFnQibavb1nY/YMvKmI3CiffB4trR+KyBHEllzs cTmkYVm8k8qFnLmPxKiev4cQ0awV1o5UVsAv5E09guMdwb+laR5b6Bp5ezfa9TYZOrSj G92GfbI+RE76pRZ6aOJu2jiw5oLX8vbkyqxgCYuGNmX6jbfc+vs743BXs4KndwgduUhQ eh+Y+K/1lbUgB4hySVTiCQKGdBNqv/Ph5uvyYnJ3bYtU36ZsBGzhFNM1XpgAeZEO4iEN mIRvdlCYJ2cPOXCnlD1m0SF1DIhc2sPSflN8p7wKKVT3X7/HbivHiy5BeLEgZiJA8OC4 yzWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=bHgriUyV; 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 k39si371562wrc.200.2018.01.03.16.42.54; Wed, 03 Jan 2018 16:42:54 -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=bHgriUyV; 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 8D72E689732; Thu, 4 Jan 2018 02:42:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-oln040092006092.outbound.protection.outlook.com [40.92.6.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F54A688351 for ; Thu, 4 Jan 2018 02:42:29 +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=tQ4wfIXSP4TO/PzuXMSxK50noWfNPfMUyHn/hN/SZS0=; b=bHgriUyVoT/H7RFJaxpDh4No/sN5/Uwix5CF51WyV+fNs9uVLf9JS0Zx9o2DPmG5bLy6jWfwvk3FMLK5ArVRZGRvkVey/j4yFuODfcxpHZooup7vtsUuF2/v/GL22w/2vSYKbooOBAZNF68Jifij83jbBAY+qLhdfpB3ZiRXCUUeo69CMJqprBjFE+TVPeQEdllkhK71YJRT6S445y5f0SEXeig+Sbo/9cHKmQffTrns3Y/41hRH3n1XqNfD2TR2ccyPTbLQc1tP5+dhiK9JTIaij9zDmW1RDrw+WzJMmaOT2O/H3Hkrlx9ko/xhcIl39cmNOEmWLTXYACth/beUZw== Received: from CO1NAM03FT062.eop-NAM03.prod.protection.outlook.com (10.152.80.56) by CO1NAM03HT121.eop-NAM03.prod.protection.outlook.com (10.152.81.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.345.12; Thu, 4 Jan 2018 00:42:43 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.80.58) by CO1NAM03FT062.mail.protection.outlook.com (10.152.81.50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.345.12 via Frontend Transport; Thu, 4 Jan 2018 00:42:43 +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.0386.005; Thu, 4 Jan 2018 00:42:43 +0000 From: Colin NG To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/dashdec: Fix for ticket 6658 (Dash demuxer segfault) Thread-Index: AQHThPTu8JyaT/PA9kSYIEVt4+hMHA== Date: Thu, 4 Jan 2018 00:42:43 +0000 Message-ID: Accept-Language: en-CA, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:E1CDACF81B212D50BB4B1D16EC16D7916E5BC844A71CE5D5B14B1B12ACF4B26D; UpperCasedChecksum:9FE7E6DB1D05D8F6FE61100AAA720FAE4C9BEF78A5E2FFE96EC82576D695030A; SizeAsReceived:6941; Count:45 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [abZDJHFDMnt++Gv1Rr91YsYGwLeQ3ka0] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CO1NAM03HT121; 6:GxJjMoJgK3VyDk/1iYrrs4rbISozAq+BM6XjVWglZIBRB1SEIwMHdd0c2yzbNc6mGMch5N96GP5iayav3W1vV2kSp0AteChbc3Hc75q/6a8A0P00Ay+1DYUSIQaf336dPmXlA5dJmIcSc0lAsa91/bDQEba8OYxXfjBehFF/ordUDTAU4+shzmSVPqss3hDP3pxygT0u80aOcb3WGQpF/Mq2jWXsQwyS3xvnXZJZAW/I98+d/oIZcNdQAWTXCoqIEGk54vrSuOLuMDOxQaxomJaALrZV5XRRPRiqCXoHr2LarCAGcxPF7nvCnTCslLjdZojc6vCtd9fTkdSvDtdyQm9fHOH9Y5twYMlU/kTKpaY=; 5:2qCGuCrieRcREv1lvkk+A1xLhJDRT1OZu7m9kqyvZGElwhaRjCQ5hqJ3j/h2H4fP12kkz3KQhjP8ab9V+hYr6ZccZwbHUzJa5yTT5P3GZuirlUTSEP04rPQ92Y8VtzbLlHpMIFPE7MSwX3uGvfxX4uoobxscri/HuVSYM4/1/mg=; 24://D5TV7OSy7EcRcuQjlr5dxt2coMe5gkCtMr2vjNvt1HA5mmeTdTtoKrib59t86tVAboEW0U+mo63sfZLpEzfF7h6yLMM5BML+3JZGIQ0r8=; 7:xSKYMDFeFHda+JrR+LBal+SfVZH5Vieot3uMiOxa5jHHVPBZchRr4BwZr+9n6z7nM6Jq8oucL60WLol2HJ6ARCgsF9GDydstMc0tLYtXv8RoB92Bzl3/mZB1mgQhy0jraNi8LWKqBvjZpJmFGI5cC3CD8zrCJHDnk0x/gz6kDHo9Sjysy4HVuwRBqbNxTAZAaB0VzWdVBOcBtnlty0dYnUt9zptlxNTNyJuP4/CSwCduiPN2zeDnAPTXLIm44WyY x-incomingheadercount: 45 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020020)(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(201702181274)(2017031322404)(1601125374)(1603101448)(1701031045); SRVR:CO1NAM03HT121; x-ms-exchange-slblob-mailprops: 3tYrFWTD79BV/WBB2lbwF2of1nx66ZCmE9KoctQOcMIX8g0rO1PSZkJo9VFgmXf0yAChg7kTymq86een8LOyBg2tRB0lZZihFdT7xdg4MQy5Pdd9qlf8VuuE/Jaa3ostEVc4apkpZ2tulHnG/OVcuCKuBQ6jrE29RjGcPj1uRnrR3KjFe7HsdS6u/fPWd0GZHP+50hmsoyeeser6JgzSvxPRpREvX8G1IUUoBVS8zVyPYnuho+UyWDJebExAjUziK7VlnV/7yKcdQW6RT0BslfgFj0LCDqmCsSlvKmCEcCMqaiBg65WnIslcgp+00nI48DN3kHKHMf+Pt40p+g5SifGmdjmQueGTWNRCn3gqWh0HivXJGmvYcq6eLYvML236hzkGAn5rIYz7r/8towQynXHsw1wbG8dPMMnX4aIHKOzg2yvjuZX4X/A8RJV1JFVimyH4UHkHB1EGZjedAhHLN1olf+YpcMjAxh2TOEvnJEUp8jFMDl+lzPUiCyhLc5USVhtnmR9U8sMPhTUxDpAGYz0bk6mreL/IMA86vcWzTh608xO0LqPjNHG5RaL6CSgmJtvKeNcvzVxzUKNlGElI2ivFez5uTKMQM99x4ahq+bLazEjqJGkqT8BkSlrtEpJMqr+IaFeLFK6BM9mkDr53n4cDzjMPbulH3d9hjualbZTXttItMH9ik1KhEXKB5iz+x1aSwoiyUwbeFOaqrtULXq9OsdfaOcnuEqpZrdZnd2LdQ5dza4e4kC1BDxq/C10dpWPfK/tFr78x6N11SIlJ1vHAZk/kGudS x-ms-traffictypediagnostic: CO1NAM03HT121: x-ms-office365-filtering-correlation-id: 054e24e1-ab2c-473f-79a2-08d5530c10a6 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:CO1NAM03HT121; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:CO1NAM03HT121; x-forefront-prvs: 054231DC40 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:CO1NAM03HT121; 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: 054e24e1-ab2c-473f-79a2-08d5530c10a6 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Jan 2018 00:42:43.5289 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1NAM03HT121 Subject: [FFmpeg-devel] [PATCH] libavformat/dashdec: 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 Cc: Colin NG Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" - 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 checking for newly established connection. - Establish the communication protocol in each connection rather than applying one protocol to all connection. --- libavformat/dashdec.c | 126 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 113 insertions(+), 13 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 3798649..5345f91 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,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,103 @@ 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 = NULL; + char *path = NULL; + 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; + int max_url_size = strlen(url); + + for (i = n_baseurl_nodes-1; i >= 0 ; i--) { + text = xmlNodeGetContent(baseurl_nodes[i]); + if (!text) + continue; + max_url_size += strlen(text); + if (ishttp(text)) { + xmlFree(text); + break; + } + xmlFree(text); + } + + text = av_mallocz(max_url_size); + if (!text) { + updated = AVERROR(ENOMEM); + goto end; + } + av_strlcpy(text, url, strlen(url)+1); + while (mpdName = av_strtok(text, "/", &text)) { + size = strlen(mpdName); + } + + path = av_mallocz(max_url_size); + tmp_str = av_mallocz(max_url_size); + if (!tmp_str || !path) { + updated = AVERROR(ENOMEM); + goto end; + } + + 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, "")) ? baseurl : path; + 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); + 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); + return updated; + +} static int parse_manifest_representation(AVFormatContext *s, const char *url, xmlNodePtr node, xmlNodePtr adaptionset_node, @@ -698,6 +801,11 @@ 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 +1101,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 +1426,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 +1455,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;