From patchwork Tue Jun 4 22:28:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marcus B Spencer X-Patchwork-Id: 49564 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp8408vqb; Tue, 4 Jun 2024 15:28:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXr53GyJdu9mnQ+VsrRJJ/av2KyJ6eZ9Fwtuoshz93Wj1y8vAtlxGCCxR+RCMmUujZGDEV/qQ8s/XciS8vL24imSd9NVzzPxwRKlQ== X-Google-Smtp-Source: AGHT+IFVMlGS7gu3ScO78h122TP/e4AkZ0obNg7G6XqWTY3KuDsFV9XTKGvBYI+Tcp9VHR4IoCCZ X-Received: by 2002:a50:d497:0:b0:578:6198:d6ff with SMTP id 4fb4d7f45d1cf-57a8bca263cmr483765a12.33.1717540129927; Tue, 04 Jun 2024 15:28:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717540129; cv=none; d=google.com; s=arc-20160816; b=KqgfeagBrtsamZNrwjDjIktdFxsEu5ksm8h9E7/W+zxtKfss/3IS0HK6B4Hg/lC8dp 0J47gy656uG8UneFSri1aHDDmiox16XDqnaH2A7m30SD+oooLt6qE90pSfj3Rd9epjSC xiwxCAw3RtFhGRPNQJLPpMZm4tdagzSkEannhpaHilZOl7BMZozIyLcATrtP20CORgnT QVzI9M42SrqL4UpCmkX/KpoeGpDbeJQUUvwCA0wU6blgRoFVjd7zk8Gui/RsaYnq2y3N GDDmRitbreuUqu6hUjYOIsHGIG5PZeSlAAgY+qd1zd5SwEJr8CgqbuoClXvCZyKVOs7q RgwQ== 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 :delivered-to; bh=3FA4qORu43OJSrra8SN8khsJ6/fLdigxsQ8kp9ZufqE=; fh=JuegC/vje050XLj6U2KtH3S0d9hYf9AYxo0tX+p7f28=; b=Bjl8Ynny0NLT1RUkYGc+6D3mgnYmIS3RQff0uEqu6ZZ0szOUM61FkbgPzioGa+s0br 3foUYqnOLRu8gV1lszUVeKu6CXPPL95HcZoeaQ4rQaJgTAgAeQFYi9GH6/+SEom7FnpA TG5m4XMd7yOOZ2i/9duCrP/1txydFxCdwm0wPXYQA8FiVx/vIwT/NsheaJaYgNASoJzz 8LCj7YUohkqS3a4FJsSKbF4aC6VKfRQPSIp7eW5t9ftmuTZxmbtI2wLLliN9IG6i/+6t soRX/JKL5eF65lrqMtbxzj7Da0uJiD6LezC6zvjzJgLF5x3NLTD/IE1ZugCCk6L5hSg5 3SOQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 4fb4d7f45d1cf-57a31b802dasi5555490a12.52.2024.06.04.15.28.49; Tue, 04 Jun 2024 15:28:49 -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; 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 7C89068D6DB; Wed, 5 Jun 2024 01:28:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp1.dnsmadeeasy.com (smtp1.dnsmadeeasy.com [208.94.147.128]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5109F68D6E0 for ; Wed, 5 Jun 2024 01:28:39 +0300 (EEST) Received: from smtp1.dnsmadeeasy.com (localhost [127.0.0.1]) by smtp1.dnsmadeeasy.com (Postfix) with ESMTP id E8F032F8014C; Tue, 4 Jun 2024 22:28:37 +0000 (UTC) X-Authenticated-Name: nate@nmssoftware.com Received: from stor01 (unknown [129.224.199.189]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp1.dnsmadeeasy.com (Postfix) with ESMTPSA; Tue, 4 Jun 2024 22:28:37 +0000 (UTC) Received: from marcus.forced.laptop (unknown [192.168.26.125]) by stor01 (Postfix) with ESMTP id 201BB1EB824; Tue, 4 Jun 2024 17:28:37 -0500 (CDT) From: Marcus B Spencer To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jun 2024 17:28:35 -0500 Message-ID: <20240604222835.166462-1-marcus@marcusspencer.xyz> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6] avcodec: add farbfeld encoder 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: C8SWfyu2y9e5 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 avcodec and update the image2 format accordingly. Signed-off-by: Marcus B Spencer --- Changelog | 1 + doc/general_contents.texi | 2 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/codec_desc.c | 7 ++++ libavcodec/codec_id.h | 1 + libavcodec/farbfeldenc.c | 84 +++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- libavformat/img2.c | 1 + libavformat/img2enc.c | 2 +- 10 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 libavcodec/farbfeldenc.c diff --git a/Changelog b/Changelog index 03d6b29ad8..d2b831c623 100644 --- a/Changelog +++ b/Changelog @@ -12,6 +12,7 @@ version : - qsv_params option added for QSV encoders - VVC decoder compatible with DVB test content - xHE-AAC decoder +- farbfeld encoder version 7.0: diff --git a/doc/general_contents.texi b/doc/general_contents.texi index e7cf4f8239..129a325ecf 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -853,6 +853,8 @@ following image formats are supported: @tab X PixMap image format @item XWD @tab X @tab X @tab X Window Dump image format +@item FF @tab X @tab + @tab farbfeld uncompressed image format @end multitable @code{X} means that the feature in that column (encoding / decoding) is supported. diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 8ab4398b6c..9647279423 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -356,6 +356,7 @@ OBJS-$(CONFIG_ESCAPE130_DECODER) += escape130.o OBJS-$(CONFIG_EVRC_DECODER) += evrcdec.o acelp_vectors.o lsp.o OBJS-$(CONFIG_EXR_DECODER) += exr.o exrdsp.o half2float.o OBJS-$(CONFIG_EXR_ENCODER) += exrenc.o float2half.o +OBJS-$(CONFIG_FARBFELD_ENCODER) += farbfeldenc.o OBJS-$(CONFIG_FASTAUDIO_DECODER) += fastaudio.o OBJS-$(CONFIG_FFV1_DECODER) += ffv1dec.o ffv1.o OBJS-$(CONFIG_FFV1_ENCODER) += ffv1enc.o ffv1.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index b102a8069e..b0ebb72396 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -115,6 +115,7 @@ extern const FFCodec ff_escape124_decoder; extern const FFCodec ff_escape130_decoder; extern const FFCodec ff_exr_encoder; extern const FFCodec ff_exr_decoder; +extern const FFCodec ff_farbfeld_encoder; extern const FFCodec ff_ffv1_encoder; extern const FFCodec ff_ffv1_decoder; extern const FFCodec ff_ffvhuff_encoder; diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index a28ef68061..33dbd2ce94 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1959,6 +1959,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("LEAD MCMP"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_FARBFELD, + .type = AVMEDIA_TYPE_VIDEO, + .name = "farbfeld", + .long_name = NULL_IF_CONFIG_SMALL("farbfeld uncompressed image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, /* various PCM "codecs" */ { diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 0ab1e34a61..d4b0d23f7e 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -322,6 +322,7 @@ enum AVCodecID { AV_CODEC_ID_RTV1, AV_CODEC_ID_VMIX, AV_CODEC_ID_LEAD, + AV_CODEC_ID_FARBFELD, /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/farbfeldenc.c b/libavcodec/farbfeldenc.c new file mode 100644 index 0000000000..686ba5665e --- /dev/null +++ b/libavcodec/farbfeldenc.c @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2024 Marcus B Spencer + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the “Software”), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include "avcodec.h" +#include "bytestream.h" +#include "codec_internal.h" +#include "encode.h" +#include "libavutil/imgutils.h" + +#define HEADER_SIZE 16 + +static int farbfeld_encode_frame(AVCodecContext *ctx, AVPacket *pkt, + const AVFrame *p, int *got_packet) +{ + int raw_img_size = av_image_get_buffer_size( + p->format, + p->width, + p->height, + 1 + ); + int64_t buf_size = (int64_t)raw_img_size + HEADER_SIZE; + uint8_t *buf; + int ret; + + if (raw_img_size < 0) + return raw_img_size; + + if ((ret = ff_get_encode_buffer(ctx, pkt, buf_size, 0)) < 0) + return ret; + + buf = pkt->data; + + bytestream_put_buffer(&buf, "farbfeld", 8); + + bytestream_put_be32(&buf, ctx->width); + bytestream_put_be32(&buf, ctx->height); + + av_image_copy_to_buffer( + buf, + raw_img_size, + (const uint8_t *const *)p->data, + p->linesize, + p->format, + p->width, + p->height, + 1 + ); + + *got_packet = 1; + + return 0; +} + +const FFCodec ff_farbfeld_encoder = { + .p.name = "farbfeld", + CODEC_LONG_NAME("farbfeld uncompressed image"), + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_FARBFELD, + .p.capabilities = AV_CODEC_CAP_DR1, + FF_CODEC_ENCODE_CB(farbfeld_encode_frame), + .p.pix_fmts = (const enum AVPixelFormat[]){ + AV_PIX_FMT_RGBA64BE, + AV_PIX_FMT_NONE + }, +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index da54f87887..7acb261bb3 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 6 +#define LIBAVCODEC_VERSION_MINOR 7 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavformat/img2.c b/libavformat/img2.c index 9981867f82..77edc7ff9b 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -95,6 +95,7 @@ TAG(QOI, qoi ) \ TAG(RADIANCE_HDR, hdr ) \ TAG(WBMP, wbmp ) \ + TAG(FARBFELD, ff ) \ TAG(NONE, ) #define LENGTH_CHECK(CODECID, STR) \ diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 526a11e5ee..13355a6fad 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -276,7 +276,7 @@ const FFOutputFormat ff_image2_muxer = { .p.long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), .p.extensions = "bmp,dpx,exr,jls,jpeg,jpg,jxl,ljpg,pam,pbm,pcx,pfm,pgm,pgmyuv,phm," "png,ppm,sgi,tga,tif,tiff,jp2,j2c,j2k,xwd,sun,ras,rs,im1,im8," - "im24,sunras,vbn,xbm,xface,pix,y,avif,qoi,hdr,wbmp", + "im24,sunras,vbn,xbm,xface,pix,y,avif,qoi,hdr,wbmp,ff", .priv_data_size = sizeof(VideoMuxData), .p.video_codec = AV_CODEC_ID_MJPEG, .write_header = write_header,