From patchwork Fri Jul 12 13:51:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus B Spencer X-Patchwork-Id: 50498 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:2298:b0:482:c625:d099 with SMTP id fp24csp831495vqb; Fri, 12 Jul 2024 06:53:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWEj6BAqVQOtv8lN+VkhHLZUajE6qjeGH77jldp35dKoO1jzCW0zL9qpccRKqyw9G5fbnDJYr8YjJTiFde+KneoNRqEsOEaXkAvyg== X-Google-Smtp-Source: AGHT+IG0A5KUhWP7sMLsVLyr2/TcxLKEGlLohGT4hsjJTpFyRDgGArDJhbRfd/aWV8oSqnHJKD3W X-Received: by 2002:a17:906:c450:b0:a77:c043:5b59 with SMTP id a640c23a62f3a-a799cc6f977mr184927866b.20.1720792423756; Fri, 12 Jul 2024 06:53:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720792423; cv=none; d=google.com; s=arc-20160816; b=u3xJIZWxRz5twrD0C/qgCtcqd7IIgORYPY0Glz9EOjK90ZMuERPLwjHutqawpif9Ah l4bFYsBqm72kOFoXF5H8sL6WhqGQnPoPhZBdX8SNQvt9+c1SrWuCL4sC+sQ44fEGCpvR yZ7Q46yX7P5XQVcamUFiEFtHeLuCfGwNTQlXDZ7FQt3O30e7ioR4/f9LaHmL1JQYgBpQ gfWVPn5tJ63sHw1Z6p6rG+toW4Xg2RPQTr2rfLoP2Z3MRtzLN1DprN4sg5fqslY1XmdI ecATFOMsAGO9jQ0Dw+mUHDEp3PnTZ6y0466tjkD+op3glzWWNdkspMmUAHZWyPaJxxVJ pmQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=906kwbh46JEo8Hph1G6Nak503sFo/Kk1mTwh8G2mau4=; fh=JuegC/vje050XLj6U2KtH3S0d9hYf9AYxo0tX+p7f28=; b=MhwWzZxFQv6YBE2O5BYjjZX/ldl2bMW2hgoQZeBWa/7B/xBu/j71EYv7q1DSZjihYE qgXVx/TgMur9xm3dkExam2zJQinkxDZlBzLZIfWKeD5VS+mQybGnWT+QqOMgIbvQpRrl aqooYw5a1WmkZ2COMjPYayjhIa/0rpmhENJKpLNTUCdYX5NlsubZNUGcr8KfT/wD7KCN KY/+Cqj7ldFOBF8in/yEYXRy0IQAL8PaeT2YDPTDN6vR0EmE70jgRgNA4XxPWfcTKeEO PUXWYcVKGF6D2ttsMbhXJqv75gVq1byUxtb55PAO+ApYIaXGv/d5N42LubnOiAMaK1X/ Z6uQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@marcusspencer.xyz header.s=protonmail header.b=NNTDFkV2; 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=NONE dis=NONE) header.from=marcusspencer.xyz Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a780aae194fsi468847366b.347.2024.07.12.06.53.43; Fri, 12 Jul 2024 06:53:43 -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=@marcusspencer.xyz header.s=protonmail header.b=NNTDFkV2; 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=NONE dis=NONE) header.from=marcusspencer.xyz Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 28D3068D948; Fri, 12 Jul 2024 16:53:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-0301.mail-europe.com (mail-0301.mail-europe.com [188.165.51.139]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A50668D948 for ; Fri, 12 Jul 2024 16:53:32 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marcusspencer.xyz; s=protonmail; t=1720792403; x=1721051603; bh=zk+ZkXnhNLkYDqkjpU57wbEtfPvaH8NVsuZvckvASzE=; h=From:To:Cc:Subject:Date:Message-ID:From:To:Cc:Date:Subject: Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=NNTDFkV2ejS73cw7ioBCCXC3gOzoGO94zeMiH0lTe/U2aWo/uP/u2ysS/JtG/LSVN H/JIypiFYC4amhgI8+uJa8kfvgUczYsNv/IO/TrWmn45Qs1km2MGL1u6X/DtxL/fpN O0ATOvcWSxk1wqpOt46HqKXDbd+fOCLQ8cGFcEMNbsA73fuiTNupUytZwNw8MhvuNN ZmbO3vr84EVjq4xLZzSTZnetoqBKRbFAIDiVaXPHjc2Alw2mwbrgSoQULxavMkUMTC JnuUHQ83SVyRV1m2L0w041npkRpErBBYuiPlip3vq5xULXCYnGtDJz4qOdphMyO7uC qIrs00w8jrsHw== X-Pm-Submission-Id: 4WLCjW5TlLz4wwdm From: Marcus B Spencer To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Jul 2024 08:51:42 -0500 Message-ID: <20240712135314.9390-1-marcus@marcusspencer.xyz> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v21] avformat: add farbfeld muxer and demuxer 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 Cc: Marcus B Spencer Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fDuXSxQSXJvx farbfeld is an uncompressed image format that is a part of suckless tools (https://tools.suckless.org). Its documentation is available at https://tools.suckless.org/farbfeld. Add support for this image format in avformat. Signed-off-by: Marcus B Spencer --- Remove unnecessary loop variable from FarbfeldDemuxContext. Changelog | 1 + doc/general_contents.texi | 4 + libavformat/Makefile | 2 + libavformat/allformats.c | 4 +- libavformat/farbfelddec.c | 133 +++++++++++++++++++++++++++++++++ libavformat/farbfeldenc.c | 151 ++++++++++++++++++++++++++++++++++++++ libavformat/version.h | 4 +- 7 files changed, 296 insertions(+), 3 deletions(-) create mode 100644 libavformat/farbfelddec.c create mode 100644 libavformat/farbfeldenc.c diff --git a/Changelog b/Changelog index 3708e35a2a..10f2b1e239 100644 --- a/Changelog +++ b/Changelog @@ -17,6 +17,7 @@ version : - perlin video source - D3D12VA HEVC encoder - Cropping metadata parsing and writing in Matroska and MP4/MOV de/muxers +- farbfeld muxer and demuxer version 7.0: - DXV DXT1 encoder diff --git a/doc/general_contents.texi b/doc/general_contents.texi index e7cf4f8239..bbc49d3665 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -489,6 +489,8 @@ library: @item Electronic Arts Multimedia @tab @tab X @tab Used in various EA games; files have extensions like WVE and UV2. @item Ensoniq Paris Audio File @tab @tab X +@item FF @tab X @tab X + @tab farbfeld uncompressed image @item FFM (FFserver live feed) @tab X @tab X @item Flash (SWF) @tab X @tab X @item Flash 9 (AVM2) @tab X @tab X @@ -786,6 +788,8 @@ following image formats are supported: @tab Digital Picture Exchange @item EXR @tab @tab X @tab OpenEXR +@item FF @tab X @tab X + @tab farbfeld uncompressed image @item FITS @tab X @tab X @tab Flexible Image Transport System @item HDR @tab X @tab X diff --git a/libavformat/Makefile b/libavformat/Makefile index 7ca68a7036..e2bf420916 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -284,6 +284,8 @@ OBJS-$(CONFIG_IMAGE_CRI_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_DDS_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_DPX_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_EXR_PIPE_DEMUXER) += img2dec.o img2.o +OBJS-$(CONFIG_IMAGE_FARBFELD_PIPE_DEMUXER)+= farbfelddec.o +OBJS-$(CONFIG_IMAGE_FARBFELD_MUXER) += farbfeldenc.o OBJS-$(CONFIG_IMAGE_GEM_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_GIF_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_HDR_PIPE_DEMUXER) += img2dec.o img2.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 305fa46532..01a9ef92e5 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -531,12 +531,14 @@ extern const FFInputFormat ff_xwma_demuxer; extern const FFInputFormat ff_yop_demuxer; extern const FFInputFormat ff_yuv4mpegpipe_demuxer; extern const FFOutputFormat ff_yuv4mpegpipe_muxer; -/* image demuxers */ +/* image (de)muxers */ extern const FFInputFormat ff_image_bmp_pipe_demuxer; extern const FFInputFormat ff_image_cri_pipe_demuxer; extern const FFInputFormat ff_image_dds_pipe_demuxer; extern const FFInputFormat ff_image_dpx_pipe_demuxer; extern const FFInputFormat ff_image_exr_pipe_demuxer; +extern const FFInputFormat ff_image_farbfeld_pipe_demuxer; +extern const FFOutputFormat ff_image_farbfeld_muxer; extern const FFInputFormat ff_image_gem_pipe_demuxer; extern const FFInputFormat ff_image_gif_pipe_demuxer; extern const FFInputFormat ff_image_hdr_pipe_demuxer; diff --git a/libavformat/farbfelddec.c b/libavformat/farbfelddec.c new file mode 100644 index 0000000000..41361e771b --- /dev/null +++ b/libavformat/farbfelddec.c @@ -0,0 +1,133 @@ +/* + * Image format + * YUV4MPEG demuxer + * + * Modified by Marcus B Spencer to suit the farbfeld_pipe demuxer on 12 July 2024 + * + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard + * Copyright (c) 2001, 2002, 2003 Fabrice Bellard + * Copyright (c) 2004 Michael Niedermayer + * Copyright (c) 2024 Marcus B Spencer + * + * 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 "avformat.h" +#include "avio.h" +#include "demux.h" +#include "internal.h" +#include "libavutil/imgutils.h" +#include "libavutil/opt.h" + +#define FARBFELD_MAGIC_LEN 8 +#define FARBFELD_HEADER_LEN (8 + 4 + 4) + +typedef struct FarbfeldDemuxContext { + const AVClass *class; + AVRational framerate; +} FarbfeldDemuxContext; + +static int farbfeld_read_header(AVFormatContext *ctx) +{ + FarbfeldDemuxContext *priv = ctx->priv_data; + char magic[FARBFELD_MAGIC_LEN]; + int width, height; + AVStream *st; + int ret; + + if ((ret = avio_read(ctx->pb, magic, FARBFELD_MAGIC_LEN)) < 0) + return ret; + + if (memcmp(magic, "farbfeld", FARBFELD_MAGIC_LEN)) + return AVERROR_INVALIDDATA; + + if (!(st = avformat_new_stream(ctx, NULL))) + return AVERROR(ENOMEM); + + st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; + st->codecpar->format = AV_PIX_FMT_RGBA64BE; + st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO; + + width = avio_rb32(ctx->pb); + height = avio_rb32(ctx->pb); + + st->codecpar->width = width; + st->codecpar->height = height; + st->codecpar->framerate = + st->avg_frame_rate = + st->r_frame_rate = priv->framerate; + + ctx->packet_size = av_image_get_buffer_size(st->codecpar->format, width, height, 1) + FARBFELD_HEADER_LEN; + if ((int)ctx->packet_size < 0) + return ctx->packet_size; + + // reset position for inital packet + if ((ret = avio_seek(ctx->pb, 0, SEEK_SET)) < 0) + return ret; + + return 0; +} + +static int farbfeld_read_packet(AVFormatContext *ctx, AVPacket *pkt) +{ + char magic[FARBFELD_MAGIC_LEN]; + int ret; + + if ((ret = avio_read(ctx->pb, magic, FARBFELD_MAGIC_LEN)) < 0) + return ret; + + if (memcmp(magic, "farbfeld", FARBFELD_MAGIC_LEN)) + return AVERROR_INVALIDDATA; + + // width and height are assumed to be constant + avio_skip(ctx->pb, 8); + + if ((ret = av_get_packet(ctx->pb, pkt, + ctx->packet_size - + FARBFELD_HEADER_LEN)) < 0) + return ret; + + pkt->stream_index = 0; + + return 0; +} + +#define OFFSET(x) offsetof(FarbfeldDemuxContext, x) +#define DEC AV_OPT_FLAG_DECODING_PARAM + +static const AVOption demuxoptions[] = { + { "framerate", "set the video framerate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, DEC }, + { NULL }, +}; + +static const AVClass farbfeld_demux_class = { + .class_name = "FarbfeldDemuxContext", + .item_name = av_default_item_name, + .option = demuxoptions, + .version = LIBAVUTIL_VERSION_INT, +}; + +const FFInputFormat ff_image_farbfeld_pipe_demuxer = { + .p.name = "farbfeld_pipe", + .p.long_name = NULL_IF_CONFIG_SMALL("piped farbfeld uncompressed image sequence"), + .p.extensions = "ff", + .p.flags = AVFMT_NOTIMESTAMPS, + .p.priv_class = &farbfeld_demux_class, + .priv_data_size = sizeof(FarbfeldDemuxContext), + .read_header = farbfeld_read_header, + .read_packet = farbfeld_read_packet, +}; diff --git a/libavformat/farbfeldenc.c b/libavformat/farbfeldenc.c new file mode 100644 index 0000000000..80baefb934 --- /dev/null +++ b/libavformat/farbfeldenc.c @@ -0,0 +1,151 @@ +/* + * misc image utilities + * YUV4MPEG muxer + * Image format + * + * Modified by Marcus B Spencer to suit the farbfeld muxer on 12 July 2024 + * + * Copyright (c) 2001, 2002, 2003 Fabrice Bellard + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard + * Copyright (c) 2004 Michael Niedermayer + * Copyright (c) 2024 Marcus B Spencer + * + * 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 "avformat.h" +#include "internal.h" +#include "libavutil/avstring.h" +#include "libavutil/frame.h" +#include "libavutil/opt.h" +#include "mux.h" + +typedef struct FarbfeldMuxContext { + const AVClass *class; + int start_number, img_number; + int update; +} FarbfeldMuxContext; + +static int farbfeld_init(AVFormatContext *ctx) +{ + FarbfeldMuxContext *priv = ctx->priv_data; + + if (ctx->streams[0]->codecpar->codec_id != AV_CODEC_ID_WRAPPED_AVFRAME && + ctx->streams[0]->codecpar->codec_id != AV_CODEC_ID_RAWVIDEO) { + av_log(ctx, AV_LOG_ERROR, "Codec not supported.\n"); + return AVERROR_INVALIDDATA; + } + + if (ctx->streams[0]->codecpar->format != AV_PIX_FMT_RGBA64BE) { + av_log(ctx, AV_LOG_ERROR, + "farbfeld only supports the rgba64be pixel format. " + "Add '-pix_fmt rgba64be' to your output options to resolve " + "this error.\n" + ); + return AVERROR_INVALIDDATA; + } + + priv->img_number = priv->start_number; + + return 0; +} + +static int farbfeld_write_packet(AVFormatContext *ctx, AVPacket *pkt) +{ + AVStream *st = ctx->streams[pkt->stream_index]; + int width = st->codecpar->width, height = st->codecpar->height; + FarbfeldMuxContext *priv = ctx->priv_data; + char filename[1024]; + const uint8_t *src; + const AVFrame *p; + AVIOContext *pb; + int ret; + + if (priv->update) + av_strlcpy(filename, ctx->url, sizeof filename); + else if (av_get_frame_filename2(filename, sizeof filename, ctx->url, + priv->img_number, AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) { + if (priv->img_number == priv->start_number) { + av_log(ctx, AV_LOG_WARNING, "The specified filename '%s' does not contain an image sequence pattern or a pattern is invalid.\n", ctx->url); + av_log(ctx, AV_LOG_WARNING, + "Use a pattern such as %%03d for an image sequence or " + "use the -update option (with -frames:v 1 if needed) to write a single image.\n"); + av_strlcpy(filename, ctx->url, sizeof filename); + } else { + av_log(ctx, AV_LOG_ERROR, "Cannot write more than one file with the same name.\n"); + return AVERROR(EINVAL); + } + } + + if ((ret = ctx->io_open(ctx, &pb, filename, AVIO_FLAG_WRITE, NULL)) < 0) { + av_log(ctx, AV_LOG_ERROR, "Could not open file : %s\n", filename); + return ret; + } + + avio_write(pb, "farbfeld", 8); + + avio_wb32(pb, width); + avio_wb32(pb, height); + + if (st->codecpar->codec_id == AV_CODEC_ID_RAWVIDEO) + avio_write(pb, pkt->data, pkt->size); + else { + p = (const AVFrame *)pkt->data; + src = p->data[0]; + + for (int i = 0; i < height; i++) { + avio_write(pb, src, width * 8); // 8 bytes per pixel + src += p->linesize[0]; + } + } + + priv->img_number++; + + avio_flush(pb); + + return ff_format_io_close(ctx, &pb); +} + +#define OFFSET(x) offsetof(FarbfeldMuxContext, x) +#define ENC AV_OPT_FLAG_ENCODING_PARAM +static const AVOption muxoptions[] = { + { "update", "continuously overwrite one file", OFFSET(update), AV_OPT_TYPE_BOOL,{ .i64 = 0 }, 0, 1, ENC }, + { "start_number", "set first number in the sequence", OFFSET(start_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, INT_MAX, ENC }, + { NULL }, +}; + +static const AVClass farbfeld_mux_class = { + .class_name = "FarbfeldMuxContext", + .item_name = av_default_item_name, + .option = muxoptions, + .version = LIBAVUTIL_VERSION_INT, +}; + +const FFOutputFormat ff_image_farbfeld_muxer = { + .p.name = "farbfeld", + .p.long_name = NULL_IF_CONFIG_SMALL("farbfeld uncompressed image"), + .p.extensions = "ff", + .p.audio_codec = AV_CODEC_ID_NONE, + .p.video_codec = AV_CODEC_ID_WRAPPED_AVFRAME, + .p.subtitle_codec = AV_CODEC_ID_NONE, + .p.flags = AVFMT_NOTIMESTAMPS | AVFMT_NOFILE, + .p.priv_class = &farbfeld_mux_class, + .priv_data_size = sizeof(FarbfeldMuxContext), + .init = farbfeld_init, + .write_packet = farbfeld_write_packet, + .flags_internal = FF_OFMT_FLAG_MAX_ONE_OF_EACH, +}; diff --git a/libavformat/version.h b/libavformat/version.h index 384cbd49cc..4bde82abb4 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,8 +31,8 @@ #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 5 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MINOR 6 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \