From patchwork Sat Dec 23 21:47:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 6933 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp4006451jad; Sat, 23 Dec 2017 13:47:16 -0800 (PST) X-Google-Smtp-Source: ACJfBosK5tL+LleWHRDMgEyymBJgpMk2cIUrYyIE9njkAIw5lHA2ffNkJmkXOoKT+LWGbMPCmOWY X-Received: by 10.223.130.106 with SMTP id 97mr18379265wrb.59.1514065636896; Sat, 23 Dec 2017 13:47:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514065636; cv=none; d=google.com; s=arc-20160816; b=Ct3/V7BZ+fZykMm8B06Y9ouq/gO2AZmeXAQdGW66s4xrtyevb5+/J2yo0Fmz9YnrgV D1C4hJiSxbpyGCEgZXXqEHvlkauVTBmh83v0rk1cjgIHThsbCZjKRZwnF+OuuStfH/Pa A3/KcjQ2CoDge8FJGVeoaFRmzJuxIOl7eaVjTcoFeCzes+cUc3960bQJ3NxPGYDZop+L QzGlIDlGLdhGOWHsIxx8+ZtV1nHsTsvy9UysqEBhWJXLvMJUJNTVhimnO1siBbRj2zM0 dbl/Vf2wTno5mLogt1B/psOwZSAh09snyG3IGcIXxksTMNSIXCEosdICdAmIkSSG2v+m 3k1Q== 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=Ae2l042jfkNfDywsZeMunfRoTaA++hF75pNnb1r9Y6w=; b=FPTzCDHcwc9Cqh9iU6qmJhEK5OzC0oF1mDsxrKzIDKDL9OKQDYJPUcYLjxxTE1XHtM y9tyL9TAJydgGsj6m/b5L0NqPIR9O/CsojF1vPfc8lQzBQOw6C36bKv2s01TG2CCxU// A2WWipv0GTvykD7DckSAeKU9dEUGSYNr7iWG+w6iYfAvbarZDvEWQwwPsIEvJRcX3L31 8o14Wa/2Bhn+EkKPNqghvbF0v8ELXwtoQeLRYiF8f/hK2PlS9ouYNRXl5hbVG0Ns/Wc3 x9MjaV6+GlvTENPTLHeJFuELsT2Brr5c+M+WC0+OCHywKf7Kwog3bLZ/q9+0YF67HEQr pO5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=de1eyHBk; 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 d9si8241067wma.72.2017.12.23.13.47.16; Sat, 23 Dec 2017 13:47:16 -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=de1eyHBk; 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 0503868832E; Sat, 23 Dec 2017 23:47:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-CO1-obe.outbound.protection.outlook.com (mail-oln040092010085.outbound.protection.outlook.com [40.92.10.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9228968829C for ; Sat, 23 Dec 2017 23:46:55 +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=kM6IAiyO71pmSIubhB/zTtjY2coMOYMX57WSZW525P8=; b=de1eyHBkAkO8fQNUagfPeVHXU80i29Y2tcGh/jAGSeXMGDwVa9/OuTx0nMQTAZsYTC1R6ZuPs4ttxGrnyXzcHlrI+V6u8aYrhjAJzMl1yR8u40ZJuRvK6wJ0X0CcugAxhSpjIzy2Fo+Ps9HZyD8qu40auyfr9dB6iU2loYdWC52LIVb6kRRqrzAcfNFp7sfpZS4eqrXzx4QkrG84IjOXYhOeyHnK5HjoWiTv6hD3dIu0szo/SzF0yiOqftervK95dmW7w3GojN/PAVRXFY2TLzyzkrUseV1rDHpjy8JZ4Tr3Smvfa1/DUfYoVHXXBi9RWLpiUZaTe0NG8rlARNC7bQ== Received: from SN1NAM04FT048.eop-NAM04.prod.protection.outlook.com (10.152.88.56) by SN1NAM04HT113.eop-NAM04.prod.protection.outlook.com (10.152.88.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.282.5; Sat, 23 Dec 2017 21:47:06 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.88.55) by SN1NAM04FT048.mail.protection.outlook.com (10.152.89.195) 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; Sat, 23 Dec 2017 21:47:05 +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.0345.013; Sat, 23 Dec 2017 21:47:05 +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 che... Thread-Index: AQHTfDeSjBMdLZgkmku+kEbUaE/5gQ== Date: Sat, 23 Dec 2017 21:47:05 +0000 Message-ID: Accept-Language: en-CA, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:08ECF6861082AF665C2154036D1595C3E685DE260AE8F3F8012E42BEBB3AC41E; UpperCasedChecksum:E1A076463D6E9DFC7FD5446FB47169C0B0AB03F7FECB1E0E63329CEA0F40F79B; SizeAsReceived:7329; Count:45 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [h5VzxoBsEFsr3S+7biUwvTUN53TR1IoO] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; SN1NAM04HT113; 6:fRJ8UxxeWatWixtDl+38SzUmT5d2rFwbrLZ5+rkwB0gtO4e5bQG9c6SvrxPfNdbZ0pyafF07t2WoV7nMgP1DuVeO4debLCOAwdI5mg+eyhGDs21joITyCIB4UNG5Kw8f7HXIhvhjz9RB+/A9Uoo5GLDmVp4LMhFXjoV/6FzW8FgIKKB011+sXqiDfuNiPZIaAJrFY+ztldY/2RHraa778k7teOqQ69a3XYknbpoXYmMTylhwBEW2Kp7tgQV2TGojN2M97tAzKCdQnSTieDrsVpduVCJZPY501ajdmU1sNbVMpBeEJ7mVN+TPGzVKz31xSosSK+yi1np33gxktsDNU+6sMPbETupdIrTGW0Td6UU=; 5:kO0/hVmMpadCIHwNZ0uhCojBirrPnV6c4iqFA+rW/ZQHuSsZbuKUT6wHJ9GmmyGYCXb5/ro1hyT57X6Ymbdf9sy+Gi8co7p30xQs7I+jJ6k2QNMahLJ6FJw/k/PvL5NzW9VHWOnYwFbS3T2VUTf1qJqwbcb5gbBjzOZ7dxbDubE=; 24:e6e9oWvxa9vcIziCLTGfCchos4/HINwxbPNxoe7baQ7nzRH2doeZauwUILMOzaDybpihWPm+8UJQdvc8+Ls/i5LN2ievuXsvPfzZouz0qk4=; 7:XyFg1E/sdedqjabxECBIn0k9NkHDYY5nh+zwXgHNbCi3PvzrW5ujr4/fUP1cB6ezPdhGIidzVjSMng9Luv6On5jbINVUCjoG/OoqMkkoBsMJbdGKIgC1EiQnK3ptju3PyuOxo5YgfulNou7D0X7wYKGT6q+DVoKCus65JoRgbtTs5FZ2wn/jBes1kV/tCgFyGhF8OsbEe+erY7VgGAtcfTiDVsnwWcTI0aIdmlanRJ8Oh2LJ9J2j/MkgX46DScYb x-incomingheadercount: 45 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(201702181274)(2017031322404)(1601125374)(1603101448)(1701031045); SRVR:SN1NAM04HT113; x-ms-exchange-slblob-mailprops: +LiGfBxqLEt0F1HLYZL4i3IxphKatclpJzYrjNHStMmKhXMccashPS3Rog4cNGoMjyTOmwl/MGpMC0DqZa+ifO38q+kPhZesONTQhaebMmjg+hABouBeJ52YCuZZSJJEFzjgjRuzVzvrIzoLU1EfLQWd70bFQ0WgUcIMUtCl4DqCHoQgxa5Idh3i85gVL4df//2RHQcQpM+lfK9NovMJLThQjYpXyJ13rtXmv9cfuEL5Kv8oGzvUo2CZu8wPOhgX1ixCaeqnEkb/zQRRdYn87acUY4E8pzhPJ7U0Sc7uqCTDz677e68h4JLjQ+yGaL+opYxtXqtoe7NGBd/13OGgf6batbXohpi0QFwHoIq0a2e6y8ZPBlU+teqLqvMZqsF5T9k2Z4wTvpZeGbVACMFdH5ac6sk3Q/06smU7R0mlxuXkUGEIBFQs/MM3XmEl2U9STMQRj4Fu6ZKkPlR4LSA1jseI3UTX2dR9rG04Tyz2rfE0OTEY15HpNdm2BhOOnQKzOXkyHRf+3m95kYXw0G1HVsNwRQjO0owU3xv4gIvMRL3d2/5yc2+pjtWhvPU5VkkT43RtkBetd8QXjCoi1cLFrOXvm/VL9X4lguQxbroQSd1XWVO/Xe8rUhYEa99GYl4LGJrxaWhmwze9ABGSoEwY7uG2zbkzNjdIfEsGaRqIK6TkJ821ebPebfphCXJFlI+ugZ5MDP2S5IGzvHi4FUIK1MLKivtLVHFUOtfKAFVzOPvKJZAPDaYZuZahgHHEYGZNDEcFBPiHM94/FBo5+9X5Z1P9PTsrTwfz x-ms-traffictypediagnostic: SN1NAM04HT113: x-ms-office365-filtering-correlation-id: 37634c23-6c8b-4add-a540-08d54a4eb500 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:SN1NAM04HT113; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:SN1NAM04HT113; x-forefront-prvs: 0530FCB552 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:SN1NAM04HT113; 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: 37634c23-6c8b-4add-a540-08d54a4eb500 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Dec 2017 21:47:05.6947 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM04HT113 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 che... 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 | 110 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 97 insertions(+), 13 deletions(-) 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,85 @@ 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 *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 || !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, ""))? 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) ? 1: 0; + 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 +784,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 +1085,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 +1410,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 +1439,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; diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 3798649..6574e56 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,