From patchwork Thu Nov 16 00:59:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 6111 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp5241241jah; Wed, 15 Nov 2017 16:59:58 -0800 (PST) X-Google-Smtp-Source: AGs4zMY26ZiVkH/KEM+OoxXaUksHCxWR+6OtNvGpfbN3viaaMYdTmt4GAyZl4T+nq7A1Xi8TEcRZ X-Received: by 10.223.143.51 with SMTP id p48mr13344635wrb.104.1510793998520; Wed, 15 Nov 2017 16:59:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510793998; cv=none; d=google.com; s=arc-20160816; b=yVjH68tFZaxQ4t2heQJmgJ0QExLD8ojqGvBBL0T6sDvLFRS+RRAPgYwR4zWKCghpOD eZMJb58cBjrENP9xl44f+jDwqqba5Or7oKxOZYoDcBQu3iKHUiWVvNddEtnR9DqD1nK9 IjOX+xOZhsvWSzCN6lHy0+7uOowFOctFeIkIIL9qcTV0VR0lfIEDf3rmNBercsZPh3qB mq5cRGGk6H4Cyz+h2XOsbQe9cTeEGM/ZrRQEI/oLtJ6DSvFT5+J3/j2hGWa8o9dorQnu jI7Gq6NQ5U5ikGGwqHAN3CJnX9t+WP1Y40ctfPFb1RvuQe6HUdNGAhkO7fmXbo7/x0z7 zzAg== 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=8hgi7UL+QXZFUsXHpgG6YyJide7visFwwIrhdcihaes=; b=Y+mDalUeWA59rD8Mg1TmNd7hupj4s6NvEJqWsPp5LkfnsLtnOxq/EDWeyHZYqEG+sZ qy3bmuQKbOjU+ljCP5bHWe+tetNSIZUN5QxkwJfUvUeRZhX+1NryqRMmxioxMi7QvjQ6 u8unB17bMpzQMvZZYUg44wLqcIyTQVx8q1BAfkqL6e8WkM6tVA6kudcS2DLcpvAjlX2Z buDQ4QoeZtyGjvaXx/L0IDTdJ18aD4KNmmM3IDHSz85JEO6esQekvuVha69YJsilaNmL S1Z71/JoOR6c9bTPxJnC+eQ8cAqfAOJ/EANjXOjnm/gT7KVU307AyRUsIzY+uCVPiC+E umcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=e4+7BZnk; 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 a64si132438wmd.147.2017.11.15.16.59.58; Wed, 15 Nov 2017 16:59:58 -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=e4+7BZnk; 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 46DA568A0AD; Thu, 16 Nov 2017 02:59:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-CO1-obe.outbound.protection.outlook.com (mail-oln040092010092.outbound.protection.outlook.com [40.92.10.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DEA71689CE0 for ; Thu, 16 Nov 2017 02:59:38 +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=0efbQqceTIfBNO97rcqiWVnnUAsQbjQnrq1G5aR0Xt4=; b=e4+7BZnkX0+ca8aKCtKYb+amcskItMJ5fy7NOQU4fN86I7gjEdXdnR10LUJKIuJOdGC/hsx1jP2y3Ww3JXlmbIwx3HioH7CQPq+X4awLT/fMOwEK6BWWbGChmgLMesD640AVXaB6MIajXFhih+Y50Vn/qyvJl3Wk5FBmot3qySl6FkN8kwIQB+mWl6Y1MapTVIpvlX2q70/+LM+D9mWq8fctLJAc7ojeoKJdChgC0F2L75wUL1lpanm0JU08XnlD1Py1YjRj5X6ai53HSs2/f22Cf/ohszUMO+Knim6Ra6ELZ732+pehSbPXCNTW25tTam/1n1KGgzwdy/Lg+ewX4g== Received: from BN3NAM04FT013.eop-NAM04.prod.protection.outlook.com (10.152.92.59) by BN3NAM04HT159.eop-NAM04.prod.protection.outlook.com (10.152.93.54) 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 00:59:52 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.92.54) by BN3NAM04FT013.mail.protection.outlook.com (10.152.92.152) 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 00:59:52 +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 00:59:51 +0000 From: Colin NG To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [Patch] Download dash content with byte range info Thread-Index: AQHTXnY1hKJGGyXN0k6KHYMnTGvPww== Date: Thu, 16 Nov 2017 00:59:51 +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:338F46BF04E365BAE1160034AF188EB9BCEF602F37B072B4FD90D44EE7E4A629; UpperCasedChecksum:7A6C3C013133F983F19FFC8DF4DA47771DBC3ADAA2B89B3315BCD84841DB9974; SizeAsReceived:7490; Count:46 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [oHr6VFyH3B24B3vUtEzk2yrWEtJYTIEC] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BN3NAM04HT159; 6:KrjLLvwEwWvn2ns7TNFEvgmCKsOkSiDjUA7dkAOG6mxoBoi4NEacPBz9gGvouS0nH/9U7gdUIVaEmumCoigXyFs9XqTIlG0pKJVG0WgNFhom4R44/ONlBWxmhz4Mab1mwTHB4Akc0gTgpjcAr8zB1E4fGHPiDYf05h6kVGkkiUmIQHJKuqt7vWodgQEkb4KH4tjP59Ixmaa6APGE3xmMk1RgABDZLQZMHcqHb/06PzzsMFTfNgE+zocKqFs7xffELEGKrMZ/cPRV5i2S1PURQTxhC9jA/eJQjfccVDkMSDpkqVqyZwrjeYhAPxOJSTlrFeOzRXHOG1/HcjnuHDgqALzFFS96Oj83njK7rYVODxg=; 5:X/Sw3owcnZTWE2HOvc5iQorIeFWpwYEB7SIsfsu2UAGXG/thcPNaxdk6/KCsheTxket0Sj7JET30iaZQiv78mCxgdJK/c4DOduNWJtL3TaKecdkolLYhigDIQ9cNRSIXa6cgOI3lDnM+1agYf49XmUq3DEkWWiz+IcoLiZ/psUw=; 24:/gg0V9jit5YPUVyc0V0/dsDrVL0+XhaCr4hxtI0lO/ki9WWLqHdqth+wQ7GoCqxZwOuIHzieiZ7C3fWPnJPAyyGTu55SSOd9W5WjGjBNvMY=; 7:7rxo09Z4ee4HE2VLriAUTWNgrnE28P0/WfKk7tdtW/El6fS7FZseqU7LDFuRF6+G0uoObNAFJbM9I83wBJWqweT1pb16r6FehsLqeKTJ20+wANqhhh42BvrfgyStrmUh/wmXcV68PYBt43U/R0BRHoWdIblNBXCwZO9L54gohw/WxRp62pWjCsErWTy9GUdZzpAPU4w3fhXDZgCsCwS4xbWmWE4PhZxjiEvXuonlLze6FH/hdOXoVqkX8PiAMX+A x-incomingheadercount: 46 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: 8bb94390-af9d-49c9-f0ec-08d52c8d57d8 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1603101448)(1601125374)(1701031045); SRVR:BN3NAM04HT159; x-ms-traffictypediagnostic: BN3NAM04HT159: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(444000031); SRVR:BN3NAM04HT159; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN3NAM04HT159; x-forefront-prvs: 0493852DA9 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:BN3NAM04HT159; 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: 8bb94390-af9d-49c9-f0ec-08d52c8d57d8 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Nov 2017 00:59:51.7233 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3NAM04HT159 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [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" Made change suggested by Carl and add some minor fixes. 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) {