From patchwork Wed Nov 22 22:58:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 6282 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp55437jah; Wed, 22 Nov 2017 14:59:00 -0800 (PST) X-Google-Smtp-Source: AGs4zMaTNfUgv5A82OMFg/8ohV3ghy7hZle4FXVymE5poQ8tE0fpqIitOaMNQ74+dSiB1IoJy8BK X-Received: by 10.223.134.230 with SMTP id 35mr20526937wry.74.1511391540602; Wed, 22 Nov 2017 14:59:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511391540; cv=none; d=google.com; s=arc-20160816; b=gSHgqzWBqwB6Fob+JY3/i4z08eOvpjg18EPwdv3dCoO2HnwEkXpvyn7aXoXGKZeD7J sAjUoASR9kZH+0E0w45+mcGvAvQZyyDhYDTLUt7D3p9l8tujJcspDlAWCsWn3KQoz7x7 3Ld9J6yBP2puSGpZPiW6sr+DBY24PF06th35oh35m+5vcLnJP8ulN9Ri2rMOQ0fA69Vn nvT5w9da9dM1IMZGf46HJm+dPZZCJJSaWrQnTqpTLLhCk+BWmG5s6mnU6/DLKnqn5QYz qcAXH8AJLYCXf0dTHb2W7HW6dav8/S8Lq2QBudqIhT7jkRMM8Csao4Yrgy2t8TXgB2VQ TREw== 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=RcUnovpdj5MdX0h9nNE3I16JvFpfqCWHMuO3pMYPIBA=; b=nVQq3uVwtsOhXxmN2qOv4EnWld6Vi51smLkJPTbDql2sCIAFwpoVzRGMNFzqKiE5lh 0EjRtX/t/xp5jZXJ+ldQ2vEH/qIrsScQQNdzWZSP2Yb6/P+JB4HiloH1SXJ8sCdEk+dI LXc22x5ybnG0ZWD4duAn/PkBKYMS7OiUdHajcdgxHWXjAqetGHWkqJpv33sfZxOnAyG6 brGQFFbTe0kOHIoXb/gA3Qj4eA5WTFVlMjJAJM3nEaFBzjK25SnnOJjXMl3WZkrJQ1s8 Nj+t1QaB9udz+nlIFpvjLNDzanwi/U5JyPO6ORr48/XiWS/OtX+/qz3kZka3M5TxvDoM OG3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=CfPJpMdH; 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 j10si2727883wme.257.2017.11.22.14.58.59; Wed, 22 Nov 2017 14:59:00 -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=CfPJpMdH; 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 815C668A092; Thu, 23 Nov 2017 00:58:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-SN1-obe.outbound.protection.outlook.com (mail-oln040092011070.outbound.protection.outlook.com [40.92.11.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94917689CA8 for ; Thu, 23 Nov 2017 00:58:52 +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=QJ601dk20CZMVbSBK4roVkipdDa6HqnA9TCHCygeSJQ=; b=CfPJpMdH+/JbOCMLI1wZj1/ehl6yzxZ1dFyKR3iS2LaK6vyWFXQ+aIUkG3nM2oAhubstWlGZht2iwsimTey0YJEEKyH4A1XScGBf22gn871UDB75e9Gr40GOnc9aEgWOuO30Y1DjqjucaH9mQxixGF1rhezrkTf5qP2S47BOjcKlj+HmS+Ctyt7PqgTZ15Y25XVynozXVHg3kXKgurazbPuXzxChiW22B4WN+K3iS+6CRKL/n32BtKBk1AFTUjheIQDDS2l/601lbDYqrkIQxje3RIIImPKThBncdjzOP8rAiZOWnLgPCLFwG79QlnqIrZmofhkeBEfARwBTJq/qiA== Received: from BN3NAM04FT024.eop-NAM04.prod.protection.outlook.com (10.152.92.60) by BN3NAM04HT185.eop-NAM04.prod.protection.outlook.com (10.152.93.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.197.9; Wed, 22 Nov 2017 22:58:50 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.92.60) by BN3NAM04FT024.mail.protection.outlook.com (10.152.92.182) 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; Wed, 22 Nov 2017 22:58:50 +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; Wed, 22 Nov 2017 22:58:50 +0000 From: Colin NG To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] Download dash content with byte range info Thread-Index: AQHTY+V1O7r0VqMDkE+c5nd52Y2NVg== Date: Wed, 22 Nov 2017 22:58:50 +0000 Message-ID: Accept-Language: en-CA, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:F1AC175E6009C8BF87C72566D91AA93768AE916B0B05DB49ED965A1A436C274C; UpperCasedChecksum:8202833AE17B003D8128F92D30435DB6979F28B3A3D1B6ACB7D3C7B5CED5201A; SizeAsReceived:6908; Count:45 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [C/hKgrBePkP7t+dK8/5Q5s6Ozf6ST7VI] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BN3NAM04HT185; 6:3+iMiF5Q/XgZW2iVNWz85lvvHdm8EC8exAUkbERxedecNPLmwLizAsPxVtJwHUupozXliCBKoK39Vq++NXZRkpBJkTduOaNfDqchWSfT1gDtZY9qQqlTSrHqeBfBYryss/rOnDpOgg3jznV6QUkxxuaZXZxMiMORFJZipnxLEea9MGRPVbDXV3RG2StF1lZSPozb7g6lNB3WbUEOYlunr5l2S8dKq1ms+a4rB0OiuxaoVYTNyc82EF8wbxb21AnYDn5MubCQXFPwRPyakz6Wxhual4dK4QNQoDgO7+bg0KwKCHtXyktXx2r7h55wVafVDOq367/Zj6EzmSsslLOmAdZhwpo6cuhX51ODHIN/Dok=; 5:JiNx9UGHxLXDsYqgBTH920cvI11rHnwRGiO9NioFe2d/kjCCnOBuaCTxX0HDWoPwmZ8ORFV9aCBmPfQMLHigx/wgZ+m5iwcihjgws4x7EjbiHBo/efB+yQNa9obkSnr5GUZdl0HxUy4iRTpJ2sSJqF5LMrNx8D6OvsM7HsmkY30=; 24:PPI4IOmpFma07cVTA0zTn8/ltpCQ8xBXPbynyRdBXsfZUd2696zais0WUNlkhv+U01mpYy1vULwvxRCcKntKaMacaNZCxFGhRGTtEj40q7s=; 7:EbxchJcMegsJCeFRqWjAWQ2NlT7TYp2z4gP6pFA67ZA6797BTZE8iVL13hxP6h4nLcAvIt+Df51QP/BGjFWD2D5M5wAxwIDNmcGefFwuWR7yyM5WR7LX+RPWjeZXzhLGvY5RQ58C2JzvNgx9oxlZCklmQAPZQ+Iqd/huZazqJiSBDyPTtYnP7Zz1sCqil3JPLfnCn2YjolqtcYXBIhRX6Zfqr4h3mruDXV1E4YWQz6dlbHJqotdMC+RcGLu9bklp x-incomingheadercount: 45 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(201702181274)(2017031322404)(1601125374)(1603101448)(1701031045); SRVR:BN3NAM04HT185; x-ms-exchange-slblob-mailprops: dEG5jEBie8kqeqy1KbUSjc9RcQhB0SIeAJLhaR/O6xRirxhGbrs/5hT5jNeg8pLhiGgtfwoAd2veyJX9oj7ocHDtyTkNNaBxfUx8kwhCBAQTgezW8kXRJGsj6nljcQVYplyWLQleRUhW3kdt+M6e+ETmDSXkJEGOTvVyK7RhO0e8FzM+ngB4vnlfkwOdD2E6SSv8Mkg1OgorMtJiOQH037m5ns3M8OFTAGfR340rV4FbUck3oHV8vDCbdX9H4vYcelMqW37agxsqvETHNZUrTlfOqU0NNP8sKTXIyDKITPTbsNxa06yTb8Om/PZTri4auh5FkHWpp//dCTDKIG05pSMjiYd5FiiL97ReOcRWZemDavKxutpGA6qfk14imJjrqFC89geUJ+q5dstFYiIo3E28l8S4lDOZSEh3m25xrq+zuq2abYCWqQcKh1OqgrWL/S1igzVKOEn+44bgD+4HOddg4T4lV/ODRL6gx96Nxf7Mdcq7TfY9FAUhCcON0ea+XltiuPN9YPIkGFnkwNCTlSqd5WSAldLa6vJQ3wZt0HGvaX5WTHXdtUlRMV15dwiM/Tv744Brn172aYOPOTQjwaMXBXNZKeyKoo7Goua5eLIKFKFP8HI2DaknFHEXVKuHxJ29Oz5SPXctozgTV6EkoV4bBzf/cEuKaBsB7lxS8IT3am6Mte14lQ== x-ms-traffictypediagnostic: BN3NAM04HT185: x-ms-office365-filtering-correlation-id: 91833568-3501-453e-6130-08d531fc9815 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(444000031); SRVR:BN3NAM04HT185; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN3NAM04HT185; x-forefront-prvs: 0499DAF22A x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:BN3NAM04HT185; 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: 91833568-3501-453e-6130-08d531fc9815 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Nov 2017 22:58:50.4288 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3NAM04HT185 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 | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 0e3afd2..3798649 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -522,6 +522,24 @@ 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; + } + + return seg; +} + static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representation *rep, xmlNodePtr fragmenturl_node, xmlNodePtr *baseurl_nodes, @@ -530,33 +548,40 @@ 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); + xmlFree(range_val); return AVERROR(ENOMEM); } rep->init_section->url = get_content_url(baseurl_nodes, 4, rep_id_val, rep_bandwidth_val, initialization_val); + if (!rep->init_section->url) { av_free(rep->init_section); xmlFree(initialization_val); + xmlFree(range_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); + xmlFree(range_val); return AVERROR(ENOMEM); } seg->url = get_content_url(baseurl_nodes, 4, @@ -566,11 +591,12 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati if (!seg->url) { av_free(seg); xmlFree(media_val); + xmlFree(range_val); return AVERROR(ENOMEM); } - seg->size = -1; dynarray_add(&rep->fragments, &rep->n_fragments, seg); xmlFree(media_val); + xmlFree(range_val); } }