From patchwork Wed Nov 15 02:26:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 6074 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4043679jah; Tue, 14 Nov 2017 18:26:55 -0800 (PST) X-Google-Smtp-Source: AGs4zMbV3gf25ndmtruzspyKKPnRvEYOrY6ZzfLJ6c0f3QE9JmS5mBs4WPXX4VIT9GsyTy9c1zOe X-Received: by 10.223.143.51 with SMTP id p48mr10741567wrb.104.1510712815012; Tue, 14 Nov 2017 18:26:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510712814; cv=none; d=google.com; s=arc-20160816; b=CZ9e2Uksjl6zEF47+9gNF/O+C34hsuDT5aGrgm/bMPW/Y+w1uUuTusKBsoQqB/KHjA LiJV03U8yS4WaRL9WmTneAjcR6IaP0UK+/eg8QvNqUh4gVwpPQl+vMQlb8mcC7G+CayP 8X8LcJZUCmo86BstWr9IeLugq/bCQhoA2doY/Mnz8eGJhNjlbRiBNTR61G4rDYFxxGsH iLcHE962OEFQvVFaX5/TS05itTW56R7NzvGUOVlx0025wKxzmbMAJYzcSDWqAP45qrdu hNZFoEvpjQ6AXXi6qI7gXfytxrTbO/b9AKesQB7OEvmJoZeo2BAe3R+AOr1rKqub3sKC X7CA== 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=sAY1oNejT18zXFToMbT/iuyo6pzUXILUn+SJl4A1S04=; b=bVqx8R3AdA3RBbt8olG/6NI5kKFz1GA2IbDC1ZjNS22GGX/dklHrJKgp9Yu91oBQ6m 8cCSBxBtdyT+pE9zaFVoXUzw06WzYbKbGxjBuAxsKS3ZXOObmpm0oM6ZjRY/ARzkPgB7 L8M1S9TID7kXsoCMLdRHdg6Nhwq+pS4n3Az391M0GFi0TU1T+Q2wizfCcAn05t0gpcQT 3Sk+2VDmp0VZQYj+uWFJHRrNec2IDymzu3pygPvtUsvPzUmmEk67aBogsY6gfQsa3hWu 8Tnz2rfVdl3CG96b+FwAqaeqhQk3BFqajb/PMEa+jluCsq/o7MrrgWydjyP92PJnDJhc yQMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=QaWIxi32; 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 w190si1466842wmf.147.2017.11.14.18.26.54; Tue, 14 Nov 2017 18:26: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=QaWIxi32; 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 4BBC9689E84; Wed, 15 Nov 2017 04:26:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-oln040092003036.outbound.protection.outlook.com [40.92.3.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3698689D09 for ; Wed, 15 Nov 2017 04:26:31 +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=lm5sok7tmVMr1CSJo/92MSc60bCxzv4PC0DIJFm/cJ4=; b=QaWIxi32Ns3JCZRrXCa6PWBHXaLqFPPYkBFQSikGlL0EdKGhTMBD4SlA67GeQTJusGVn94E2rO8Neuzh3La3L66VcJYTCDdcok6Ee8p1QPBUGT2BjUknq4e5gWLPfk6jCOcCmxnTvdLukF3qXYGyW1sp2wR3mHSg6qdG2QZ6qRuHetgSUDoEpjdBiXJFQ5JSOTFAPw4RdQXxaEwQbVfkbx2PC3vEBXIjIXMq2h/fZDZ6pKSh2vPZAATWpaTT3srtw6HqYupBnSQmiZ7LgFk0XCGM4HEWNaDVQrykM/7OXuJSBn7w2Qj1h8T0kP039F2++vt7+d64/nSwFFjsnkgsxg== Received: from CY1NAM02FT011.eop-nam02.prod.protection.outlook.com (10.152.74.55) by CY1NAM02HT188.eop-nam02.prod.protection.outlook.com (10.152.75.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.197.9; Wed, 15 Nov 2017 02:26:45 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.74.52) by CY1NAM02FT011.mail.protection.outlook.com (10.152.75.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.197.9 via Frontend Transport; Wed, 15 Nov 2017 02:26:45 +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.0218.015; Wed, 15 Nov 2017 02:26:45 +0000 From: Colin NG To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [Patch] Download dash content with byte range info Thread-Index: AQHTXbdslP9MB74WdkeDSNicGCWd+aMUtnLF Date: Wed, 15 Nov 2017 02:26:45 +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:AB424152AC677ED4548F9BEB84F0D0F78466B742A0DF19FF65411A072916FB15; UpperCasedChecksum:0FD6631A9C8F065A7371E3A04FAC3BB7B5962FC17790EDFBAB6FA5793079A9D6; SizeAsReceived:7145; Count:46 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [k6/Ax0z4t2KxBhXaoRE15qUKOMPtTB2z] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CY1NAM02HT188; 6:p5dpWZ96ymNZE+enF3AzFTqTMPHeJ49yey07lfe/i4/j6/qx99gy+DJl8XbbkZ+87Gyfg2G2qf+Krz0nnrl3ge1BBIfTfSJzjIzREDjiQ0kj+HQcoSVLUNUzYqJKOPxVI8y0KeO1qsAuJKGVvCtDpqQ8fDbqNf2CNARnGYEuIyXHv5SEyLGDrryscEtw8orLkCDhY1Qj7d3z++ud3XM3im2TPlCDzDR3EQXCbiW1gaGrEZEU7KRoum42ZsCdAB7DJzQnDPBR3eaVfvalYL+nDidChax7JYRvIi8wGNIipXKZXSRNpAzVG9D5keFj3CVfE2vdkKGUaawni9EGVIedSR3hZE/sFVxF3H6ZA/hPIpE=; 5:wwHqjgPiM/BiS/rI0YS1yaNN0VX0zbBDMxGO3f2To2/+QF5Wb/bC8N528QrOHj8S2lV5ax5oHtil4PWlkvvwIhQyQ36Crs2z8sELsXRnDh7/ofdybJKdy93xBSZROucdr+wHsq4kwNwSUu4pxVXgsHKbP9vz5LOVb/mc2mrHpv0=; 24:rEmCxJGFQRikR8KuIsoRvy0JymT8Or37hYIMDJ7nVdUkiKf6wjyxncI7IX25uNwtybUdeKup709yz073egt4tSN4/r+Dg4W5RE2lHq4LTOc=; 7:vP34oaC0euYB68f5ATB4LnNndcABPZK3reRzUE67L/faJNTFlM6ZbKaOQNIDMo/SQ1jOOiYfqvBOov0EvDRQ+0IRymWk63xU2olUj4r5nnZiQjliyHJp/w8TAJZw90u+QqZstL7uSq5c6bNTQkXec2lwdhLuHlfr+iPaUFZGPeppvVbGnS39KgLA4nU+gVXcdwqd/GEE6VonnpZIKeCXIQhQCsll49Xq8q9U5cG4+ieZ9I7yucZkduR5SQdveIOW x-incomingheadercount: 46 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: b71c7b1f-ee11-4f46-783c-08d52bd050ea x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1601125374)(1603101448)(1701031045); SRVR:CY1NAM02HT188; x-ms-traffictypediagnostic: CY1NAM02HT188: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(444000031); SRVR:CY1NAM02HT188; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1NAM02HT188; x-forefront-prvs: 0492FD61DD x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:CY1NAM02HT188; 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: b71c7b1f-ee11-4f46-783c-08d52bd050ea X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Nov 2017 02:26:45.2903 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1NAM02HT188 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [Patch] Download dash content with byte range info 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" Please ignore the previous "patch" email. diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 0e3afd2..68196e9 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -522,6 +522,22 @@ static enum AVMediaType get_content_type(xmlNodePtr node) return type; } +static struct fragment * getFragment(char *range) +{ + struct fragment * seg = av_mallocz(sizeof(struct fragment)); + + memset(seg, 0, sizeof(struct fragment)); + seg->size = -1; + if (range) { + char *str_end_offset; + char *str_offset = av_strtok(range, "-", &str_end_offset); + seg->url_offset = strtoll(str_offset, NULL, 10); + seg->size = strtoll(str_end_offset, NULL, 10) -seg->url_offset; + } + + return seg; +} + static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representation *rep, xmlNodePtr fragmenturl_node, xmlNodePtr *baseurl_nodes, @@ -530,11 +546,13 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati { char *initialization_val = NULL; char *media_val = NULL; + char *range_val = NULL; if (!av_strcasecmp(fragmenturl_node->name, (const char *)"Initialization")) { initialization_val = xmlGetProp(fragmenturl_node, "sourceURL"); - if (initialization_val) { - rep->init_section = av_mallocz(sizeof(struct fragment)); + range_val = xmlGetProp(fragmenturl_node, "range"); + if (initialization_val || range_val) { + rep->init_section = getFragment(range_val);// byte range on if (!rep->init_section) { xmlFree(initialization_val); return AVERROR(ENOMEM); @@ -550,11 +568,13 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati } rep->init_section->size = -1; xmlFree(initialization_val); + xmlFree(range_val); } } else if (!av_strcasecmp(fragmenturl_node->name, (const char *)"SegmentURL")) { media_val = xmlGetProp(fragmenturl_node, "media"); - if (media_val) { - struct fragment *seg = av_mallocz(sizeof(struct fragment)); + range_val = xmlGetProp(fragmenturl_node, "mediaRange"); + if (media_val || range_val) { + struct fragment *seg = getFragment(range_val);// byte range on if (!seg) { xmlFree(media_val); return AVERROR(ENOMEM); @@ -571,12 +591,12 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati seg->size = -1; dynarray_add(&rep->fragments, &rep->n_fragments, seg); xmlFree(media_val); + xmlFree(range_val); } } return 0; } - static int parse_manifest_segmenttimeline(AVFormatContext *s, struct representation *rep, xmlNodePtr fragment_timeline_node) {