diff mbox

[FFmpeg-devel,v2] avformat/dashdec: Support signaling of last segment number

Message ID 1522008082-4084-1-git-send-email-raut.sanil@gmail.com
State New
Headers show

Commit Message

sanilraut March 25, 2018, 8:01 p.m. UTC 
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(-)

Comments

Liu Steven March 27, 2018, 2:10 a.m. UTC | #1 
> On 26 Mar 2018, at 04:01, sanilraut <raut.sanil@gmail.com> wrote:
> 
> 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")) {
av_strcasecmp
> +                    val = xmlGetProp(adaptionset_supplementalproperty_node,"value”);
val need be checked if xmlGetProp will be failed
> +                    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) {
> -- 
> 
> Thanks
> 
> 2.7.4
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Thanks
Steven
sanilraut March 27, 2018, 1:30 p.m. UTC | #2 
Thanks. Have re-submitted the patch.

Sanil

On Mon, Mar 26, 2018 at 7:10 PM, Steven Liu <lq@chinaffmpeg.org> wrote:

>
>
> > On 26 Mar 2018, at 04:01, sanilraut <raut.sanil@gmail.com> wrote:
> >
> > 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")) {
> av_strcasecmp
> > +                    val = xmlGetProp(adaptionset_
> supplementalproperty_node,"value”);
> val need be checked if xmlGetProp will be failed
> > +                    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) {
> > --
> >
> > Thanks
> >
> > 2.7.4
> >
> > _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel@ffmpeg.org
> > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> Thanks
> Steven
>
>
>
>
diff mbox

Patch

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) {