[FFmpeg-devel] [PATCH] Download dash content with byte range info

[Steven Liu]

2017-11-23 6:58 GMT+08:00 Colin NG <colin_ng at hotmail.com>:
> ---
>  libavformat/dashdec.c | 38 ++++++++++++++++++++++++++++++++------
>  1 file changed, 32 insertions(+), 6 deletions(-)
>
> diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c
> index 0e3afd2..3798649 100644
> --- a/libavformat/dashdec.c
> +++ b/libavformat/dashdec.c
> @@ -522,6 +522,24 @@ static enum AVMediaType get_content_type(xmlNodePtr node)
>      return type;
>  }
>
> +static struct fragment * get_Fragment(char *range)
Wrong code style, refer to: https://ffmpeg.org/developer.html#Naming-conventions

> +{
> +    struct fragment * seg =  av_mallocz(sizeof(struct fragment));
> +
> +    if (!seg)
> +        return NULL;
> +
> +    seg->size = -1;
> +    if (range)  {
> +        char *str_end_offset;
> +        char *str_offset = av_strtok(range, "-", &str_end_offset);
check str_offset NULL value, because the HTTP Server maybe not
standard, that cannot control by us.

> +        seg->url_offset = strtoll(str_offset, NULL, 10);
> +        seg->size = strtoll(str_end_offset, NULL, 10) -seg->url_offset;
> +    }
> +
> +    return seg;
> +}
> +
>  static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representation *rep,
>                                           xmlNodePtr fragmenturl_node,
>                                           xmlNodePtr *baseurl_nodes,
> @@ -530,33 +548,40 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati
>  {
>      char *initialization_val = NULL;
>      char *media_val = NULL;
> +    char *range_val = NULL;
>
>      if (!av_strcasecmp(fragmenturl_node->name, (const char *)"Initialization")) {
>          initialization_val = xmlGetProp(fragmenturl_node, "sourceURL");
> -        if (initialization_val) {
> -            rep->init_section = av_mallocz(sizeof(struct fragment));
> +        range_val = xmlGetProp(fragmenturl_node, "range");
> +        if (initialization_val || range_val) {
> +            rep->init_section = get_Fragment(range_val);
>              if (!rep->init_section) {
>                  xmlFree(initialization_val);
> +                xmlFree(range_val);
>                  return AVERROR(ENOMEM);
>              }
>              rep->init_section->url = get_content_url(baseurl_nodes, 4,
>                                                       rep_id_val,
>                                                       rep_bandwidth_val,
>                                                       initialization_val);
> +
>              if (!rep->init_section->url) {
>                  av_free(rep->init_section);
>                  xmlFree(initialization_val);
> +                xmlFree(range_val);
>                  return AVERROR(ENOMEM);
>              }
> -            rep->init_section->size = -1;
>              xmlFree(initialization_val);
> +            xmlFree(range_val);
>          }
>      } else if (!av_strcasecmp(fragmenturl_node->name, (const char *)"SegmentURL")) {
>          media_val = xmlGetProp(fragmenturl_node, "media");
> -        if (media_val) {
> -            struct fragment *seg = av_mallocz(sizeof(struct fragment));
> +        range_val = xmlGetProp(fragmenturl_node, "mediaRange");
> +        if (media_val || range_val) {
> +            struct fragment *seg =  get_Fragment(range_val);
>              if (!seg) {
>                  xmlFree(media_val);
> +                xmlFree(range_val);
>                  return AVERROR(ENOMEM);
>              }
>              seg->url = get_content_url(baseurl_nodes, 4,
> @@ -566,11 +591,12 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati
>              if (!seg->url) {
>                  av_free(seg);
>                  xmlFree(media_val);
> +                xmlFree(range_val);
>                  return AVERROR(ENOMEM);
>              }
> -            seg->size = -1;
>              dynarray_add(&rep->fragments, &rep->n_fragments, seg);
>              xmlFree(media_val);
> +            xmlFree(range_val);
>          }
>      }
>
> --
> 2.7.4
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel