From patchwork Wed Nov 15 21:00:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 6105 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp5038757jah; Wed, 15 Nov 2017 13:00:23 -0800 (PST) X-Google-Smtp-Source: AGs4zMaQjNdPDI5x/rFYTUIbf2XN4BK0CE7lsM/A73+EsBkOpKhYukfvrnxBaLVwTw+PkDOjGxxQ X-Received: by 10.28.215.194 with SMTP id o185mr12020666wmg.105.1510779623143; Wed, 15 Nov 2017 13:00:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510779623; cv=none; d=google.com; s=arc-20160816; b=WadRFu0ijPYJHNuTSXYfFHiOwdNhGpaR8CuTA2VaXNPqBU5rvjQVyOv55xq6Xhovqk vsChUKOM37I/TTmaqIl6idFDeq5CoPfRMVfaH6NPw25ziXFo0uPJyZt0NFoO53zuLadK pRWWKSiz85TPsor5G5d7utxPXT+275bHerdXO3ATu8/srBBrwKfFmJB17ddm9tKUipUz Y64rX6BuUvlvHsNKy0MUjq6fDWliTMbnRuuqJxtZqulcLKiyM30T9UVbgUOxpDNiWaKl JGYBgqBXKcr3wiczVkh/juX6qxN1knZyUp4ZB24sGJxh0EG+JDbJZpdiKlsd/8J/NX02 zq7g== 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=g2lTVZknxbcQq4DqNwgca0pFY7SJZc+ipUhRHdZcdQE=; b=GN19LdOaJ4cWwcCWFZpGLfx+rjIp21eK2V5bGuUSTvhEt9P9XNHMddgyU+IGwwr5YF Fmhz6wjemLi/SrMf502t22LFLTW1QUGs20IFci0aYIRdPtxhXCtWq2rGr3UFcWsiy9k3 cx4tmWOoXAmRPzgeHFLVT0JMtskkhqM35j8REa+R3gu3b2URI6N1vJnhHx/GxZ05skBC EHCBmmuTFrwaUMerUWNZmtLhTJJV8aKjjNmhedICoSS0sFtdG/4pttsdS5nM7shlymmG wAlfiyKqMyJ/qMcWDQSZkm5PZzfqkfllwfKXIDgMfLiM+hUlzK6dnHUMht1b4Wg5bqCq 829g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=WQEWVwDF; 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 v76si9706228wmv.65.2017.11.15.13.00.22; Wed, 15 Nov 2017 13:00:23 -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=WQEWVwDF; 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 869E568A08B; Wed, 15 Nov 2017 23:00:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-oln040092000015.outbound.protection.outlook.com [40.92.0.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B501689C95 for ; Wed, 15 Nov 2017 22:59:59 +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=hUwfNfuJbkrsx/l9SG70GBHbIAkJl1bCgg2occKcIkc=; b=WQEWVwDFRJB7QFYCfoSjLMQ39Wkh7ut3mdOYCG2EAhqyMvl7iy7YGdNozm1K2vxgU7GE3zj71m74IrOc8w9HRIDgxgmsVoggSYsj8/LRG9B+LxAAWj/3fkcwvQOPT6P5pUSsOuYbfri3/SUxJSQod9iIzvfCHK8z+LFYjspfx6Zu5Fps49xRCpVjZsNtOt1jgni0pO3UdsAJDaUJFgJPg/secxC4XS+7rWpla8fO/BqT3QtI0jQCnmhx8NEdewNwnX8GPk1zcwpKvX7p+HzGcqzcNbK4jYfHW806D5aBNYQy0g73xj+TM+m+AnvvacPFnRGDF6v+j+h78zrQZMp8KQ== Received: from BN3NAM01FT004.eop-nam01.prod.protection.outlook.com (10.152.66.53) by BN3NAM01HT243.eop-nam01.prod.protection.outlook.com (10.152.66.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.77.10; Wed, 15 Nov 2017 21:00:13 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.66.55) by BN3NAM01FT004.mail.protection.outlook.com (10.152.66.174) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.218.12 via Frontend Transport; Wed, 15 Nov 2017 21:00:13 +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; Wed, 15 Nov 2017 21:00:13 +0000 From: Colin NG To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [Patch] Download dash content with byte range info Thread-Index: AQHTXlS65yNylfkVOUSNz/Bfnqlhzg== Date: Wed, 15 Nov 2017 21:00:12 +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:4A422A1513E953EB412BDE205E06ADEBD97031711358B65773377F30D2898E8B; UpperCasedChecksum:F1A17E42D639227D601BCA13419842BD08E03DB360D160E3713272D10C9ACC31; SizeAsReceived:7336; Count:46 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [orXn6gnrdpfQmAar/vLB8y3lX7jdxftt] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BN3NAM01HT243; 6:OwB2Xjycnf0+yURmV4gF6giIf035WCO4+pRM9iOnBJrNcBsjk2fe6JbYXRpGQQgfwwLw9TGbWMqrIegJjTOfjL2ROg5eXaQAE+WwYTsNHeXhxQLGysGXUoKJ4D/SvQGAkVB5BHDgodTOKmDShpfyipj9tO84kzVG3YZmmeXRqS3dO4s6l/n+YYzxkZ3GiAoApoBXnuln6nEqyK/qyipimiBFJFPVV39CHzCjE/dHM4pXobbTQFinP77N3OsBrJU6qnEALQClKeaEKnO7mJPLAY8WWQizdeRreJ+mZ8KwQn3RUpOgjUzvPtA3sah4mLh1raFsHTJRmTtsf37Av8r+Ng==; 5:CdkzhY2jld/XklEs+dek7lfhf6dn/GeyjwzRljAc3wYnn72r7Jv+yrso/td1m2C8nIc4dnroV2cLsRSIKawzgg3qQzjhAzbieIyg3TcxDVRIf6AMJvYadBFxn/wk+iSsoY4pCq0t5h1uUgg6iVh6cw==; 24:5l32KTIFEou31Qc4sC9Cx1eUpoZ80YEXCvzn8+iSkBNm5lNxHjxD4eP4FC49AdgTk19dT9vqRwEFC2KdIjGoQToStdts8lhx6+Gi4HJdsbc=; 7:moIgh/+ypcP62a8Op92bR/EVxJ1ylD0V9GvOKnZzzKGNkvqqTdN6Xbt0Ml4jGl5P7MEC4HV12dwKzx623tICif/U9KUmi9FHCbDCJx3ZLJq1mDwulokDydhimbMCyfFozeucsn9BJxsCLu2UE7RXyxAS5TVWz45eHghRtaRGVZ2GOz3nE50NWvdWKkavXj9CJjXrQ4RlPX5QyWY+dO3V/NH12bMJRrRwHvHAtqb4nX0= x-incomingheadercount: 46 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: 48f2cdd1-1943-4a40-ab40-08d52c6bdd60 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1603101448)(1601125374)(1701031045); SRVR:BN3NAM01HT243; x-ms-traffictypediagnostic: BN3NAM01HT243: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(444000031); SRVR:BN3NAM01HT243; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN3NAM01HT243; x-forefront-prvs: 0492FD61DD x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:BN3NAM01HT243; 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-originalarrivaltime: 15 Nov 2017 21:00:12.9234 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3NAM01HT243 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" This patch is partial fix for ticket 6658 (Dash demuxer segfault). 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) Camel-Case code style, please use name looks like : get_fragment +{ + struct fragment * seg = av_mallocz(sizeof(struct fragment)); check the seg , if av_mallocz is failed, it will error; + + memset(seg, 0, sizeof(struct fragment)); unnecessary memset, because av_mallocz is set seg to 0 already. + 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;