From patchwork Thu Nov 23 01:16:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 6286 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp169922jah; Wed, 22 Nov 2017 17:16:37 -0800 (PST) X-Google-Smtp-Source: AGs4zMYzmJdk1C4fV9qr72jz1JRQHvYvLMjp+d9Ov2PsOCAkMIrdxOw/SZTo/nj2XspmV4lOandU X-Received: by 10.28.229.213 with SMTP id c204mr6217922wmh.57.1511399796955; Wed, 22 Nov 2017 17:16:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511399796; cv=none; d=google.com; s=arc-20160816; b=tpf9kodPZMSbCAmYEIK2Hc3MncEOSf9pKQ53G0CRj5WKO6z8peI77+qCvdghcI/aFr 7HaYKHGPwAdEa0eMvVyksiGwpL6BmZX0JSY3iowJxmD7MIeDLqXQyG6bwbTifKJKfVOU B5X8QkAg6j5yLtOh4Ub917oElMo45jR28o7RRjWeonmzYi67Lhi+ReR2GIbpiAR34Ibh SKiQW4wBNgn6z8fJfNNCqQ839VWdTc4vowvyppfGovtfachJvZ42CGT1pVx6BLfoCDYN oarBpgFQL33OUoGtMM/OxAXM9YBfbGxVRf/c3im0JpEV658OyWSylX/xhQF3937n+Z9I AZBA== 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=Xm1aoKJ7CLyaqrNV0i1p6vPaNLh3vW6oBfAqVRkz4Aw=; b=ZQ9P51QYNCNuPp27GNyVpaklxrun78hnoP1yz5Z2PPuG6cuOz+z5hGZdUJxpSeQUSt BRrFz9i7O13taUEE2ChFb6rACdXQCqsCXTLgQQB13WXlhguXhYQeUFiiYWPZZ5EWiq/y zc1om074jgCkYUff5Z+wLcaaZxZhAxnc7Bp8FlZ/EPclsmTr+gC7sef9sOQpIMZnP99G mvpu0pgaJF/Oa6BF5TLALwCHs36ZKYP+zckjKEht3+mp/12c54FbozLV0bH79BNNLqoP CS0kf4Qb/xpU3h0MVtk0BzP+oZ43Y2mXYpOUlK7fUQHU7FbuAZO5IyoOLEzl4RQjWbDL gH2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=Es22DIeJ; 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 a136si4230012wmd.169.2017.11.22.17.16.36; Wed, 22 Nov 2017 17:16:36 -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=Es22DIeJ; 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 9551468A10B; Thu, 23 Nov 2017 03:16:35 +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-oln040092004039.outbound.protection.outlook.com [40.92.4.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C3A768A0FD for ; Thu, 23 Nov 2017 03:16:28 +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=gT3kewLwiW8q6BVnPS837AZR7wQY/XyEKRx7b6u81UU=; b=Es22DIeJ/OTi8wBTf/yO20BtjtagfaLUqZRJiIgZoe/UMevpvspWd8715H1xCRGrXoFFB7VEHUeCpg9fg06mmEkn2ctWcXXnA5javD6FzG12D++nbQV41Q+cFCxrboBRJQCumIdn2K0gZ7usj7HCo8fxrQZ+ZhqMBTsT0FYCJGvt9iOzX9TsJIUUF0LLiYzDhW95p5CrOLLe8Bk2IXCAQeuvlOLGcGJ1LvWQ7Ejl+aZhuFRYB1Zx7EppZnIumhZ3DmTIuKY70+20ZF5g24QjN5z8t088raxKeGJefNcAPMw+vKQSBTE1xL0BTKLHv5QkNeTZrcZ2nOThfzt2LgN50Q== Received: from SN1NAM02FT064.eop-nam02.prod.protection.outlook.com (10.152.72.53) by SN1NAM02HT189.eop-nam02.prod.protection.outlook.com (10.152.72.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.218.12; Thu, 23 Nov 2017 01:16:26 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.72.58) by SN1NAM02FT064.mail.protection.outlook.com (10.152.72.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.239.4 via Frontend Transport; Thu, 23 Nov 2017 01:16:26 +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.0260.004; Thu, 23 Nov 2017 01:16:26 +0000 From: Colin NG To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [Patch] Fix for ticket 6658 (Dash demuxer segfault) Thread-Index: AQHTY/fpPoibVfA6z0aRuv9vsV+VVaMhKSxd Date: Thu, 23 Nov 2017 01:16:26 +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:54CA98125EE2851B536296B0C1AB26638B7F40A3FEFDEF441012EF1A38B0A51D; UpperCasedChecksum:73425F0651957B7A1E8F7E7D9869CFB27FCB88E0D1CF19085750FC6798594975; SizeAsReceived:7066; Count:46 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [BsH9wJh6FTDhFKmrAIyTd0ks5+g4Z/My] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; SN1NAM02HT189; 6:p7xEZfvwYkaWZ9l3YjubcPoOjZfL/H2Xhk83HE7FkPD0dgUAAlmIpb9GX0g16VX9sSNCSfEyHXiXQi1sZagVorNL7ObXk8kiNEbWbeffsXh0lBwueOX1xe8eKntyDQ7zbxMUz1Tmv0ytcQwrrdEeVG79DXWQZv+f/7AXPtRgmghnfqyWsUhQBDnAERUGyj0GH1nWAEe9t1DeELrYibrnaeS6Vf9qAa/stNAf7mGjP1Iur1vdwe3xSZi8JQ9e28mzi28zNxcPD5C8miAk/JJKSUJxEQNAoWfoH8+mFeI9ujCOFm/z00pQ6er55c8BEDh+XOelFTkRu4SxvQ2e9v4RucOjrfa9SpaUWbdSLe6o9iY=; 5:oUy6992kula9q/QEFXzkh2KHLmvPl2jDa2noFoCOFo9PgqlLKMGFZQNXvKy8ZijZK9/JAwXT+RVQOj13UBZz/JeY5EotFWcc6dtZjCW7JchPJeo6Dmc3V+DHP4xi5z/HGVmJCFW88iqVv5Y4+BD2h3MAlh6NDH9SNUdtCVBwIMQ=; 24:O3NS40J3bF16wXt6rgJJRyTJd8Tp7OpS66vabrJA0UTg8RG8Llef7KpvecArccU8XYVJi3T09Ng7XSlHrdAMW7iqV3Rgsd7wDEncqTd3h24=; 7:BGjuHJD3LyXY6nnNIxNAjwFphR6d6zWv8SMTldQ8qQ05Qwd+zEElIEMRDcF6m8h4eWm82q+nuhlUJ9UtLdzPFPNbFJPoU8qGYCtQxM/rnIHbi8J9g62f1ZmTIizTNHKf4J/ns4o87Oe6czp2IHiJHvISn+FOJ7ZdJvGOb8q9XuwLebdKti3XtNRhuGV947001A6fwSVw/hRojsg1/78CikAciLWP6MP4qfSpLvQ3LAq9Q4TA/+uDQpltC4MNY5vh x-incomingheadercount: 46 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: f887cafd-d3ec-48c0-6bf1-08d5320fd160 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1603101448)(1601125374)(1701031045); SRVR:SN1NAM02HT189; x-ms-traffictypediagnostic: SN1NAM02HT189: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(444000031); SRVR:SN1NAM02HT189; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1NAM02HT189; x-forefront-prvs: 05009853EF x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:SN1NAM02HT189; 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: f887cafd-d3ec-48c0-6bf1-08d5320fd160 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Nov 2017 01:16:26.0511 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM02HT189 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" Clean up coding style. diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 3798649..7e7ae52 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,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,78 @@ 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, "/"))) { + 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 (strncmp(&root_url[size-1], &token, 1) != 0) { + 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 = (strncmp(text, &token, 1) == 0) ? 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; + } + } + + av_free(path); + return updated; + +} static int parse_manifest_representation(AVFormatContext *s, const char *url, xmlNodePtr node, xmlNodePtr adaptionset_node, @@ -698,6 +776,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; @@ -993,6 +1073,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);