From patchwork Fri Nov 17 22:04:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 6146 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1149877jah; Fri, 17 Nov 2017 14:04:58 -0800 (PST) X-Google-Smtp-Source: AGs4zMbAtC+wh486dYYPAJWatoojJtbb56uTj+821AbVudI3VOoS+Evb17gaDg3NYyFchawMyDY5 X-Received: by 10.28.152.212 with SMTP id a203mr5361177wme.131.1510956298413; Fri, 17 Nov 2017 14:04:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510956298; cv=none; d=google.com; s=arc-20160816; b=r++/8R3jPpl+z2XuKhJK9UTiCEpyFz6SZSUQRqjIjJ4MSgZNHkQrf3Xgayn6GSKzvA iCPUfdJbrn2F2y1h9jfemRcd0nYAtmWAlnpnabt1FzjLFAMbjn6lxLlKy7yPojZGgRQI ZU0v2NFHfEI1hjbHmr9WDCAlJz45bJHjISKyjMyPAYwbjPB+iIAnH7jRaMP7zE2sCscW 6b6p9LjHNpOQQF6frzyCGfCu9PqJcquzlZaQTXqJc2qiW+ezFmP3k5H9JRBFgfUf55s7 if2xxtjSkCJeB4DlfIKh54RvFGbd+WFLMB5E4vA6OoUS5Sg1ic9OsHMcXGWYaaGMOg47 W1OA== 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=wDN3PtkHX/gey+ZB3SM80vDlQvFuzkkrRzTzBH/oa/8=; b=ExT7d9diXSOkrOw6MimTIYVpH7qE1jQtRpb5yp4r1vWORFL8qBhw6R0mFg4nSqT+j2 zFFs6Px01QgYYjIhjQCJxMskj2/xUNCmB3qV/1105/RE2Png3AqcZR3SPXz4+5nZtbz2 qdC+kTaHDSxzyHFBBpIBGkOpBPXI97FVG/KSaNoyeqOWIwFBfe6G7rV81t4sp92kzzmc PZ72pFXhQCquqhZ53pOXuU8LtC8aEfx0X9BB67OunUmdxhGSuTTmYGaaPpitoCJPOC2F Dva95DDhCCq3eizQDup7DMrfUx/bs0Nl716zls9OLH91yPpA/B+SCIXd0vJod/U1KVJv BM8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=lYoP7lc1; 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 60si3651638wrk.291.2017.11.17.14.04.57; Fri, 17 Nov 2017 14:04: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=lYoP7lc1; 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 39323689817; Sat, 18 Nov 2017 00:04:40 +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 848A46891E1 for ; Sat, 18 Nov 2017 00:04:33 +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=SL6h5oHKxgb6nmsf1PhvdDz3xkQ+NdSkNlhy9JT4Cxs=; b=lYoP7lc1kzb/VG0L8zssOz0QxQ+qZGleLkHdVNSA679ig9MAobWYdFrMQlPdLaAIWdRw/KXNR/zTKJz+1Yorgi/EUbEqiInxwGCiMc0byT57IpY6gFp4LC9Z7uKL9tFvvHtVhTcw7RXyl/I2KzaGb7DOdnrKU2aZ5R0QrV+mzbelmeIr9v3rCMtA04JUMjmxKiUR4c7jeNmJBJew0AbHryOHCewTZarpLHVc6in43iRo1eoBFtHaM8okOqNAkxGRlAqR7+4znueMvfS6Utq7JUHbi+oXPHVj67CfTGNikav6M6QRT+RM99njdiIMsaEaY9Jizwt5bupvWSpJgucDjQ== Received: from SN1NAM04FT018.eop-NAM04.prod.protection.outlook.com (10.152.88.59) by SN1NAM04HT040.eop-NAM04.prod.protection.outlook.com (10.152.89.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.197.9; Fri, 17 Nov 2017 22:04:47 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.88.58) by SN1NAM04FT018.mail.protection.outlook.com (10.152.88.159) 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; Fri, 17 Nov 2017 22:04:47 +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.007; Fri, 17 Nov 2017 22:04:47 +0000 From: Colin NG To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH] Download dash content with byte range info Thread-Index: AQHTX8fEn3lPo2Qkq0eY63PMiqFkh6MZIBxy Date: Fri, 17 Nov 2017 22:04:47 +0000 Message-ID: References: , <20171117171502.GO6009@nb4> In-Reply-To: <20171117171502.GO6009@nb4> 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:42D007476FCBDD8BAF2BB9637470335D7EAC7CEB8C3E02B82835984C3753B852; UpperCasedChecksum:96F9F9B6D25272CF2F643173626D4EB04F7A11AAB7A5813C6A16CB4BEDBCCDE7; SizeAsReceived:7108; Count:46 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [QoWeMbHWBkKhuToEL3EAvh9shG/y/9y+] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; SN1NAM04HT040; 6:Hah1X2wZUY0igz8IZVFMH76t8qKELVtdxZpXwfEqJQV3sSsoLy6r86gpkWGsEJVXbNi2Ww65eCB8P74wGzvZpIOFNtYSUwyKOnn5HODUrwM8sQkwOrYcWLOKvZwwwu+6MbBERW0tVdhA64lYqz+9pJA7nLQ+woUe0N9XnkcSuiMEydA/9X3679E3jMqvID5uUxOzvULKYK9LTvpNhMWNQbUewhXJ4xAZq8iOSagCSV/PC6hd/kwN8mRRg6woUrqVvJwR0bsKEi6EpiAmPmsVmHBV+BPHFb8a9il2R0x2IZLjkLMLBXIR+8d5TkQgtm3ON1udp40+4hIJogfaDTv8mNupRH7Dd+g/RUy/VRNBIyo=; 5:6kIDqkP9fV6X69aK7Faj/W86zoI8j7GIzNGDhqURUZsSMG7uIGKfEInjp8hP71hOHrneMkYbI8exL0QggJ3pi83CJeSbeCzFDDpAj1TpXju72bHxoR9o+J7JG0xKouspG0wfGosZfw8FS8zye7QA2zrJXFGUXuiG3GlqKGzt5UU=; 24:0puzfWd98F2wT5wKzwkvFDKsbu+9ECMV+3WsXuEWRXGFEC/KXTrVqOsWLU/d7hx2js8VvacUOhibwMPr7CCndy77Sgz3JgbpeDaDZCbFacw=; 7:C+NIzZyEMxWGrSPOSHNvHjhtylwcolCK5Obk7A9NLxSzC+nbl744N0lB+Nb7C3iyoc2kvPVB4mibWtQwAgf3/O5qYku96BO736SquZZLQAqaqZDTCs+o4yXg1sEs3b2kvYklSKYZooZHlDDyfijgi0e5A6clg17e8NYiWM0mD1LWC93cqvDF9KZiIy9Qo8MfCOBZpRAmZudxDERP+1UWUBE5hKoifEm9FHSBnwpl3q5YJCn267XbC0RXfJfXHgx/ x-incomingheadercount: 46 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: 63e352a1-0006-4a2e-a35d-08d52e0737c8 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1601125374)(1603101448)(1701031045); SRVR:SN1NAM04HT040; x-ms-traffictypediagnostic: SN1NAM04HT040: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(444000031); SRVR:SN1NAM04HT040; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1NAM04HT040; x-forefront-prvs: 049486C505 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:SN1NAM04HT040; 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: 63e352a1-0006-4a2e-a35d-08d52e0737c8 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Nov 2017 22:04:47.6306 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM04HT040 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" Fixed the range_val leak problem. From 61c79e979ba7586b7fbf98e674dfcd4d4adc5797 Mon Sep 17 00:00:00 2001 From: Colin Ng Date: Fri, 17 Nov 2017 13:59:13 -0800 Subject: [PATCH] Download dash content with byte range info --- libavformat/dashdec.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 0e3afd2..8a575d5 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -522,6 +522,25 @@ 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; + + 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, @@ -533,30 +552,36 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati 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); } } -- 2.7.4