From patchwork Sun Jan 7 18:46:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 7185 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp1816025jaa; Sun, 7 Jan 2018 10:46:58 -0800 (PST) X-Google-Smtp-Source: ACJfBovTIoHNEpHzthqb/R0HReb+6wQMI/c/RJSCsHNhK3Q+59Qj7wCFMsnAhWYc5gpiSfI6Rd7/ X-Received: by 10.28.4.85 with SMTP id 82mr6676558wme.60.1515350818357; Sun, 07 Jan 2018 10:46:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515350818; cv=none; d=google.com; s=arc-20160816; b=VmgF5w+gyiHCsYF3twwK8s2V02WRKuLEDDDR3I4c9IsturxN7ayT5rtEmo9ub8LWqM LNtW+TFvIGqs+rDsXaItTn7z7a1z2Z8/7m+zCny/Np8YVM+1sbZwH+MPAnlsjxg59iXl w5GrFfqYPxfdjk6nf7+yF9zSY8flIcWB4dcIVlFOikOyFBNDZ+Zq/pQyGA+YoD1mxNg2 HqOgxzm+wnUu+tR4qY5XGwg41FdIVT7BKpe4zLV3qRPMjecb3j6ay6sAAkEiN+N4h5JQ vGYCCjiV3pXxoMqF5HUM5I2hZou3U9O4YL1uNxSvCVQ2PuOQADB6zT1CQtVem6KlYzjo rtBg== 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:message-id:date:thread-index :thread-topic:to:from:delivered-to:arc-authentication-results; bh=P1EllQYcN94m1CzneF8zg5X7bdjsNY5W7qo4JYBL9ZI=; b=DlHaQNg+J7Zj4XucnkG7atYD5TjML2X4ippi41Gn1TivRN6zd3DN+gSWTSuX+kGcuE LKZJ7FahRLOCCfrUIF/yBjXH1lQpHhLINKt8eWPkzzn8YY9yFwuBnEb5SjGHYPmOt9kt sFXY4W+yTBwEgI56vJQKfeXy9JI8XWoDPPaLdQWX5ukA7sT+ElS7jeu2KQuTc/wd03Mz Xk4WleyY5io0R3VVy+4/jyf+laSyI2XhXS8uyZ4yNpNHshi43jK0UxElg52cKPOF2xBr pwAie+p7RaapL4iqoBCePC1d5BNIpHBdj9KTywzT3qC/qHAWFCLQL9mzwQu10ep4mVpP Zfdg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d82si6756771wmd.237.2018.01.07.10.46.58; Sun, 07 Jan 2018 10:46: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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3DA14689E7A; Sun, 7 Jan 2018 20:46:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071019.outbound.protection.outlook.com [40.92.71.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0193689E5D for ; Sun, 7 Jan 2018 20:46:12 +0200 (EET) Received: from VE1EUR03FT036.eop-EUR03.prod.protection.outlook.com (10.152.18.59) by VE1EUR03HT114.eop-EUR03.prod.protection.outlook.com (10.152.19.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.345.12; Sun, 7 Jan 2018 18:46:12 +0000 Received: from DB3PR0202MB3452.eurprd02.prod.outlook.com (10.152.18.60) by VE1EUR03FT036.mail.protection.outlook.com (10.152.19.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.345.12 via Frontend Transport; Sun, 7 Jan 2018 18:46:12 +0000 Received: from DB3PR0202MB3452.eurprd02.prod.outlook.com ([fe80::f937:4ad2:ba75:414]) by DB3PR0202MB3452.eurprd02.prod.outlook.com ([fe80::f937:4ad2:ba75:414%13]) with mapi id 15.20.0386.008; Sun, 7 Jan 2018 18:46:12 +0000 From: Stefan _ To: FFmpeg development discussions and patches Thread-Topic: [PATCH 6/6] dashdec: Support SegmentTemplate inside Period Thread-Index: AQHTh+fKbTHxWAPpgUSJ2Tzs+Z3OUg== Date: Sun, 7 Jan 2018 18:46:12 +0000 Message-ID: Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:56DB38F58F308FCF55B5EAD791841620FCB34A3261C4DC288B31DE0C4A056387; UpperCasedChecksum:2BE2A63706DD812CF157DA98CD0B24208A6F8E992891897B4DC9463BC52FBE99; SizeAsReceived:6946; Count:44 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [z6l3eJZLLhtBdL7l64n/+i6gfeyRWdQW] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VE1EUR03HT114; 7:dfIyR3dfLIKv1+JM5dnAXs12zv5LCdxW9XJuYSUtOi9bqTLawjqe6ixMOq8QXYqgEb7KTF/Grmr0gdKSFIV9fw+OEIe0LpjFrbjzWa1d9kQSxQCyL2OCXsegg28OfM4G6r59P+OsJfviVFri1EaaR3g5jbMQxm7cdJxNJ5V2udiQsXbg6kENj5w4Xy8eVPw8ap9OeWv9gyI0HUA9nyj7w5Nlrs7ac/3PGcX/Wch+sE3J6JfvB0txJ8T7auMKDOku x-incomingheadercount: 44 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1603101448)(1601125374)(1701031045); SRVR:VE1EUR03HT114; x-ms-traffictypediagnostic: VE1EUR03HT114: x-ms-office365-filtering-correlation-id: 31dab58e-c2dc-4ff6-8001-08d555feec78 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:VE1EUR03HT114; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VE1EUR03HT114; x-forefront-prvs: 0545EFAC9A x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:VE1EUR03HT114; H:DB3PR0202MB3452.eurprd02.prod.outlook.com; FPR:; SPF:None; LANG:; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 31dab58e-c2dc-4ff6-8001-08d555feec78 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Jan 2018 18:46:12.3605 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR03HT114 Subject: [FFmpeg-devel] [PATCH 6/6] dashdec: Support SegmentTemplate inside Period 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" >From 89b42dc60156f1e030a30e13636651db41e9f34b Mon Sep 17 00:00:00 2001 From: sfan5 Date: Fri, 5 Jan 2018 15:32:23 +0100 Subject: [PATCH 6/6] dashdec: Support SegmentTemplate inside Period --- libavformat/dashdec.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index af8ab5f2f..ac1080b62 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -646,6 +646,7 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url, xmlNodePtr adaptionset_node, xmlNodePtr mpd_baseurl_node, xmlNodePtr period_baseurl_node, + xmlNodePtr period_segmenttemplate_node, xmlNodePtr fragment_template_node, xmlNodePtr content_component_node, xmlNodePtr adaptionset_baseurl_node, @@ -662,7 +663,7 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url, xmlNodePtr representation_segmentlist_node = NULL; xmlNodePtr segmentlists_tab[2]; xmlNodePtr fragment_timeline_node = NULL; - xmlNodePtr fragment_templates_tab[3]; + xmlNodePtr fragment_templates_tab[4]; char *duration_val = NULL; char *presentation_timeoffset_val = NULL; char *startnumber_val = NULL; @@ -702,18 +703,19 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url, baseurl_nodes[2] = adaptionset_baseurl_node; baseurl_nodes[3] = representation_baseurl_node; - if (representation_segmenttemplate_node || fragment_template_node) { + if (representation_segmenttemplate_node || fragment_template_node || period_segmenttemplate_node) { fragment_timeline_node = NULL; fragment_templates_tab[0] = representation_segmenttemplate_node; fragment_templates_tab[1] = adaptionset_segmentlist_node; fragment_templates_tab[2] = fragment_template_node; + fragment_templates_tab[3] = period_segmenttemplate_node; - presentation_timeoffset_val = get_val_from_nodes_tab(fragment_templates_tab, 3, "presentationTimeOffset"); - duration_val = get_val_from_nodes_tab(fragment_templates_tab, 3, "duration"); - startnumber_val = get_val_from_nodes_tab(fragment_templates_tab, 3, "startNumber"); - timescale_val = get_val_from_nodes_tab(fragment_templates_tab, 3, "timescale"); - initialization_val = get_val_from_nodes_tab(fragment_templates_tab, 3, "initialization"); - media_val = get_val_from_nodes_tab(fragment_templates_tab, 3, "media"); + presentation_timeoffset_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "presentationTimeOffset"); + duration_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "duration"); + startnumber_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "startNumber"); + timescale_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "timescale"); + initialization_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "initialization"); + media_val = get_val_from_nodes_tab(fragment_templates_tab, 4, "media"); if (initialization_val) { rep->init_section = av_mallocz(sizeof(struct fragment)); @@ -866,7 +868,8 @@ end: static int parse_manifest_adaptationset(AVFormatContext *s, const char *url, xmlNodePtr adaptionset_node, xmlNodePtr mpd_baseurl_node, - xmlNodePtr period_baseurl_node) + xmlNodePtr period_baseurl_node, + xmlNodePtr period_segmenttemplate_node) { int ret = 0; xmlNodePtr fragment_template_node = NULL; @@ -890,6 +893,7 @@ static int parse_manifest_adaptationset(AVFormatContext *s, const char *url, adaptionset_node, mpd_baseurl_node, period_baseurl_node, + period_segmenttemplate_node, fragment_template_node, content_component_node, adaptionset_baseurl_node, @@ -918,6 +922,7 @@ static int parse_manifest(AVFormatContext *s, const char *url, AVIOContext *in) xmlNodePtr period_node = NULL; xmlNodePtr mpd_baseurl_node = NULL; xmlNodePtr period_baseurl_node = NULL; + xmlNodePtr period_segmenttemplate_node = NULL; xmlNodePtr adaptionset_node = NULL; xmlAttrPtr attr = NULL; char *val = NULL; @@ -1047,8 +1052,10 @@ static int parse_manifest(AVFormatContext *s, const char *url, AVIOContext *in) while (adaptionset_node) { if (!av_strcasecmp(adaptionset_node->name, (const char *)"BaseURL")) { period_baseurl_node = adaptionset_node; + } else if (!av_strcasecmp(adaptionset_node->name, (const char *)"SegmentTemplate")) { + period_segmenttemplate_node = adaptionset_node; } else if (!av_strcasecmp(adaptionset_node->name, (const char *)"AdaptationSet")) { - parse_manifest_adaptationset(s, url, adaptionset_node, mpd_baseurl_node, period_baseurl_node); + parse_manifest_adaptationset(s, url, adaptionset_node, mpd_baseurl_node, period_baseurl_node, period_segmenttemplate_node); } adaptionset_node = xmlNextElementSibling(adaptionset_node); } -- 2.15.1