From: Niklas Haas <ffmpeg@haasn.xyz> To: ffmpeg-devel@ffmpeg.org Cc: Niklas Haas <git@haasn.dev> Subject: [FFmpeg-devel] [PATCH v2 5/5] lavfi: add vf_iccdetect for parsing ICC profiles Date: Tue, 19 Apr 2022 14:46:57 +0200 Message-ID: <20220419124656.121638-5-ffmpeg@haasn.xyz> (raw) In-Reply-To: <20220419124656.121638-1-ffmpeg@haasn.xyz> From: Niklas Haas <git@haasn.dev> This filter is designed to parse embedded ICC profiles and attempt extracting colorspace tags from them, updating the AVFrame metadata accordingly. This is intentionally made a separate filter, rather than being part of libavcodec itself, so that it's an opt-in behavior for the time being. This also gives the user more flexibility to e.g. first attach an ICC profile and then also set the colorspace tags from it. This makes #9673 possible, though not automatic. Signed-off-by: Niklas Haas <git@haasn.dev> --- configure | 1 + doc/filters.texi | 14 ++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/vf_iccdetect.c | 142 +++++++++++++++++++++++++++++++++++++ 5 files changed, 159 insertions(+) create mode 100644 libavfilter/vf_iccdetect.c diff --git a/configure b/configure index 44f8ff738e..612c894f1b 100755 --- a/configure +++ b/configure @@ -3661,6 +3661,7 @@ gblur_vulkan_filter_deps="vulkan spirv_compiler" hflip_vulkan_filter_deps="vulkan spirv_compiler" histeq_filter_deps="gpl" hqdn3d_filter_deps="gpl" +iccdetect_filter_deps="lcms2" iccgen_filter_deps="lcms2" interlace_filter_deps="gpl" kerndeint_filter_deps="gpl" diff --git a/doc/filters.texi b/doc/filters.texi index f29845890e..85b1586486 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14342,6 +14342,20 @@ By default value is 0. The @code{hysteresis} filter also supports the @ref{framesync} options. +@section iccdetect + +Detect the colorspace from an embedded ICC profile (if present), and update +the frame's tags accordingly. + +This filter accepts the following options: + +@table @option +@item force +If true, the frame's existing colorspace tags will always be overridden by +values detected from an ICC profile. Otherwise, they will only be assigned if +they contain @code{unknown}. Enabled by default. +@end table + @section iccgen Generate ICC profiles and attach them to frames. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 1f2b03fa9c..2c131e6af5 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -321,6 +321,7 @@ OBJS-$(CONFIG_HWMAP_FILTER) += vf_hwmap.o OBJS-$(CONFIG_HWUPLOAD_CUDA_FILTER) += vf_hwupload_cuda.o OBJS-$(CONFIG_HWUPLOAD_FILTER) += vf_hwupload.o OBJS-$(CONFIG_HYSTERESIS_FILTER) += vf_hysteresis.o framesync.o +OBJS-$(CONFIG_ICCDETECT_FILTER) += vf_iccdetect.o fflcms2.o colorspace.o OBJS-$(CONFIG_ICCGEN_FILTER) += vf_iccgen.o fflcms2.o colorspace.o OBJS-$(CONFIG_IDENTITY_FILTER) += vf_identity.o OBJS-$(CONFIG_IDET_FILTER) += vf_idet.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 212615019d..ebe12520b5 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -304,6 +304,7 @@ extern const AVFilter ff_vf_hwmap; extern const AVFilter ff_vf_hwupload; extern const AVFilter ff_vf_hwupload_cuda; extern const AVFilter ff_vf_hysteresis; +extern const AVFilter ff_vf_iccdetect; extern const AVFilter ff_vf_iccgen; extern const AVFilter ff_vf_identity; extern const AVFilter ff_vf_idet; diff --git a/libavfilter/vf_iccdetect.c b/libavfilter/vf_iccdetect.c new file mode 100644 index 0000000000..fb7871f035 --- /dev/null +++ b/libavfilter/vf_iccdetect.c @@ -0,0 +1,142 @@ +/* + * Copyright (c) 2022 Niklas Haas + * 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 + */ + +/** + * @file + * filter for generating ICC profiles + */ + +#include <lcms2.h> + +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" + +#include "avfilter.h" +#include "fflcms2.h" +#include "internal.h" + +typedef struct IccDetectContext { + const AVClass *class; + FFIccContext icc; + int force; + /* (cached) detected ICC profile values */ + AVBufferRef *profile; + enum AVColorPrimaries profile_prim; + enum AVColorTransferCharacteristic profile_trc; +} IccDetectContext; + +#define OFFSET(x) offsetof(IccDetectContext, x) +#define VF AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM + +static const AVOption iccdetect_options[] = { + { "force", "overwrite existing tags", OFFSET(force), AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, VF }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(iccdetect); + +static av_cold void iccdetect_uninit(AVFilterContext *avctx) +{ + IccDetectContext *s = avctx->priv; + av_buffer_unref(&s->profile); + ff_icc_context_uninit(&s->icc); +} + +static av_cold int iccdetect_init(AVFilterContext *avctx) +{ + IccDetectContext *s = avctx->priv; + return ff_icc_context_init(&s->icc, avctx); +} + +static int iccdetect_filter_frame(AVFilterLink *inlink, AVFrame *frame) +{ + AVFilterContext *avctx = inlink->dst; + IccDetectContext *s = avctx->priv; + const AVFrameSideData *sd; + struct ColorPrimaries coeffs; + cmsHPROFILE profile; + int ret; + + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_ICC_PROFILE); + if (!sd) + return ff_filter_frame(inlink->dst->outputs[0], frame); + + if (s->profile && s->profile->data == sd->buf->data) { + /* No change from previous ICC profile */ + goto done; + } + + if ((ret = av_buffer_replace(&s->profile, sd->buf)) < 0) + return ret; + s->profile_prim = AVCOL_PRI_UNSPECIFIED; + s->profile_trc = AVCOL_TRC_UNSPECIFIED; + + profile = cmsOpenProfileFromMemTHR(s->icc.ctx, sd->data, sd->size); + if (!profile) + return AVERROR_INVALIDDATA; + + ret = ff_icc_profile_read_primaries(&s->icc, profile, &coeffs); + if (!ret) + ret = ff_icc_profile_detect_transfer(&s->icc, profile, &s->profile_trc); + cmsCloseProfile(profile); + if (ret < 0) + return ret; + + s->profile_prim = ff_detect_color_primaries(&coeffs); + +done: + if (s->profile_prim != AVCOL_PRI_UNSPECIFIED) { + if (s->force || frame->color_primaries == AVCOL_PRI_UNSPECIFIED) + frame->color_primaries = s->profile_prim; + } + + if (s->profile_trc != AVCOL_TRC_UNSPECIFIED) { + if (s->force || frame->color_trc == AVCOL_TRC_UNSPECIFIED) + frame->color_trc = s->profile_trc; + } + + return ff_filter_frame(inlink->dst->outputs[0], frame); +} + +static const AVFilterPad iccdetect_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = iccdetect_filter_frame, + }, +}; + +static const AVFilterPad iccdetect_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + }, +}; + +const AVFilter ff_vf_iccdetect = { + .name = "iccdetect", + .description = NULL_IF_CONFIG_SMALL("Detect and parse ICC profiles."), + .priv_size = sizeof(IccDetectContext), + .priv_class = &iccdetect_class, + .flags = AVFILTER_FLAG_METADATA_ONLY, + .init = &iccdetect_init, + .uninit = &iccdetect_uninit, + FILTER_INPUTS(iccdetect_inputs), + FILTER_OUTPUTS(iccdetect_outputs), +}; -- 2.35.1 _______________________________________________ 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".
next prev parent reply other threads:[~2022-04-19 12:48 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-19 12:46 [FFmpeg-devel] [PATCH v2 1/5] lavfi: generalize colorspace coefficent helpers Niklas Haas 2022-04-19 12:46 ` [FFmpeg-devel] [PATCH v2 2/5] lavfi: add ff_detect_color_primaries helper Niklas Haas 2022-04-19 12:46 ` [FFmpeg-devel] [PATCH v2 3/5] lavfi: add ICC profile support via lcms2 Niklas Haas 2022-04-19 12:46 ` [FFmpeg-devel] [PATCH v2 4/5] lavfi: add vf_iccgen for generating ICC profiles Niklas Haas 2022-04-19 12:46 ` Niklas Haas [this message] 2022-04-19 12:48 ` [FFmpeg-devel] [PATCH v2 1/5] lavfi: generalize colorspace coefficent helpers Niklas Haas 2022-04-23 19:55 ` Niklas Haas
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220419124656.121638-5-ffmpeg@haasn.xyz \ --to=ffmpeg@haasn.xyz \ --cc=ffmpeg-devel@ffmpeg.org \ --cc=git@haasn.dev \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git