From patchwork Mon Dec 4 04:28:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 6536 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp3954681jah; Sun, 3 Dec 2017 20:28:32 -0800 (PST) X-Google-Smtp-Source: AGs4zMat112cLCKhHHkIn3Ztrpn+qSEFuJpkIwZHMgnJnavZp9Plg8BQ7P5QU4c8OmFFGL8u5a+0 X-Received: by 10.28.216.212 with SMTP id p203mr2119165wmg.50.1512361712566; Sun, 03 Dec 2017 20:28:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512361712; cv=none; d=google.com; s=arc-20160816; b=OFZd8VEwcfMnTEu6iiPyOc1rmb7q65M1hAXqBcogU7kp3yi1tHB1R6I8VnNkZNNFPM AGUql7/8oLhmKSYft/lAW2mojaQu5Sa36l0CmDESjtu4iyZuFax7a3c7o0wf/0FfVeBC T/PEsLqXlalj0ZNLFnLQOJhUjvsKagYJbj9MKieiqbnTfTgwIkEjAhj9Hs/9ri2GhmYy WavHGrYPk46dL7qkOI/t4JRU7LJR2uJhWGYQOk72MIqFoxTfJwVXEcUC5j6FJiplFnVV LPVqYhMM9u2flLWcp7kZwvyDb6YBWVnBjX91PeI+NerzmxCfD0cnDfRejBSdXtwysYig kp5Q== 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=i9ogTnq4+IIn6mTDMHh+vG4fbvoepaHcd3ybQJhsj0o=; b=aXAyN+YWj6EBdnyDBYxFnTKdCGXLu6V+VnSV/XCouCVpEP+VXOBeQl6/eydzj+EEJO XBR5Kmk+TV4DDKohHUv3MkOP8GgBGp85/aNX3b0WxUw/kQ5AyvKs4PHVcC8NSftWTfig eSZCW6MpidFbFq7ux2vU66ySj4BG459OKO9IE0nQjMFXrcDBIn25acjktblxC3104tDR ciDMTqoEWpI8JZ6FISh9uDOEv4qyL1FJLJ90qdzwPHNUTx5TBPZ9DVoZts0tD1aBL0Ak wiGMXN/J7CulCi1L3V63MSwdbyUt4+jrKV/q9I7WvpKvpkleQEbn6jJQGH4aR7GCCv1s d0Yg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=nbBKRjnE; 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 a26si9296897wrd.468.2017.12.03.20.28.31; Sun, 03 Dec 2017 20:28:32 -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=nbBKRjnE; 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 0954468A18C; Mon, 4 Dec 2017 06:28:26 +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-oln040092002018.outbound.protection.outlook.com [40.92.2.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6CB668A106 for ; Mon, 4 Dec 2017 06:28:18 +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=8HMVUZ7CAFXLy6OXJmWdDL1V90WR76HGK93OTOK3mRQ=; b=nbBKRjnEZ3jIFZmbgvENG80rWq4TGX9rqVkz5PGxLfCpqw34LJmZdxuzBIeozd3JEdFUN0uLY/0Jkf0+9gV6qg/e/IWIgPliGy4IbAQaj8Y+oecKzDgny0LUbaHmS9eq91N6Om4Fi+0sAwP8I2JV6E/s4D1L3V98JfM03meIwCL5w33/XyLXJNblnHTU8g56vD3aqrvRmFjkwwWcM8tSmm2jsuDYsRqcPTdRNNl1tJgKYzNx0V92ZLqM+lOzAYvOM019XGmNM8MLyc4NkxOFGEUgb+kn7VRRxa3YlY3us1qynJuuTGkW5y67fwW/6yZia56nw5T1Ly/ZCpUuai8bqg== Received: from SN1NAM01FT021.eop-nam01.prod.protection.outlook.com (10.152.64.52) by SN1NAM01HT019.eop-nam01.prod.protection.outlook.com (10.152.64.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.239.4; Mon, 4 Dec 2017 04:28:21 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.64.59) by SN1NAM01FT021.mail.protection.outlook.com (10.152.65.191) 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; Mon, 4 Dec 2017 04:28:21 +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; Mon, 4 Dec 2017 04:28:21 +0000 From: Colin NG To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/dashdec: Fix for ticket 6658 (Dash demuxer segfault) Thread-Index: AQHTbLhRRkfB+Zio7E+yvHvYAZwtPg== Date: Mon, 4 Dec 2017 04:28:21 +0000 Message-ID: Accept-Language: en-CA, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:1D21D0DF8554C1DF23D20F9A0E2C42CC4CA1F4409A2ED4346DC4280FACDE0A23; UpperCasedChecksum:77565692A7DA93CA307C09722467FA539B5EFA31058CBF0D8DA06FE6E5D530E5; SizeAsReceived:6954; Count:45 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [CsPT7JQbOy7VADmD1Hb62IE8JEenEA8t] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; SN1NAM01HT019; 6:JdimvjWhT/zTr9wu5+IU8eQT0WhP8EHfgyPaPB3Ud0aj9lgNS9pmrWDbXPLGEU+pjxF/RdZWnkMMxAOu0zK1mIqlp3CYSlwrBp/ZPw6Cvmd2wjIN+LBZbscQ9/Mc3lN1Wh5X9gOYY9kQZW8C4D9uNU+dhIGIw6MfXspngWFYglsOvmVQs78oKv/r5Cep9cZRyFYSjiuGIHmgdKCLjxhn0D+3qmGHTNVatIp0c5M3J/Svs2wlFyJxVvtf1JLgZV2zP38F+fTekxTmaXabbk239o9LSi//wxb+JFqC66MQe7MI3540qCtHQP4+jguqCLcCU++WFjwOCqNuRG+n4GotPhwkL9jWCfEsOiG5ny5vx7Q=; 5:dR2LZ8G9anDew1ZSagYTcNB3a7R+8jvSU8RA0H2Aveqr4h9OPJ1rVvBKEEcW20W2CPpGPcxmf51rNXMQUtHoD/H7O3ju+9h7baq/Vr8MJanXnJZpC4+LLTW6TynQ2yYew7JheRXBC9eJHk7wGTRz4DozJiYZW8kUY8J+O7zgJDw=; 24:FhJxocqSgsoP2jpqSWbEC64H1M8jV/9l8p/i+E/9Bp2y0yM3lT+sn9gHlqmIwUjNr6soxSP5oo5VPbln52Gla4f+TkJjXrTjdqmy4qFRbG8=; 7:MN3n/Qg01D8MCHq3a9wHRckSgUXG8rltKZjV5TK40tIit95GY3uEmpzPrlv4hpw+Vc3GfSy+WXTA/9i6E3NCT5RDDkZguGAMtn1b+g7CnS1O4MqEsRnq4uD9uH5tBrpcnLAok4Fax9Yc12otL77tEnNIyY5+BLrX3eIdLcUfyV2i9oFvdfoayS974aalw+hve/DNP57rTPPHkUXzr095zQbVRWPTkoVGURuL8YHnUrSgtw7I/snGgO5U1H1G8QZA 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:SN1NAM01HT019; x-ms-exchange-slblob-mailprops: +LiGfBxqLEtxmDbB0ppK88BYn7spIUTad9dCa/6Y4isOG8n7WHf841412Djqqo9OheB+qWORNxoPEZmThlUq+4/uABiao9xc0t9MuMuyotqDr3EIUE3ECe+06S9yUUlpz4zAZzFEazB6byMjm33ZbfiRzFTZJzzPnVegGkjC0ZC4B0Ed5EqHQ7VJ5ju0XAosAEL+rIhbpxpBejNha23w1EkitQpui81K+RcYhBf8OZQ82BuTgRtiPbjrqUPCm23Y24ky9Gla/Z1TgqeKtLeZeKyk6l0Z9Ex63zyjov4WrlLHHkZtvbdfb9KEd3iA56q11tC/3aRv8Qj7du/uZxrJ4tcpwyigSCMCckAlnmt3fVOsBLVM+rJxhhS4cwc+a4on0iRRcUSFO6L7S55M/ICEeflMjvIStOl+mSxuf70UG15IkVic/DVCxcWOL/IuZrvE3pN2XXEcw0Z3nug01Gdba0UEX7wPbj+vRassUSXmzbETj40h9QsZs3GlTDoytUUWzG2PAcmTqgL+GZ6oEoAfgWiA3+r0IiJV4SzSGSy0JEYjjIbBhOAP04DU9/FZYHLHxNnKsbhqbd+wh50j7RlzbScyiaWfjriMfMbLCXU1S2RULdo69GX5t0FzYF+16/HWjDGpSeTbWjYaEI5f2THXbonuW3eT0w5cRdEQktqzvdlqdy8lW3fMglARmrmpQHl4GjzNv2NaJ/PPmK2/u20od5gq5ny2EizxstJVheq/JR5AuJ7lBjOlQAKTqtYHaI2u0DbtNWSaBSbp6coOwUVdoNVHRn30JeEp x-ms-traffictypediagnostic: SN1NAM01HT019: x-ms-office365-filtering-correlation-id: 94d6c119-3b90-48c0-59a6-08d53acf7332 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:SN1NAM01HT019; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:SN1NAM01HT019; x-forefront-prvs: 051158ECBB x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:SN1NAM01HT019; 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: 94d6c119-3b90-48c0-59a6-08d53acf7332 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Dec 2017 04:28:21.6340 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM01HT019 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" --- libavformat/dashdec.c | 112 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 99 insertions(+), 13 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 3798649..d04bec0 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,87 @@ 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-1]==token) { + if (av_strncasecmp(&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 = (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 +786,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)) { + goto end; + } + if (representation_segmenttemplate_node || fragment_template_node) { fragment_timeline_node = NULL; fragment_templates_tab[0] = representation_segmenttemplate_node; @@ -993,6 +1087,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 +1412,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 +1441,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;