From patchwork Thu Mar 22 19:51:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sanilraut X-Patchwork-Id: 8107 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1241390jad; Thu, 22 Mar 2018 12:59:15 -0700 (PDT) X-Google-Smtp-Source: AG47ELuoqYl6vVqPHoDDlGSr0RPdpL93dRrLGo7tq60ZMsfz7qZaDcLo10SDF0BRvQrdwaMx4/WM X-Received: by 10.28.35.76 with SMTP id j73mr6084490wmj.103.1521748755620; Thu, 22 Mar 2018 12:59:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521748755; cv=none; d=google.com; s=arc-20160816; b=RT5t5o6G4ASG9+jXOpSywHh+xe1XVoJWPKi2wNPmMY8+OlfV5Kbx3a9iCzIU9z1+dB HrMduQILKwp8m+zxHt73C52G+UFnPt4wvKB/QbkDapzvSALdPdu2FXdUTd6GeX5ftnHy 1K/GKs0KVgShxh16QpPJimaSxXuYG3oECCvOShEFmu4a21NMmqPbOvekpg2+cH0Y/jyO FkyGVIoVWvLCez/9EcWIhOi9msBlcizwxO000lOmKTqFw7Lh6c928zAgLNUyVVVdEnqx BkMuTuwtvcWaIJWeGkA7VQYml+8l0J42Tbk9N+c3Y0TZZHOCSNZsOjtFt44vbvBP6C4p GIhg== 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=4tkMHL8ZOAX/vlrK+yv8DSnYgLe9r7NasJP7kaEWl5Q=; b=BIshZiCf04thKTy7hUSSJP5fqXZOMfdkdzXifipaqPOxLyjpeWi3MUvz9041UtzdAA FwLNHT9msn7kcCV2s8xLaPabVGz1w59jLrIen9fJrVLuf61T/KYs17GxnjFmwohBt9ST 0nmH5VWdwJj4EAjhIQGsPdJ2A9U5l9ixvcGzTK58w7h7ZPjFkebmPdP6pspdHmyfAAPy qgUswXzKXRowUmcFJvBH7BRF31tz2Rr294XDHFH4NeJbtoPv2BJhG2fCHyhfSnArbEi7 wff0/DKro9tpi6VCbACJzseY0XfUwsdX6xtn8ilwqAuFxWgwZH6tQSPxaSCT0led8NrS SmFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=jUWPPaHW; 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 m71si4895777wmd.156.2018.03.22.12.59.14; Thu, 22 Mar 2018 12:59:15 -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=jUWPPaHW; 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 BC1DA68066E; Thu, 22 Mar 2018 21:58:57 +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 789F46804C8 for ; Thu, 22 Mar 2018 21:58:50 +0200 (EET) Received: by mail-pg0-f65.google.com with SMTP id t9so2312874pgo.3 for ; Thu, 22 Mar 2018 12:59:06 -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=LysH9x0RsU4hJu9tdBOPNRseld3nqPXw6dxSnWwVZwA=; b=jUWPPaHW8wnWcODK3dR3h06Z8hNX+cdr7rxoHtjQMU7fT4l7UPASUHc7G7FL6T6sUL qUWp5MTeGX+gTT+F80yk3XvHQU55a3R/eFMpcRF51YheGmUqeMLr9uA41Op6PdxY02K+ us2nW4VSFgD4FEAX2xBiG2ObF4hcY1msnCY+NsxWeqwNOHOvcPO8tXb74QzcwyWS5KuT YxENQu115trUngYQFT5pu3LjTMBId20eHEB8RtadRT7zGMDPz9r8n7oppLA724qC3cwG MMDXv0LKtZl6eCeZf1YUNOpi5gxlxVjSvgpuzuYJoGYdo4Z8TeoPiTAK0/F7gstfZ/pN /Xtw== 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=LysH9x0RsU4hJu9tdBOPNRseld3nqPXw6dxSnWwVZwA=; b=gUWO0/mCk3IB/Det5tQ8gx8L6mZztDk72STy2+noUCrQwkLQIUUjo7JHnOQP2bsMlA cRpaEYrsPvK+yJWZpGWjzEkKNB+2KyZor/6Bs5Qsx3jtYl/xd5l0gfFgxdp7k/uu94QV 0gvUOSzSAmTEVfabeWeLDV9LI4+uMjxUwUvk0rOwf5perNKVGykeCr1HsChq+wLMs5JO QBucyt5F1JwEnL9rPorOvvLYvnQaNtRpO2upDEvS0KGB1beGL4J08y77+kAGdlZJ34PS Bj7b0OVHlApNKp7atpAa2Mzr4CHnrfjE0HYr0i2LwFFkWgpVTHHv/At6ElM8WXrTqwDR GQdg== X-Gm-Message-State: AElRT7FlPnD1QAv4jyO00vdDb49H+2TnufnJp507IoAEK5SS7OmzL0wn XdxV6nj3bnwLFFaKWCHtWcuZOA== X-Received: by 10.98.33.154 with SMTP id o26mr21642415pfj.54.1521748394392; Thu, 22 Mar 2018 12:53:14 -0700 (PDT) Received: from localhost.localdomain ([219.91.153.14]) by smtp.gmail.com with ESMTPSA id 76sm4767059pge.5.2018.03.22.12.53.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Mar 2018 12:53:13 -0700 (PDT) From: sanilraut To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Mar 2018 12:51:52 -0700 Message-Id: <1521748312-19232-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..db63a99 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")) { + 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) { + pls->last_seq_no = calc_max_seg_no(pls, s->priv_data); + } ret = reopen_demux_for_component(s, pls); if (ret < 0) {