diff mbox series

[FFmpeg-devel] avformat: add a concat protocol using a files recipe

Message ID 20210619191301.3115-1-jamrial@gmail.com
State New
Headers show
Series [FFmpeg-devel] avformat: add a concat protocol using a files recipe
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

James Almer June 19, 2021, 7:13 p.m. UTC
Suggested-by: ffmpeg@fb.com
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/Makefile    |   1 +
 libavformat/concat.c    | 111 ++++++++++++++++++++++++++++++++++++++++
 libavformat/protocols.c |   1 +
 3 files changed, 113 insertions(+)

Comments

Nicolas George June 22, 2021, 10:23 a.m. UTC | #1
James Almer (12021-06-19):
> Suggested-by: ffmpeg@fb.com
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavformat/Makefile    |   1 +
>  libavformat/concat.c    | 111 ++++++++++++++++++++++++++++++++++++++++
>  libavformat/protocols.c |   1 +
>  3 files changed, 113 insertions(+)

It needs some documentation. Especially about escaping special
characters in file names and URLs.

Regards,
Hendrik Leppkes June 22, 2021, 11:02 a.m. UTC | #2
On Sat, Jun 19, 2021 at 9:14 PM James Almer <jamrial@gmail.com> wrote:
>
> Suggested-by: ffmpeg@fb.com
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavformat/Makefile    |   1 +
>  libavformat/concat.c    | 111 ++++++++++++++++++++++++++++++++++++++++
>  libavformat/protocols.c |   1 +
>  3 files changed, 113 insertions(+)
>

This patch leaves me totally puzzling what it might do. "files recipe"
doesn't really ring any bells.

A quick explanation in the commit should be included at the very
least, adding it to doc/protocols.texi would be even better.

- Hendrik
James Almer June 22, 2021, 5:40 p.m. UTC | #3
On 6/22/2021 8:02 AM, Hendrik Leppkes wrote:
> On Sat, Jun 19, 2021 at 9:14 PM James Almer <jamrial@gmail.com> wrote:
>>
>> Suggested-by: ffmpeg@fb.com
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>   libavformat/Makefile    |   1 +
>>   libavformat/concat.c    | 111 ++++++++++++++++++++++++++++++++++++++++
>>   libavformat/protocols.c |   1 +
>>   3 files changed, 113 insertions(+)
>>
> 
> This patch leaves me totally puzzling what it might do. "files recipe"
> doesn't really ring any bells.

Bad wording, i guess, sorry. It's basically the concat protocol except 
it reads the urls from individual lines in a text file instead of a 
single string using a colon as separator.

> 
> A quick explanation in the commit should be included at the very
> least, adding it to doc/protocols.texi would be even better.

Will do.

> 
> - Hendrik
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
James Almer June 22, 2021, 6:06 p.m. UTC | #4
On 6/22/2021 7:23 AM, Nicolas George wrote:
> James Almer (12021-06-19):
>> Suggested-by: ffmpeg@fb.com
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>   libavformat/Makefile    |   1 +
>>   libavformat/concat.c    | 111 ++++++++++++++++++++++++++++++++++++++++
>>   libavformat/protocols.c |   1 +
>>   3 files changed, 113 insertions(+)
> 
> It needs some documentation. Especially about escaping special
> characters in file names and URLs.

Will do.

> 
> Regards,
> 
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
diff mbox series

Patch

diff --git a/libavformat/Makefile b/libavformat/Makefile
index c9ef564523..caca95802a 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -616,6 +616,7 @@  OBJS-$(CONFIG_APPLEHTTP_PROTOCOL)        += hlsproto.o
 OBJS-$(CONFIG_BLURAY_PROTOCOL)           += bluray.o
 OBJS-$(CONFIG_CACHE_PROTOCOL)            += cache.o
 OBJS-$(CONFIG_CONCAT_PROTOCOL)           += concat.o
+OBJS-$(CONFIG_CONCATF_PROTOCOL)          += concat.o
 OBJS-$(CONFIG_CRYPTO_PROTOCOL)           += crypto.o
 OBJS-$(CONFIG_DATA_PROTOCOL)             += data_uri.o
 OBJS-$(CONFIG_FFRTMPCRYPT_PROTOCOL)      += rtmpcrypt.o rtmpdigest.o rtmpdh.o
diff --git a/libavformat/concat.c b/libavformat/concat.c
index 278afd997d..d7473d25f7 100644
--- a/libavformat/concat.c
+++ b/libavformat/concat.c
@@ -22,9 +22,12 @@ 
  */
 
 #include "libavutil/avstring.h"
+#include "libavutil/bprint.h"
 #include "libavutil/mem.h"
 
 #include "avformat.h"
+#include "avio_internal.h"
+#include "internal.h"
 #include "url.h"
 
 #define AV_CAT_SEPARATOR "|"
@@ -56,6 +59,7 @@  static av_cold int concat_close(URLContext *h)
     return err < 0 ? -1 : 0;
 }
 
