From patchwork Sat Jun 19 19:13:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 28583 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2042:0:0:0:0 with SMTP id z2csp508167iod; Sat, 19 Jun 2021 12:14:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkD/OyMZ0Db84vqan7mZQVrexPe3uNca3/QPAHdV0D4f+WHnx2dk7poAA165AutSxkpv8q X-Received: by 2002:a17:907:f9b:: with SMTP id kb27mr16900130ejc.44.1624130041275; Sat, 19 Jun 2021 12:14:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624130041; cv=none; d=google.com; s=arc-20160816; b=zPxcMYWQc13rzE6MfOQkssZG0oPYEr5zaoAB3qa4DjqFx0aHH5Ew7H9yIMOWPLpHBe bCPKl29KTiD+cLCD/hiIhQlRZLU4kpLOUy5pas8HKbV/rSmeXqiBTH/BgldzYj0g0FZj +JsARKUlHyAsVWDhquUHbIybVngkJ/RKGYDHJfXf+RmlhAn/GNmJ5HGunsrvpNF8nfeX GTP0nJGvWcubPuPtAu3jzGJ9qFMakvF+s1I+6Q9AJ/yab4BvFd84HqoZ+5Q4ObwbCGe/ +PCSTsIyXJM9fOqa0kac73LJPMp/mdSx65/NByC6Ebgo099L6JfjcucPSbxHte3MseuU gySw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=kTlEecjHMPGao8NL4PIqG0sAwCggR0+/S1ocRd+pg5w=; b=0gXIAtdKxNTTpPKQuzLyzH1gV2wxye4paFvHYUA3kxyLj12fUQjvSVA3aLWnA5USMn ktxfMqICINzguPT6hyGkSXTucWzyjm3qSdWyeE3VHUSBc6FfAem8OpZ2VQPGvcv1re9E ytGR3ehT16VitD5horgpS/Jlo5BCH2nIMzA8GoaCHbVXISzGatsQNNausvKHYs4btVur feXHUpUXZDTAHvTMY62R5WOoY7AgrDPrpexjy0JnplfcEY1twvvX+BIjLQirIgf+xgXB rZ7bmlRweCOh9IhdSMlOGUH+cy1mdwxRYd3Wb0pwRXzwqCmFuPTwMV9FFEpRl0l6LtNV tsaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CaPzAQ2u; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ci2si631741ejc.159.2021.06.19.12.14.00; Sat, 19 Jun 2021 12:14:01 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CaPzAQ2u; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E3DF689D32; Sat, 19 Jun 2021 22:13:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70B34680913 for ; Sat, 19 Jun 2021 22:13:50 +0300 (EEST) Received: by mail-qt1-f170.google.com with SMTP id t9so10212622qtw.7 for ; Sat, 19 Jun 2021 12:13:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=jj2dnGtwiNELBXF6zzjQl0eF9r2FFYzAKtsjXfsXCaM=; b=CaPzAQ2ucdwDCqMfuNCi8wCH3xs7iziSPRNrkm4kw9X+pactA9UOcq+87TUrvxWDGk T7e3nuEvHrAPLUZKOXxysmEFGq9QV/4jphL428YDSaiGqp5ZYscaL9fxQhvXJq7QSdPf e8GCX+QXmpb7BX5TOMtLCEv5lOpQn5c7uVVrvIB4m6SiQD/7vG9JWCdoPXJlUqjejdkK MnH+S5bMlhPfZYOJZ32cjHQrqCjXUhBB6+Q5JcqTc2vmE+SE8e0rBRALS5XfzJIXKOZC CAW9MXWwq0wae3DzT/5McojuhN/uaLMV/7HJl1G4NcX9xDkrWWpXB560h4fNrY62D9wl nIEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=jj2dnGtwiNELBXF6zzjQl0eF9r2FFYzAKtsjXfsXCaM=; b=C3WMWXCbb+2Oa9I/uKbslLHFicfOFLTbdpobY8apT4ax0FMAemqxXPn49XJf+I8TrV 8yFBfn0YuQ0OsvdIO5FoAJHEv8SvcUmaXB2Mihx4yZlBqgUnmD0GzJxuTidgu0d8MebQ d+L+bn0zxW4+jOEUBgBbigKydsqFWYhaMbCL6cZWK9q/wmcxCUUaM5XfX2ePwPSaTLuR qsBeDg1gjWbSai2W8amD+xl8cjqbBa07JDWPxUW2A7xWg+Gqzl8P0bDIybw2xAjjWRKb uGdVRtOUvg9lSJeefw5Yxx7aKDBLoytOa9jWChsUbuh1HAYpblrkhhgg/fWhzeosyEjE SFaQ== X-Gm-Message-State: AOAM532cc+pjCLaoWh67EofxVMcdClQ9BARyBm3EmpayOpbkdv4vxLKz mx5fCWdm30PNifo7IxAh9h0jKhpma88= X-Received: by 2002:ac8:5fd1:: with SMTP id k17mr7307870qta.126.1624130028699; Sat, 19 Jun 2021 12:13:48 -0700 (PDT) Received: from localhost.localdomain ([191.84.225.169]) by smtp.gmail.com with ESMTPSA id y10sm6664603qki.32.2021.06.19.12.13.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Jun 2021 12:13:48 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Jun 2021 16:13:01 -0300 Message-Id: <20210619191301.3115-1-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat: add a concat protocol using a files recipe X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2EKDOzEP2476 Suggested-by: ffmpeg@fb.com Signed-off-by: James Almer --- libavformat/Makefile | 1 + libavformat/concat.c | 111 ++++++++++++++++++++++++++++++++++++++++ libavformat/protocols.c | 1 + 3 files changed, 113 insertions(+) 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;