From patchwork Tue Nov 28 00:46:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 6412 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp2526447jah; Mon, 27 Nov 2017 16:46:20 -0800 (PST) X-Google-Smtp-Source: AGs4zMYTwcoILuhZII0NQGySrMW3mrJakDKveEXSlzSXWfq6efuqqGZmOkLL5y5fr0Fo3bmYenPD X-Received: by 10.28.88.65 with SMTP id m62mr17938842wmb.111.1511829980900; Mon, 27 Nov 2017 16:46:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511829980; cv=none; d=google.com; s=arc-20160816; b=ZnND2lQ7bwxD5IQy4qCwUb4MWDgPmHWCFs8aFi0wkrBg26e6Yo6n2bND0W/mJpo5U7 C8Rch6DxymBhskx5ygr9mndb3FK+a+3EM1QXzXEe4k02yATmrgtaMHgd0TS58vwXxoY5 sYOLETrj1AWdP57Zlab5UnNbBNCQVPZnPuqzAiCoTGHgydXFPDRf141thfkdxp1YYRUa IYrhRAuyayH44Sv2+z7WmPd5LjnMEC8bX9DQ//jejT2r1tPqlJ14q/G8jl35Lty4ubNT HDryJoqTjajjDJCfWMJTvLO462B8yC67e/rpuEOKjmzvlUDkCG1dmkxC9ygt8ZM0roOR b/LA== 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=lnQXxt+xcpd+TiAIPIDXkvXI+VPFE8r1OVLlj3FC02g=; b=MYgbXnarvWQRIbjeTY/ZLbSMVwK84KNl+tw0ufyA41ZRUN7EB9MHqWFdIcjC09jpJo oONDcrLAeVIagtCDXUBvfMPBZ+sovn7zceZv8+5iexBPk5Hc9O093sd6zImHbshnbHj7 EsjTSm7J+8RIFohBt6BQbIRK9ttJGQc38u5fFm0XP1r1DAh5t9697fIjj0A8+GhWYfCw mvVI64E6U3pzIYSbJ+wpC6XLSs4dYQL+skz+b39lD//R1OoIUfV0TIyet4MpAVHFZHe6 HYIiirdY6SiCL+J69M9pXwioz5J5/pU2GMP+ps1zC5vepfSy3YzuIVkemtR1nDq2qcA9 iBGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=sLHf4LzQ; 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 h24si22910310wrf.216.2017.11.27.16.46.20; Mon, 27 Nov 2017 16:46:20 -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=sLHf4LzQ; 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 6F4DD689C91; Tue, 28 Nov 2017 02:46:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-oln040092005041.outbound.protection.outlook.com [40.92.5.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5AF5E68996B for ; Tue, 28 Nov 2017 02:46:10 +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=z3MQru1UExN54wAhGDevLTyhS6E3PHm0QUQiEKrhi8w=; b=sLHf4LzQ+/CA7YI6Tj5uB4qgkLVC46bDviu68Bc3UbfuTFiWhWIQY9j2KjqaprgGZTh3vPcChIyRaejzC7msdAYqv3nF5k+8fSPO3nlDdP1kQz7v+qV+VxryoBtjpJ6qP8greVzWQINTjIztp+yJgxavCLJCs3nWpUnrsaP9BmNBfjjOlDSZ7aZrojGDZ96RlmkMA41lqVAu/ucYX1hQOUflatVBOfv3vnHmcKN/Bl5Qo55hJxthlIPB2iQOGXKzGg6sPXiZ/1sH2RUCNhm4nqZ8o12kYdZZgSpT8X8lvcsvbAxCaa7H2UJVVVmTY/+JqfWGI32U0k34JYF+3/d2bw== Received: from BL2NAM02FT048.eop-nam02.prod.protection.outlook.com (10.152.76.55) by BL2NAM02HT003.eop-nam02.prod.protection.outlook.com (10.152.77.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.239.4; Tue, 28 Nov 2017 00:46:10 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.76.60) by BL2NAM02FT048.mail.protection.outlook.com (10.152.76.109) 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; Tue, 28 Nov 2017 00:46:10 +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.005; Tue, 28 Nov 2017 00:46:10 +0000 From: Colin NG To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] Fix for ticket 6658 (Dash demuxer segfault) Thread-Index: AQHTZ+JIVs3tyzupbkiKZBBgRpBAWw== Date: Tue, 28 Nov 2017 00:46:10 +0000 Message-ID: Accept-Language: en-CA, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:697E2951C45640A89510DAB38B329951F5AA52462959014091197DC71A9D1309; UpperCasedChecksum:99BAE94976FF3F4537B29163FE62E2D82AD50AD4E383FC299D3AE9126E4C1FA9; SizeAsReceived:6899; Count:45 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [imjHqJOMFEqMQe5EAlux7EgVTARsSmLF] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BL2NAM02HT003; 6:JRll8+cYyuYH7dUwgZ8LIckqUPWJ1tftzapoUlCt9CNdyFOvwY9AS8mzyYgKI++jFDF0K326nz6vksadnVhrWXMTQXP4nJCsv3GG2oWMbshyCXP7Pzp9aSibNkJGqtI3VyTRKjt+FxtFrwAvVskk6EZBe4H8/5cLrECVDQePkVNjHSllZK3Mi5Yeilnh7Wviq5gye7F83cA+CumeS5sLvswNiCNF3gyXUf06Nk8AkLIo4jrrKfnU8HmzJh/kbXo2SquSYZo8XWrXQ+dpGTXPbypbXQYu9k46ZvMwXLZuSftRePKdMMKa5P5uXaoHMv9Ur8DIO+URsdsgQP23Dq+QgMhG20chs7T9JH5ehFwCnjc=; 5:e+GD69iTsqEridNANukP5uW77ullhkFlWSRgUWBQ5m7WX2904PvGOY5j9Sn+cCGTvpuBl7l7c3Zx5n8uc0OMsh00u3kS7HbhTWnLxta1sLlz4hUopjMt89dGnQK912c6ds3//vNT1NYz0Ep8DKlrTNXzikk21EEY4/JB27McVio=; 24:v7ks5UkBNJKFAthMPDGYOxJeMVebnM6J/9+L51ER2D4NVESzine6akp6E5AjkLT4YGrh0uJ99TP6tO/fQ4AoaHE/v4pGg7rVx7vPFDZr/kE=; 7:y58V0xQhZ0r1WwcQ9lvvaaiU7RJxL61kd7nwz/8yiEzNjIvVH/Dm+oJJv2yclUI3qNt307/F3x8DtaAezFcG5vl0vd11c0h35o0QtTe+bp5QdRGpT3USkYTgy4cALxdmzIRkjk75wnpWe7GCfk6C4n10UZ6prElYjO7/I2kOOKqrMjwaxj/E12eXBUm7f0PI6q/QlyqLDoNO6emLQzhjzA/KKH6fqZzj64P6JrNxg+1nt5TMC2v45FzT8+wsFu3C 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:BL2NAM02HT003; x-ms-exchange-slblob-mailprops: S/btQ8cKWiRk5+OcX71Hryx9VVUnr68Ny5pQbTPdKZDxbHiIbtGZSHp7AK4lwOmxsU0XMlKfAfOmJvluvLkHnMCcsRfMLkCpasMO4/SFoInWlgFTKuu23SrUbNQc2RAsx/ISwbfeq+sVPqQ6Rxur+RzdAosJfkYI3KmI66dFRa0BhWj1e2Fq2HGu6PBr+cu2AIexBtEjHPbSWFKW4Dp+EHWxyb8KO8uycK1LFLtl+PkwoDez6/QHvsmbOx0+S8Dj0PxokV0V3/1tXLprO6SUCRODdK8fnt57w/s6c+zUMXBd3OvzgvzIPyWH0YVNWXQEwue9lGIAZXndxXlEHdZ9voQ1KYiMWhXILT20T37Pd/OsinGFpfogcsPDrxN7FP/YQdRel79hEoeBJh30lap+zeQTqW6CEGD3TEYWtldt2DkhzmrE/9uPeOsU2Bi/M4405chFvJDmisK0YNM4P+lmmA3Nie6rpgwREgx2fSwnVi//hvvLiX8Vwk+Lf56+jl38cqA0QIxIWaVxffh3QXgQrYK5eBvjQYOFnwa6Fj8Cu77DrjC62KuQpcC2MAa0IbHidXk0Qs0IdrdsFPZmxGC9kDslH8G7EUAxodSv1Q5re8o1pKgWoix3vx1lvS12TGOsyfMIeLxb3O51GzkA8fksz4SKWNu0vW4ZHVhZh+2i7fbH4yHLPrqkLeD+OImkvJylKMOWrQdNTyfuAz87G219c9qpQ1ktPmO4oesHsf3T761ofzSDY2GOjPCOCu8zwe8b4OS+JK4Lse8= x-ms-traffictypediagnostic: BL2NAM02HT003: x-ms-office365-filtering-correlation-id: 76e14eac-3ebb-4b81-b28a-08d535f96a67 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:BL2NAM02HT003; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:BL2NAM02HT003; x-forefront-prvs: 0505147DDB x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:BL2NAM02HT003; 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: 76e14eac-3ebb-4b81-b28a-08d535f96a67 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Nov 2017 00:46:10.0321 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2NAM02HT003 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 Cc: Colin NG Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/dashdec.c | 95 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 82 insertions(+), 13 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 3798649..5d5970e 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,74 @@ 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 (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 = (av_strncasecmp(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 +773,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 +1070,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 +1395,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 +1424,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;