+#if CONFIG_CONCAT_PROTOCOL
 static av_cold int concat_open(URLContext *h, const char *uri, int flags)
 {
     char *node_uri = NULL;
@@ -124,6 +128,7 @@  static av_cold int concat_open(URLContext *h, const char *uri, int flags)
     data->total_size = total_size;
     return err;
 }
+#endif
 
 static int concat_read(URLContext *h, unsigned char *buf, int size)
 {
@@ -188,6 +193,7 @@  static int64_t concat_seek(URLContext *h, int64_t pos, int whence)
     return result;
 }
 
+#if CONFIG_CONCAT_PROTOCOL
 const URLProtocol ff_concat_protocol = {
     .name           = "concat",
     .url_open       = concat_open,
@@ -197,3 +203,108 @@  const URLProtocol ff_concat_protocol = {
     .priv_data_size = sizeof(struct concat_data),
     .default_whitelist = "concat,file,subfile",
 };
+#endif
+
+#if CONFIG_CONCATF_PROTOCOL
+static av_cold int concatf_open(URLContext *h, const char *uri, int flags)
+{
+    AVBPrint bp;
+    struct concat_data  *data = h->priv_data;
+    struct concat_nodes *nodes = NULL;
+    AVIOContext *in = NULL;
+    URLContext *uc;
+    char *node_uri = NULL;
+    int64_t size, total_size = 0;
+    unsigned int nodes_size = 0;
+    size_t i = 0;
+    int err = 0;
+
+    if (!av_strstart(uri, "concatf:", &uri)) {
+        av_log(h, AV_LOG_ERROR, "URL %s lacks prefix\n", uri);
+        return AVERROR(EINVAL);
+    }
+
+    /* handle input */
+    if (!*uri)
+        return AVERROR(ENOENT);
+
+    err = ffio_open_whitelist(&in, uri, AVIO_FLAG_READ, &h->interrupt_callback,
+                              NULL, h->protocol_whitelist, h->protocol_blacklist);
+    if (err < 0)
+        return err;
+
+    av_bprint_init(&bp, 0, AV_BPRINT_SIZE_UNLIMITED);
+
+    for (i = 0; !avio_feof(in); i++) {
+        uint8_t *cursor;
+        size_t len = i;
+
+        if ((err = ff_read_line_to_bprint_overwrite(in, &bp)) <= 0) {
+            if (err == 0 && i == 0)
+                err = AVERROR_INVALIDDATA;
+            else if (err == AVERROR_EOF)
+                err = 0;
+            break;
+        }
+
+        cursor = bp.str;
+        node_uri = av_get_token((const char **)&cursor, SPACE_CHARS);
+        if (!node_uri) {
+            err = AVERROR(ENOMEM);
+            break;
+        }
+
+        if (++len == SIZE_MAX / sizeof(*nodes)) {
+            av_freep(&node_uri);
+            err = AVERROR(ENAMETOOLONG);
+            break;
+        }
+
+        /* creating URLContext */
+        err = ffurl_open_whitelist(&uc, node_uri, flags,
+                                   &h->interrupt_callback, NULL, h->protocol_whitelist, h->protocol_blacklist, h);
+        av_freep(&node_uri);
+        if (err < 0)
+            break;
+
+        /* creating size */
+        if ((size = ffurl_size(uc)) < 0) {
+            ffurl_close(uc);
+            err = AVERROR(ENOSYS);
+            break;
+        }
+
+        nodes = av_fast_realloc(data->nodes, &nodes_size, sizeof(*nodes) * len);
+        if (!nodes) {
+            ffurl_close(uc);
+            err = AVERROR(ENOMEM);
+            break;
+        }
+        data->nodes = nodes;
+
+        /* assembling */
+        data->nodes[i].uc   = uc;
+        data->nodes[i].size = size;
+        total_size += size;
+    }
+    avio_closep(&in);
+    av_bprint_finalize(&bp, NULL);
+    data->length = i;
+
+    if (err < 0)
+        concat_close(h);
+
+    data->total_size = total_size;
+    return err;
+}
+
+const URLProtocol ff_concatf_protocol = {
+    .name           = "concatf",
+    .url_open       = concatf_open,
+    .url_read       = concat_read,
+    .url_seek       = concat_seek,
+    .url_close      = concat_close,
+    .priv_data_size = sizeof(struct concat_data),
+    .default_whitelist = "concatf,concat,file,subfile",
+};
+#endif
diff --git a/libavformat/protocols.c b/libavformat/protocols.c
index 4b6b1c8e98..7f08f151b6 100644
--- a/libavformat/protocols.c
+++ b/libavformat/protocols.c
@@ -27,6 +27,7 @@  extern const URLProtocol ff_async_protocol;
 extern const URLProtocol ff_bluray_protocol;
 extern const URLProtocol ff_cache_protocol;
 extern const URLProtocol ff_concat_protocol;
+extern const URLProtocol ff_concatf_protocol;
 extern const URLProtocol ff_crypto_protocol;
 extern const URLProtocol ff_data_protocol;
 extern const URLProtocol ff_ffrtmpcrypt_protocol;