From patchwork Wed Mar 21 15:33:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sanilraut X-Patchwork-Id: 8073 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp5275132jad; Wed, 21 Mar 2018 08:34:12 -0700 (PDT) X-Google-Smtp-Source: AG47ELvRgy6bH/0/IQ8JFsWSs9IC6RqWzomCfqnsIYwepszxBRdRuyVlIDgVPkhOyIMdQIiKNiOc X-Received: by 10.223.186.18 with SMTP id o18mr17876530wrg.158.1521646452421; Wed, 21 Mar 2018 08:34:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521646452; cv=none; d=google.com; s=arc-20160816; b=lLzXWRRK1Uvu6lnJ6PDiRu4xzgkl4LccOv/05XX6j9hkbQXQx9i8IjnH6maZz2UWWZ rmn7BCdG48HnvscMphXLPsblCM4wK8TwTS+Io1Ye/uBTBR4XTNhR6/nzefVjYh0JjB4Z iCHDfIB/B6NCENpgZgVzTziybnofFyGL7VIZCZQODd0wdZ5l59lKJjHCpYiBWaK21JwQ f+ItkN7m2SALAp5BpBlsEEj05mNIljc+1mMYTg7uTES+5c5amLl+qzfrwCvur1wi1c0J Ip37FT4Yujd5PjItTfCqYeG37acF7p+y+uzSzrOZXn5L66wlCrClNHvooyczhJQSFfSC jSSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=8c20HD6/B/L9lYcOqidRKX7byot7yNGNHzIoBeLbSxQ=; b=ru7ObNvmeJiNnGUZrcMg4aAj4x+qRMx7lEljVBpN1bIhinoC9Lqb1LXKzfMjpIBxfa Mp9DjNRALNWCkGMbNbIc8pJY+TTTBKCKGbPtzhh9ZLE63jVaZVMZXtCLnCA9+ggrkU9A AmCmlLBSDKB8c6s95KLFj7IPS685WkehII9mFx52blqus2x0ZzAbM8XBRzsVBexObteV 3SXGx+ZeDeufVmXLa/QTj+0EI92l+OIruFAW1vOE0ZashH+RxUwiYS7Jfna3DTSZvSmk 90GtW4P4YhnB5JJHlIvXD0auJCWheZoOLnCcwqzT8+Uoh2Y/JKgMXs26zbgmGfZWhrOo cbQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KcNZkq8F; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u92si3323198wrc.315.2018.03.21.08.34.11; Wed, 21 Mar 2018 08:34:12 -0700 (PDT) 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=@gmail.com header.s=20161025 header.b=KcNZkq8F; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B9A2068046A; Wed, 21 Mar 2018 17:33:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA71E680178 for ; Wed, 21 Mar 2018 17:33:47 +0200 (EET) Received: by mail-pg0-f65.google.com with SMTP id l4so2061443pgp.11 for ; Wed, 21 Mar 2018 08:34:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=2p3Ncx85awKV7lrVE4yzW9DMYVsWupvNzHN85fBPQbY=; b=KcNZkq8F/aKKPb89J8N31uEpMeyMOVOu/0X+aKwW8A+iBshOBr/KYT+M4LL+lzJlXi uxvEMcY6oT8GT00kX9d3XUsUl65ydhV46luf8s2QZ1C54dH5mwZ/L2H438Knq9VTPZ7C lx8D/81FWIbVu2Z6/ftw+qydQIzbeOwBC6O7xzIE9sJOyxBBSYq36WBZy2XW+JIwOsJ7 a17Rvvj2C65pVBslBk5MaPW8xlrWB02jvIVrhq5ifNamgVm3YTtYHV6QU038hvhm1kuE Eq2kjNln3yoTcobVWxeg7QLGIdORwy0HpZjWpO/rdl2ojitF7rvDoVM+t1ZsFXSw9Fs0 xCcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2p3Ncx85awKV7lrVE4yzW9DMYVsWupvNzHN85fBPQbY=; b=lSOdK66DKGRw4grlCsSXKxMqcgZTd/z7v47ftweEW5bDoNRRv6u4nLX+0edyk5Kvz8 e3MNvr8PpIjlJ03oewgymZHdBg/534cnsCS35cd3m9PeWIyL5pbMJwMgZXYsdp75h8pH J4B4SGoDhPMRAnXXOZdkO47Lmo4whrte0XeWEP1+OkpP9GnBOV+oKswQcW90PvpoiIua eAJRtlmHknzqDllnnICWCLjrMif2k+lMpAYLVVv2Ajr8+jgKAqHTSkWQmF+l4SHvinrF GdTeP8/cvMb7Qd31LJK/Yx5sOn0DwA4Yani9Hq85AeCwSuf0DBzJpD0wC22WJ7NeKhmw yPvg== X-Gm-Message-State: AElRT7Fn3roVYa57KkM28xZ1DEaNdl8HV07QW5MKqmColihyerqt9qrW nXpGlnWUR9W8+1WVnRbDfvKsJA== X-Received: by 10.101.74.193 with SMTP id c1mr5977528pgu.116.1521646440427; Wed, 21 Mar 2018 08:34:00 -0700 (PDT) Received: from localhost.localdomain ([219.91.231.82]) by smtp.gmail.com with ESMTPSA id c62sm9905330pfk.179.2018.03.21.08.33.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Mar 2018 08:33:59 -0700 (PDT) From: sanilraut To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Mar 2018 08:33:08 -0700 Message-Id: <1521646388-19559-1-git-send-email-raut.sanil@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] Support signaling of last segment number 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: sanilraut MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Last segment indicated by mpd is not parsed. Example stream: http://dash.akamaized.net/dash264/TestCasesIOP41/LastSegmentNumber/1/manifest_last_segment_num.mpd This patch supports parsing of Supplemental Descriptor with @schemeIdUri set to http://dashif.org/guide- lines/last-segment-number with the @value set to the last segment number. --- libavformat/dashdec.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 7b79b93..bf61837 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -805,7 +805,8 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url, xmlNodePtr fragment_template_node, xmlNodePtr content_component_node, xmlNodePtr adaptionset_baseurl_node, - xmlNodePtr adaptionset_segmentlist_node) + xmlNodePtr adaptionset_segmentlist_node, + xmlNodePtr adaptionset_supplementalproperty_node) { int32_t ret = 0; int32_t audio_rep_idx = 0; @@ -825,6 +826,7 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url, char *timescale_val = NULL; char *initialization_val = NULL; char *media_val = NULL; + char *val = NULL; xmlNodePtr baseurl_nodes[4]; xmlNodePtr representation_node = node; char *rep_id_val = xmlGetProp(representation_node, "id"); @@ -920,6 +922,13 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url, rep->first_seq_no = (int64_t) strtoll(startnumber_val, NULL, 10); xmlFree(startnumber_val); } + if(adaptionset_supplementalproperty_node){ + if(strcmp(xmlGetProp(adaptionset_supplementalproperty_node,"schemeIdUri"), "http://dashif.org/guidelines/last-segment-number") == 0){ + val = xmlGetProp(adaptionset_supplementalproperty_node,"value"); + rep->last_seq_no =(int64_t) strtoll(val, NULL, 10) - 1; + xmlFree(val); + } + } fragment_timeline_node = find_child_node_by_name(representation_segmenttemplate_node, "SegmentTimeline"); @@ -1054,6 +1063,7 @@ static int parse_manifest_adaptationset(AVFormatContext *s, const char *url, xmlNodePtr content_component_node = NULL; xmlNodePtr adaptionset_baseurl_node = NULL; xmlNodePtr adaptionset_segmentlist_node = NULL; + xmlNodePtr adaptionset_supplementalproperty_node = NULL; xmlNodePtr node = NULL; node = xmlFirstElementChild(adaptionset_node); @@ -1066,6 +1076,8 @@ static int parse_manifest_adaptationset(AVFormatContext *s, const char *url, adaptionset_baseurl_node = node; } else if (!av_strcasecmp(node->name, (const char *)"SegmentList")) { adaptionset_segmentlist_node = node; + } else if (!av_strcasecmp(node->name, (const char *)"SupplementalProperty")) { + adaptionset_supplementalproperty_node = node; } else if (!av_strcasecmp(node->name, (const char *)"Representation")) { ret = parse_manifest_representation(s, url, node, adaptionset_node, @@ -1076,7 +1088,8 @@ static int parse_manifest_adaptationset(AVFormatContext *s, const char *url, fragment_template_node, content_component_node, adaptionset_baseurl_node, - adaptionset_segmentlist_node); + adaptionset_segmentlist_node, + adaptionset_supplementalproperty_node); if (ret < 0) { return ret; } @@ -1819,7 +1832,10 @@ static int open_demux_for_component(AVFormatContext *s, struct representation *p pls->parent = s; pls->cur_seq_no = calc_cur_seg_no(s, pls); - pls->last_seq_no = calc_max_seg_no(pls, s->priv_data); + + if(pls->last_seq_no == 0){ + pls->last_seq_no = calc_max_seg_no(pls, s->priv_data); + } ret = reopen_demux_for_component(s, pls); if (ret < 0) {