From patchwork Thu Nov 16 20:33:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 6128 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp6263692jah; Thu, 16 Nov 2017 12:34:09 -0800 (PST) X-Google-Smtp-Source: AGs4zMaw54nMSHkdBG7IpuM2ht8Tog2ux+ZeCGe0WtYL4sgo17PWoSjXeyXpaSpdynsm256qhoAP X-Received: by 10.28.56.5 with SMTP id f5mr2491475wma.159.1510864449026; Thu, 16 Nov 2017 12:34:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510864449; cv=none; d=google.com; s=arc-20160816; b=p1EDvuWFcZlgSxdtzqYTaCmC5493XgZaZSoxsY3N8NUkNBqk0+z6q6l8ZfquxQMdkR pgKJEQan2FQCyfsU5/eaLqfVYfxgG1FuaCia3OPvdn3wvw/nZ+WxPofdgj9ygF5LMTFo reda/UN/oEHRzZSi78i+zYK2bTf6npwiAjDWaTO5ertAsOqXtSORStAePjIsD/Ktxkmt MPErwaTmMfaSNaELDEip1CBuI9dj+NcdFbNu7F/ATGzkMBy3/Mumbr2Vj8T0hSPLRCwk TfJG6oB3khzzp9B6KLZx06Ls97u3CM6bOssl53tC08k6hoRvxuyaSiYPvTgl9NQJnBzb x8NQ== 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=E/x+x2Y3aU/CwEpDJe/v3Tjba4OL3XtQHVNvURwImQk=; b=r7SXKXrK0a9yfUc8jEsxi5opkQJAWnp19iPGCRYTWxLXCd5/DixI3TiKuEb6b0bv9Y MZO4b11re3Wh5dPm1HeHKdXU7bHQe2y+YEtPAdWiQV+mx9HGBG3cuxIrb3IBqWUuxNwz n4etbnM3r5/zP0GxQiteI041uG4khHZxEvU3/1LYO24zxqOkPdXUJ/jidfR8TBBOV9Jt JtNp/XmlWe7tbeDcOI82zlU8KnuxPrLK5D46Ju6WHehJ0B1X7UD2K4WUukZNmB5yYXyd TX9pgXHRoMheeAexU/wL25sVKvfAIHg+ltadtePjS2jWAfX6C5/PEM39QBejgNZzcelY 588Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=XqZm9v3s; 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 c15si1551763wra.5.2017.11.16.12.33.45; Thu, 16 Nov 2017 12:34:08 -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=XqZm9v3s; 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 1A3976898D1; Thu, 16 Nov 2017 22:33:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-oln040092009050.outbound.protection.outlook.com [40.92.9.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2DE8680AC6 for ; Thu, 16 Nov 2017 22:33:21 +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=BNrXVhENZaqneE03ta6BazEZLj2shyY4uKWxVl9V+uI=; b=XqZm9v3sXl5RrgRjOJJX/obogyzgM3rDApgUKTXTtqRl/CwRORrVhCBSwpQLBn22guxB5UrcMdWmYO4eqbO7ymfdKlBfyjkIHZE1dZY4HGYZdalTlGjWw5qZZLjtcK+A2nYxKI2/ztDWNlII5zp6+GUEz96i2tgT8BenBX+rKOpvx34A99GDF1GncmsPCX5s2o0SxrECWZwksNUWQTK/V36bpAG9oQ7jC2MMwaQBSkWCIvkTrvoq1NDOlICdJURRuA0d5l5HRj/aR1flVg0AUds0TozlBItiDrA0Ki49/+r1mAfubC71hqakQ14eCA1wHiW6vGnznbWL1BzOO5r0BQ== Received: from SN1NAM04FT039.eop-NAM04.prod.protection.outlook.com (10.152.88.54) by SN1NAM04HT043.eop-NAM04.prod.protection.outlook.com (10.152.88.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.197.9; Thu, 16 Nov 2017 20:33:35 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.88.55) by SN1NAM04FT039.mail.protection.outlook.com (10.152.88.242) 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; Thu, 16 Nov 2017 20:33:35 +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.0239.005; Thu, 16 Nov 2017 20:33:35 +0000 From: Colin NG To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] Download dash content with byte range info Thread-Index: AQHTXxot2k9+35/yek+hzsR1QVhb1Q== Date: Thu, 16 Nov 2017 20:33:35 +0000 Message-ID: Accept-Language: en-CA, en-US Content-Language: en-US X-MS-Has-Attach: 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:8C19E7C60718469E810D5D086DFDA689ADBA1D4581F68F75E0C55AA42A4D31A5; UpperCasedChecksum:C26130764B04A81ADF76E0A6F38222D9D45FDE19A3FBFC15DC91260BD417FF1B; SizeAsReceived:6906; Count:45 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [k/0Ko5CY+Ipo/wM3uhs0P0VbsS1kurzN] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; SN1NAM04HT043; 6:xCbHKrbjE2af3yXGtM20Myh9ulP7Zumdvw0MKad4SpueCTfB1MdmUARDouKB4buLN9rGydx2Dym2d+2MqYXeHhn2JqmGBuDs13VQu/b0B37+Q3P/v29nUCN05tB+SdNei7SRico1NCyiPej6PWTBJlLq7YZhPd+0UCDvas75IwLZg8cH0vx0rJYrTJx/t+kvC1TpccnqrAijU4s3nHIPYhhAxmUk7lMo7QeciKn58LMnGmzDUNMy/WZUBOs64rxsmFb6lz8mLM00HghFjcJL7hA6FeZUrHPLLN1LbEauVtlmFQOCFU7G7uid4KDByKjPRHnWAko1yDvINWLfMbXWA7suuV9Bm9d/iK2hi1PbuzE=; 5:ZIUXQpqKXqkT/VqB1DOOIzbV/9f27cKDnKdxuqByNy73r2kc/blS66LBqg9Fv2yicgGy6bmC3FF3LjuxhNxWmJE5ZqN4ckvifO92IO++s6P+h9ujMeBEVYZDUOi2IgYUX+nW4B2vvSpwjkLowjueqyVPJfbC/DsySB80t9cjDA0=; 24:Yd7Rc48sthreHVX3++4gSIIvOH/jtq+48DFgXydW4fc/28Zn7wN2ji+NPGio2XAoXHkiY4b8hxBkQD9Bn6vmKW3JQfZnwNbHujDgNJogU34=; 7:bZ+aTA8Hy0+O0pZZNkNkhWwFd4v71ttZVBPEEvKhEWnNJXB7lwO6PsqCs414ZoSkCOSjxVsr+25WwJ3e4OmUlipHQOkgnuRptCLHWO+HVILsztejEpVhF/uUMVDKLWitMtzfYxeFwss2nmM2n+EshcMUznmpB/5sF5zY8t+/5qN9ktEdRUJ6a1YNKad5mo4Is3cATKdCAhL5ksE5hDRoekQMIUYgVmnOMMFolsukWQcv3MeHiNuRODa455m7IivP x-incomingheadercount: 45 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: cfcbf4e0-f203-4770-8c0b-08d52d314f1b x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(201702181274)(2017031322404)(1603101448)(1601125374)(1701031045); SRVR:SN1NAM04HT043; x-ms-exchange-slblob-mailprops: DD4MX5oUjaIluGbIYVtFZaa9vbyW4cnABdkS4BeeBhlYsigd45VrZaVjM6L0U04GJ449K17ii+OIey+lpFviUSOkP8KZxX8MYPJkfljUJFHURAisIG8slihTOB4Nqcw/QkBQ+UkY5j+DnUMlPg752dgsjUq8fjD6MrAuBM1hCr7lxcIKZ6zbc6kFQcqSWMx0iMLp+yn5bi3lLNX4Yqw2ErNVZEYnd1nOVwf4Ft1ybNv9FGgKmqfEtQl3xybym93HGvnZ66R3+7SzcIru0ergD+laB1KKbXY1PWyua+jcpBp867eih66BEoYhMjR8lJIANpATzH4j1WfJPMMbieY0IrRlwIDO2OGFootUQkxFoQM49Si/pi1D3UyWIetNabbYK2kldvgZsFK35xMYFhoKULvSxxpYzq4ezebrHMNt7+h3Tkd9fE4t0YxzyTCb26+BSOQ6REdbBd/2BfmANEVWFIhweiFdufKf6L2I6sSM3y+MTBGvyZz6iVveuKuMUFc2/jYmrWFR1yLeyXb38pbHOCdY3D4/Pl1iK6OLGXtbaibbHDh/9EAFre4ZU80BJAHWMeEcqqnxG5yAQXtwmgkwjzm/OERUF2x0aw/cGRolPu84kek0u854MKGkV2TKWN0Gl2Rntai6Q0Udj/Iqpsc+tNHIuznArdDF8i+bDGJCTAmyO5hK83hGRQ== x-ms-traffictypediagnostic: SN1NAM04HT043: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(444000031); SRVR:SN1NAM04HT043; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1NAM04HT043; x-forefront-prvs: 0493852DA9 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:SN1NAM04HT043; 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: cfcbf4e0-f203-4770-8c0b-08d52d314f1b X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Nov 2017 20:33:35.6489 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM04HT043 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 Cc: Colin NG Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/dashdec.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 0e3afd2..33255f2 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 * get_Fragment(char *range) { + struct fragment * seg = av_mallocz(sizeof(struct fragment)); + + if (!seg) + return NULL; + + 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+1; + } + 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 = get_Fragment(range_val); if (!rep->init_section) { xmlFree(initialization_val); return AVERROR(ENOMEM); @@ -548,13 +566,14 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati xmlFree(initialization_val); return AVERROR(ENOMEM); } - 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 = get_Fragment(range_val); if (!seg) { xmlFree(media_val); return AVERROR(ENOMEM); @@ -568,15 +587,14 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati xmlFree(media_val); return AVERROR(ENOMEM); } - 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) {