[FFmpeg-devel] [PATCH] lavf: add data: URI scheme.

[Stefano Sabatini]

On date Wednesday 2012-12-26 20:34:41 +0100, Nicolas George encoded:
> 
> Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
> ---
>  Changelog                |    1 +
>  libavformat/Makefile     |    1 +
>  libavformat/allformats.c |    1 +
>  libavformat/data_uri.c   |  110 ++++++++++++++++++++++++++++++++++++++++++++++

Since "data" is pretty generic, you may add a short section in the
protocols manual.

>  libavformat/version.h    |    4 +-
>  5 files changed, 115 insertions(+), 2 deletions(-)
>  create mode 100644 libavformat/data_uri.c
> 
> diff --git a/Changelog b/Changelog
> index 9eec45c..7b408ef 100644
> --- a/Changelog
> +++ b/Changelog
> @@ -50,6 +50,7 @@ version <next>:
>  - documentation split into per-component manuals
>  - pp (postproc) filter ported from MPlayer
>  - NIST Sphere demuxer
> +- data: URI scheme
>  
>  
>  version 1.0:
> diff --git a/libavformat/Makefile b/libavformat/Makefile
> index 587fa42..2787a8a 100644
> --- a/libavformat/Makefile
> +++ b/libavformat/Makefile
> @@ -401,6 +401,7 @@ OBJS-$(CONFIG_BLURAY_PROTOCOL)           += bluray.o
>  OBJS-$(CONFIG_CACHE_PROTOCOL)            += cache.o
>  OBJS-$(CONFIG_CONCAT_PROTOCOL)           += concat.o
>  OBJS-$(CONFIG_CRYPTO_PROTOCOL)           += crypto.o
> +OBJS-$(CONFIG_DATA_PROTOCOL)             += data_uri.o
>  OBJS-$(CONFIG_FFRTMPCRYPT_PROTOCOL)      += rtmpcrypt.o rtmpdh.o
>  OBJS-$(CONFIG_FFRTMPHTTP_PROTOCOL)       += rtmphttp.o
>  OBJS-$(CONFIG_FILE_PROTOCOL)             += file.o
> diff --git a/libavformat/allformats.c b/libavformat/allformats.c
> index 6b4c27b..432e5b6 100644
> --- a/libavformat/allformats.c
> +++ b/libavformat/allformats.c
> @@ -288,6 +288,7 @@ void av_register_all(void)
>      REGISTER_PROTOCOL (CACHE, cache);
>      REGISTER_PROTOCOL (CONCAT, concat);
>      REGISTER_PROTOCOL (CRYPTO, crypto);
> +    REGISTER_PROTOCOL (DATA, data);
>      REGISTER_PROTOCOL (FFRTMPCRYPT, ffrtmpcrypt);
>      REGISTER_PROTOCOL (FFRTMPHTTP, ffrtmphttp);
>      REGISTER_PROTOCOL (FILE, file);
> diff --git a/libavformat/data_uri.c b/libavformat/data_uri.c
> new file mode 100644
> index 0000000..124f0f0
> --- /dev/null
> +++ b/libavformat/data_uri.c
> @@ -0,0 +1,110 @@
> +/*
> + * Copyright (c) 2012 Nicolas George
> + *
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public License
> + * as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public License
> + * along with FFmpeg; if not, write to the Free Software Foundation, Inc.,
> + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> +#include <string.h>
> +#include "libavutil/avstring.h"
> +#include "libavutil/base64.h"
> +#include "url.h"
> +
> +typedef struct {
> +    const uint8_t *data;
> +    void *tofree;
> +    size_t size;
> +    size_t pos;
> +} DataContext;
> +
> +static av_cold int data_open(URLContext *h, const char *uri, int flags)
> +{
> +    DataContext *dc = h->priv_data;
> +    const char *data, *opt, *next;
> +    char *ddata;
> +    int ret, base64 = 0;
> +    size_t in_size;
> +
> +    av_strstart(uri, "data:", &uri);
> +    data = strchr(uri, ',');

> +    if (!data)
> +        return AVERROR(EINVAL);

Meaningful error message?

> +    opt = uri;

> +    while (opt < data) {
> +        next = av_x_if_null(memchr(opt, ';', data - opt), data);
> +        if (opt == uri) {
> +            if (!memchr(opt, '/', next - opt)) /* basic validity check */
> +                return AVERROR(EINVAL);
> +            av_log(h, AV_LOG_VERBOSE, "Content-type: %.*s\n",
> +                   (int)(next - opt), opt);
> +        } else {
> +            if (!av_strncasecmp(opt, "base64", next - opt)) {
> +                base64 = 1;
> +            } else {
> +                av_log(h, AV_LOG_VERBOSE, "Ignoring option '%.*s'\n",
> +                       (int)(next - opt), opt);
> +            }
> +        }
> +        opt = next + 1;
> +    }

Maybe mention the syntax in the code, or in the docs, so it's easier
to read/debug this.
-- 
FFmpeg = Fundamental & Faithless Monstrous Puristic Encoding/decoding Geek