From patchwork Mon Sep 23 03:38:22 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: 51715 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2220126vqb; Sun, 22 Sep 2024 20:39:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX2lKXhqTTueQASQDAqvN2+mZyRhOAe/IsaH3Kkf/iE9AdkzaH9aJvyXynPTzyE5lSo0JlIB8GgGreQqxbyF216@gmail.com X-Google-Smtp-Source: AGHT+IE7k+PSkIpdzfjJ4OMT6UC7KLNFFYPdfR/TmUAgs0bN1mnifUDWAtbD91ng+Bv/dFk6fLlt X-Received: by 2002:a17:906:fe02:b0:a86:ac91:a571 with SMTP id a640c23a62f3a-a90d599afe2mr1128668266b.56.1727062799404; Sun, 22 Sep 2024 20:39:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727062799; cv=none; d=google.com; s=arc-20240605; b=PkLxIiVZMmBec5C84W9pHtH3L4E+ZsbILxZOwH90j8POvgkzO6FmaBC8Iz9XZ5Gko+ agnyo5m9cVujbWrCt4iDhvhtQUPMawgk2i26etfg2bgsDQduHpUWCwHPkdHsGb4oy3/b 7m+QMlPsBWByFESLYh+JlAk0c6ay/qK6OkHEX1BOXCtOJ8AHwHRzgUgaS3YsJa02elUv NkE8riyDbpa3ZgN1/K7pO+K0/7xySGsliolJAw7ds1xS/NOiP0zQa0qruusaoSkED8pf l1l9IDl8IKAJXRakpSWS9ZEkTbF+Ugy7phEHrkElS7WD7osQr9Zt+j4xGkETVek58VYp M5GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=nuLYkeLxQUwBNvB9e+zxnXJvXKzD3dVgp9OK+Wc5/Hg=; fh=JuegC/vje050XLj6U2KtH3S0d9hYf9AYxo0tX+p7f28=; b=Wlm9+Nzt4yGyPyAI2X5ctw6nCqYxMqWhoy4HiXk8hidf2rhFtp3eLo/l8AVvJLiVIM ZlPpMVEo8BaLv3Fdp1akXOtctwleJEVBXFuw9DArD4i5jYP09tS+zIyfhni28A29IYZg qpER2FwiCbXo63rtlnIrG4XVPUdQGcD9EDl8QC8YQQJ/gGRqhYFzu+KbPcZhcm6wGLi5 EFjolUuqOQ0KzOjW6weWf5NR24TswhRLP5/pl7wB8WBTR3LfOYREJz/Ofjd9KrEpQp4e nhUZ/BaouVT3sc4gwqk+8mdx9XMPKUJ8IrnUF4+CEUJ9Igzoi8tbh/qQ7sI59WLeuJ6S Wxgw==; 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="oqLBkMe/"; 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-a906109a894si1301758866b.90.2024.09.22.20.39.58; Sun, 22 Sep 2024 20:39:59 -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="oqLBkMe/"; 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 5DDAE68D9AA; Mon, 23 Sep 2024 06:39:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40112.protonmail.ch (mail-40112.protonmail.ch [185.70.40.112]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AEEB368D88D for ; Mon, 23 Sep 2024 06:39:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marcusspencer.xyz; s=protonmail; t=1727062787; x=1727321987; bh=Nihcsir5Yj62aeUHb1oOibRpCjM8hVeWjpHWyFF1Siw=; h=From:To:Cc:Subject:Date:Message-ID:From:To:Cc:Date:Subject: Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=oqLBkMe/Yo8X0lcvScN0G4VFttJZFB8U+zFE8JnDzQZhovShuyKye2SeiJ3JBE2kN UUOfyTgXACnyVaknlhB0Be86Ud+bC7f+whqLJF22fKJCntE+rJKgcdw4Lx8JStMjKG B3L3qG1cqmUMmeYXaob6KFckblOQdHjOSnelbhGS2ftws3bsUcaXyNVV6qjPtdY0Fp OJ15Wll7g+2IhDOdbh1qkmFLY/MkbdtbNVSunbmfEL+osK0AjT0YnS9LuRgXHwVi3G 2kuGn5vlKyYCkKC3TWTO0bArnpo8ExBMdr8Z8SOsPXWw0t1tNGYrFgKQvEagbPoEVl Dfuhmy8ixVNzg== X-Pm-Submission-Id: 4XBpds5ztxz3Q From: Marcus B Spencer To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Sep 2024 22:38:22 -0500 Message-ID: <20240923033930.335418-2-marcus@marcusspencer.xyz> X-Mailer: git-send-email 2.46.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 1/2] avformat/img2enc: seperate getting frame filename 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: jEzxvU3h7BNm Seperate the action of getting the frame filename in write_packet into the function ff_img_get_frame_filename. This for img2-like muxers that need this functionality. Signed-off-by: Marcus B Spencer --- Identical to v1. libavformat/img2.h | 5 +++++ libavformat/img2enc.c | 41 +++++++++++++++++++++++++++-------------- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/libavformat/img2.h b/libavformat/img2.h index e98902c96f..292b90bdbf 100644 --- a/libavformat/img2.h +++ b/libavformat/img2.h @@ -76,4 +76,9 @@ extern const AVOption ff_img_options[]; int ff_img_read_header(AVFormatContext *s1); int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt); + +int ff_img_get_frame_filename(AVFormatContext *s, char *filename, + size_t filename_len, int start_img_number, + int img_number); + #endif diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 526a11e5ee..ec2941e293 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -137,6 +137,28 @@ static int write_and_close(AVFormatContext *s, AVIOContext **pb, const unsigned return ff_format_io_close(s, pb); } +int ff_img_get_frame_filename(AVFormatContext *s, char *filename, + size_t filename_len, int start_img_number, + int img_number) +{ + if (av_get_frame_filename2(filename, filename_len, s->url, + img_number, + AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) { + if (img_number == start_img_number) { + av_log(s, AV_LOG_WARNING, "The specified filename '%s' does not contain an image sequence pattern or a pattern is invalid.\n", s->url); + av_log(s, 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, s->url, filename_len); + } else { + av_log(s, AV_LOG_ERROR, "Cannot write more than one file with the same name. Are you missing the -update option or a sequence pattern?\n"); + return AVERROR(EINVAL); + } + } + + return 0; +} + static int write_packet(AVFormatContext *s, AVPacket *pkt) { VideoMuxData *img = s->priv_data; @@ -164,20 +186,11 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) av_log(s, AV_LOG_ERROR, "Cannot write filename by pts of the frames."); return AVERROR(EINVAL); } - } else if (av_get_frame_filename2(filename, sizeof(filename), s->url, - img->img_number, - AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) { - if (img->img_number == img->start_img_number) { - av_log(s, AV_LOG_WARNING, "The specified filename '%s' does not contain an image sequence pattern or a pattern is invalid.\n", s->url); - av_log(s, 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, s->url, sizeof(filename)); - } else { - av_log(s, AV_LOG_ERROR, "Cannot write more than one file with the same name. Are you missing the -update option or a sequence pattern?\n"); - return AVERROR(EINVAL); - } - } + } else if ((ret = ff_img_get_frame_filename(s, filename, sizeof(filename), + img->start_img_number, + img->img_number)) < 0) + return ret; + for (i = 0; i < 4; i++) { av_dict_copy(&options, img->protocol_opts, 0); snprintf(img->tmp[i], sizeof(img->tmp[i]), "%s.tmp", filename); From patchwork Mon Sep 23 03:38:24 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: 51716 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2223870vqb; Sun, 22 Sep 2024 20:59:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUfuKqtCd4xPp6UUZA/WE0otNGihC2kbjzWaCpW0v/Fba6IGqNWUzm/EnOWaJ8eRlIyhnsLVKqz0J9k997qLc78@gmail.com X-Google-Smtp-Source: AGHT+IEij4WllDK/WFPd2hPoCZIb9hjYGYShh1yh91e13/ZzCqORV6JE4VfRYFw5XRAedEpJqeJR X-Received: by 2002:a05:6402:42d3:b0:5c5:c443:c22c with SMTP id 4fb4d7f45d1cf-5c5c443c2bbmr599128a12.15.1727063956515; Sun, 22 Sep 2024 20:59:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727063956; cv=none; d=google.com; s=arc-20240605; b=E1NJCGjXvGJFbmclQjQQEvoH7vtwHj20SFvJpoV2X6j3TUwGZSi84IHkZgQrjDUD4r 0GvGx1GRF6iVMxCnRCGAHJv5JCv6NUqzxrBLOgwXAWcB56xLgzbATIFMVUn886Q4z31q 1IIdYMPUv1KjoW6wyvFZvabKYPVrLmLWrk8aUeO0UlFs1fGPuX2+16KYxVFJ7itx0qx2 1cl6KO+jAahyZXHmIADuduWim45zgb2HlheAcmdmK/evoKJxFV8gUusSiV08/c9mztBQ s3Pxj68rpUyT/fYObZSB2NJDXo/74gKF/pB2yZbKzegF1AITpwEzVzoCUny8CO1nFTHx CeTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=C3YmMohBi5/r2JQRA10NUByNK3sPE8rAyzR5L1Ft5XI=; fh=JuegC/vje050XLj6U2KtH3S0d9hYf9AYxo0tX+p7f28=; b=kjVEkCDmD7BNVJtyWOw5glaYzNJukneUOsbn2RpxEdkSncc139LR3E66uZe8+NW0DQ ViEQB8+d5iBkZv7xIEk5KeOa/iVL1iugr7m4qDcCfCq6lJZlWQlzE1vgLZ9Kr0uV0tsS 2xsyaoJW7MPNFOljZ6EnimUbMvVOWAZmjzMSXoGKHUxhgD2OLL+3uXapzZJyupxoOSqC e4kB2YyAvKGqf+GmR7VtQB1Z3ISQxdVcbfcR7MvxTnOuw8CrKbdP706mr90TKJ3rvvAH jFzoE5RM2ZWqCIxjWno3zZKLsLfZiREC4z/hLw5OePibZpk0pZYmNCZ1+dgcM3VUKCCw +G4g==; 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=e3ptSUti; 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-5c42bb5ad96si12886730a12.144.2024.09.22.20.59.16; Sun, 22 Sep 2024 20:59:16 -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=e3ptSUti; 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 9193C68D89B; Mon, 23 Sep 2024 06:40:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-43170.protonmail.ch (mail-43170.protonmail.ch [185.70.43.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94A4468D89B for ; Mon, 23 Sep 2024 06:40:20 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marcusspencer.xyz; s=protonmail; t=1727062819; x=1727322019; bh=HMt5xWJbPBqHNyS6vCcq5KImuqe8PJq6Ax4heDVqWss=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=e3ptSUtiL7J3tQ7SDWL9KaOPzBtFcbUAbioYRyWXlQP6fq9pn87j3WZO9bIvy+u+7 NbT329N1b1iqs40uo+Ok4wR9THWEOvqTpTsJUiBZnuQanCjJmk8swcbWAWaypJChJf 3aWMkBaJrbFm+FqwD+yG+wGJO16QE3qq8xnyp27uDJ6oqsg/BimaarQNyc2BrKLdq+ WPZBJhD9ZMCHg2cDfRpvIz+k24i5YcXxxC+czsLCloHSrNqvKANk/oZ4azAHubVIYw dm/VQBfAfBIhGDQJBECbb3nK3HaLNWmnhKRbYVGYaLKR1u34IpBRjM5e4tGG9LqZOe 5a4WRsAwOBDZg== X-Pm-Submission-Id: 4XBpfV0j4tz3Q From: Marcus B Spencer To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Sep 2024 22:38:24 -0500 Message-ID: <20240923033930.335418-4-marcus@marcusspencer.xyz> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240923033930.335418-2-marcus@marcusspencer.xyz> References: <20240923033930.335418-2-marcus@marcusspencer.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 2/2] 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: KkBa+G80F0Fw 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 --- v2: Automatically generate testing sample for the demuxer using the muxer. v3: Rebase Changelog to current git master. v4: Rebase Changelog to current git master again. v5: Rebase Changelog to current git master once again. v6: Rebase libavformat/version.h to current git master. Changelog | 1 + configure | 1 + doc/general_contents.texi | 4 + libavformat/Makefile | 2 + libavformat/allformats.c | 4 +- libavformat/farbfelddec.c | 136 +++++++++++++++++++++++++++++++++ libavformat/farbfeldenc.c | 143 +++++++++++++++++++++++++++++++++++ libavformat/version.h | 2 +- tests/Makefile | 1 + tests/fate/farbfeld.mak | 14 ++++ tests/ref/fate/farbfeld-lena | 6 ++ 11 files changed, 312 insertions(+), 2 deletions(-) create mode 100644 libavformat/farbfelddec.c create mode 100644 libavformat/farbfeldenc.c create mode 100644 tests/fate/farbfeld.mak create mode 100644 tests/ref/fate/farbfeld-lena diff --git a/Changelog b/Changelog index 49a16da7ca..ea75ba139b 100644 --- a/Changelog +++ b/Changelog @@ -26,6 +26,7 @@ version : - stream specifiers in fftools can now match by stream disposition - LCEVC enhancement data exporting in H.26x and MP4/ISOBMFF - LCEVC filter +- farbfeld muxer and demuxer version 7.0: diff --git a/configure b/configure index d568739bf9..67b799d5d8 100755 --- a/configure +++ b/configure @@ -3644,6 +3644,7 @@ iamf_demuxer_select="iamfdec" iamf_muxer_select="iamfenc" image2_alias_pix_demuxer_select="image2_demuxer" image2_brender_pix_demuxer_select="image2_demuxer" +image_farbfeld_muxer_select="image2_muxer" imf_demuxer_deps="libxml2" imf_demuxer_select="mxf_demuxer" ipod_muxer_select="mov_muxer" diff --git a/doc/general_contents.texi b/doc/general_contents.texi index 5f22ccd72b..1f9c48c95b 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -502,6 +502,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 @@ -799,6 +801,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..3dfad8ad91 --- /dev/null +++ b/libavformat/farbfelddec.c @@ -0,0 +1,136 @@ +/* + * Image format + * YUV4MPEG demuxer + * + * Modified by Marcus B Spencer to suit the farbfeld_pipe demuxer on 14 September 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 (FARBFELD_MAGIC_LEN + 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; + int packet_size; + 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; + + packet_size = av_image_get_buffer_size(st->codecpar->format, width, height, 1); + if (packet_size < 0) + return AVERROR_INVALIDDATA; + + ctx->packet_size = FARBFELD_HEADER_LEN + 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..daa1defaf3 --- /dev/null +++ b/libavformat/farbfeldenc.c @@ -0,0 +1,143 @@ +/* + * misc image utilities + * YUV4MPEG muxer + * Image format + * + * Modified by Marcus B Spencer to suit the farbfeld muxer on 14 September 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 "img2.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 ((ret = ff_img_get_frame_filename(ctx, filename, sizeof filename, + priv->start_number, + priv->img_number)) < 0) + return ret; + + 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 4bde82abb4..70c554c19c 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 6 +#define LIBAVFORMAT_VERSION_MINOR 7 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ diff --git a/tests/Makefile b/tests/Makefile index 9b70145015..5cfc117305 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -183,6 +183,7 @@ include $(SRC_PATH)/tests/fate/ffprobe.mak include $(SRC_PATH)/tests/fate/fifo-muxer.mak include $(SRC_PATH)/tests/fate/filter-audio.mak # Must be included after vcodec.mak +include $(SRC_PATH)/tests/fate/farbfeld.mak include $(SRC_PATH)/tests/fate/filter-video.mak include $(SRC_PATH)/tests/fate/fits.mak include $(SRC_PATH)/tests/fate/flac.mak diff --git a/tests/fate/farbfeld.mak b/tests/fate/farbfeld.mak new file mode 100644 index 0000000000..b51503b7b2 --- /dev/null +++ b/tests/fate/farbfeld.mak @@ -0,0 +1,14 @@ +tests/data/farbfeld-lena.ff: TAG = GEN +tests/data/farbfeld-lena.ff: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data + $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ + -i $(TARGET_SAMPLES)/lena.pnm -y -bitexact -pix_fmt rgba64be \ + $(TARGET_PATH)/tests/data/farbfeld-lena.ff 2>/dev/null + +FATE_FARBFELD += fate-farbfeld-lena +fate-farbfeld-lena: tests/data/farbfeld-lena.ff +fate-farbfeld-lena: CMD = framecrc -i $(TARGET_PATH)/tests/data/farbfeld-lena.ff + +FATE_FARBFELD-$(call ALLYES, IMAGE_FARBFELD_PIPE_DEMUXER IMAGE_FARBFELD_MUXER) += $(FATE_FARBFELD) + +FATE_SAMPLES_FFMPEG += $(FATE_FARBFELD-yes) +fate-farbfeld: $(FATE_FARBFELD-yes) diff --git a/tests/ref/fate/farbfeld-lena b/tests/ref/fate/farbfeld-lena new file mode 100644 index 0000000000..75fc52284a --- /dev/null +++ b/tests/ref/fate/farbfeld-lena @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 256x256 +#sar 0: 0/1 +0, 0, 0, 1, 524288, 0x8c061893