From patchwork Mon Sep 3 10:05:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 10215 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp2492144jap; Mon, 3 Sep 2018 03:06:40 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZmQmfyJzn4R2SQ8sQmXFOQHGFkzS9F2l25LIGqDk2hdEZaFhQewRO9el+nHP4HpvGtviDY X-Received: by 2002:a1c:55c2:: with SMTP id j185-v6mr4862168wmb.104.1535969199976; Mon, 03 Sep 2018 03:06:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535969199; cv=none; d=google.com; s=arc-20160816; b=UlKqacuNawIqlB5YoDFqlhc16V3M4CAfkZleLwHz5Y12xcserke+wjEdTGCX86NB00 tBhZTOJbuY97xjSbMzugFCQDHypDHWdaTq0GNj6KAaC/TWthkHkzd5UX72nel7ed+re9 uS3wYMZ2Q89AkHEwO2/r6AEkhozLSNvAhQKlvmsSGwKKs8Ww2YuUsn57ESj58uFEMRnX J5Idx0wCdXxLOGkuQGJDyBPxerDlBIJEGKuIoVDPVuSOp3i7yDSBcH8zqD1M49X/cCHW 8n/vYJw+6t9hiJv9GqEBv5Q+5J8AB1i5fLX0Qc8VxRB2R9IJ90RmKHdrpNpR68KoSVlb BqvQ== 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:feedback-id:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=Sh5+cK5/+zNcWuSN9JX9YJ9XqIWL9Ih5r7HLoCiw1HI=; b=OD7M6ST/JBVxteRyqowN/eDv34AFyr3Ml3ifhpdedZiDcYyKnQLm+vt/A1nqcb1suo eT90a+FnGzj0fNLn9K6Gjna08uuDBoFMQusBN1ReV/8ZZbfwNZagDFjin/Z74NCQEnR2 AAGX/TljJFXGaMXuzvw9opVcEQdblKijV0VeuzNdY14aGLok/jcmQWseO/mu0DBugrde JFdJCvS3UDKYYJh3kBNdTtRkVsiFWUaOX1a3HtIBNxIijzTaUHxvUq6jvm8CjyglH/Gh FYkWeMmgiJ7o+NH0IidcVPn/NUy0fKalkfEv/SxaF326YatWBEwx47tBX+RpVE7phKHc fm1g== 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 o1-v6si16268892wrn.236.2018.09.03.03.06.39; Mon, 03 Sep 2018 03:06:39 -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; 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 7C32A689B85; Mon, 3 Sep 2018 13:06:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgbr2.qq.com (smtpbgbr2.qq.com [54.207.22.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AADC26897ED for ; Mon, 3 Sep 2018 13:06:15 +0300 (EEST) X-QQ-mid: bizesmtp21t1535969176tiejheb8 Received: from localhost (unknown [117.136.38.158]) by esmtp6.qq.com (ESMTP) with id ; Mon, 03 Sep 2018 18:06:14 +0800 (CST) X-QQ-SSF: 01100000002000F0FMF0000A0000000 X-QQ-FEAT: 9NFkmNiL4hd7wbkDVedJVDWWHVnzC5Cq/Qxq1yj3OkWEBzCKVeiTA55q2g3fl 9R4VIxVdhlYBCw6K8Jx0TyeQcZGdnHrkjfOeyxpbiY8XxI8Gbzz5o2uwUPro08Zpu+2/8Iq v8Agve4lKVGDPwX0XBFqo4lnZGriPkFRGq2c7K1ftziHH0G9fY+VShkRBQ4jjZ6NN8FG7+3 N6viAi+z3DHelK+PeHkQtJieLFp0+Jn60qTwtPO+eE2aoe6WEPBNJbcnUds94snfTzC8jwK +uSiHoPBHYd3WHb8W6cKaqfltPaD1Jke5WYQ== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Sep 2018 18:05:54 +0800 Message-Id: <20180903100600.85023-2-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.15.2 (Apple Git-101.1) In-Reply-To: <20180903100600.85023-1-lq@chinaffmpeg.org> References: <20180903100600.85023-1-lq@chinaffmpeg.org> X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH 2/8] avformat/dashdec: refine adaptionset attribute members 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: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Steven Liu --- libavformat/dashdec.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 0977517ce5..ff6684c511 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -122,6 +122,19 @@ struct representation { typedef struct DASHContext { const AVClass *class; char *base_url; + char *adaptionset_contenttype_val; + char *adaptionset_par_val; + char *adaptionset_lang_val; + char *adaptionset_minbw_val; + char *adaptionset_maxbw_val; + char *adaptionset_minwidth_val; + char *adaptionset_maxwidth_val; + char *adaptionset_minheight_val; + char *adaptionset_maxheight_val; + char *adaptionset_minframerate_val; + char *adaptionset_maxframerate_val; + char *adaptionset_segmentalignment_val; + char *adaptionset_bitstreamswitching_val; int n_videos; struct representation **videos; @@ -1061,12 +1074,26 @@ static int parse_manifest_adaptationset(AVFormatContext *s, const char *url, xmlNodePtr period_segmentlist_node) { int ret = 0; + DASHContext *c = s->priv_data; xmlNodePtr fragment_template_node = NULL; xmlNodePtr content_component_node = NULL; xmlNodePtr adaptionset_baseurl_node = NULL; xmlNodePtr adaptionset_segmentlist_node = NULL; xmlNodePtr adaptionset_supplementalproperty_node = NULL; xmlNodePtr node = NULL; + c->adaptionset_contenttype_val = xmlGetProp(adaptionset_node, "contentType"); + c->adaptionset_par_val = xmlGetProp(adaptionset_node, "par"); + c->adaptionset_lang_val = xmlGetProp(adaptionset_node, "lang"); + c->adaptionset_minbw_val = xmlGetProp(adaptionset_node, "minBandwidth"); + c->adaptionset_maxbw_val = xmlGetProp(adaptionset_node, "maxBandwidth"); + c->adaptionset_minwidth_val = xmlGetProp(adaptionset_node, "minWidth"); + c->adaptionset_maxwidth_val = xmlGetProp(adaptionset_node, "maxWidth"); + c->adaptionset_minheight_val = xmlGetProp(adaptionset_node, "minHeight"); + c->adaptionset_maxheight_val = xmlGetProp(adaptionset_node, "maxHeight"); + c->adaptionset_minframerate_val = xmlGetProp(adaptionset_node, "minFrameRate"); + c->adaptionset_maxframerate_val = xmlGetProp(adaptionset_node, "maxFrameRate"); + c->adaptionset_segmentalignment_val = xmlGetProp(adaptionset_node, "segmentAlignment"); + c->adaptionset_bitstreamswitching_val = xmlGetProp(adaptionset_node, "bitstreamSwitching"); node = xmlFirstElementChild(adaptionset_node); while (node) {