From patchwork Sun Oct 2 07:58:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 38513 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp663042pzh; Sun, 2 Oct 2022 00:59:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5rcsrzT48f0iygiiT8INowZmNWodplVAwaHfCBy31fCzUqahm0uF+ZonduMMnU05qsG0W1 X-Received: by 2002:a17:907:3206:b0:780:a882:a9ac with SMTP id xg6-20020a170907320600b00780a882a9acmr11569577ejb.765.1664697555184; Sun, 02 Oct 2022 00:59:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664697555; cv=none; d=google.com; s=arc-20160816; b=ejjYOPXUgFGeKUQXbbh+bu+gfZEqciXPxWN4i1UEQwCWr7ReROTwh9RB39GE9jOJz5 lXk4dYWrLSQqZ4wJtYcw5/UjQzFOVJ6S9uHNay+0ZFM5g7VbeSBGwVZImMeK1Yz+EB9E 7uln5RI3f3n6YaJR+m4MaQEmWA+NY/yhzP/6ackDvr+dKoXDcBNSMyenvrj2lc5PziUU 2GNf/jpblNt0UqtIH1JPf3pmgTpL4vl1rrzYbN4Bnh2m9TdFG5H2mqUlb9AeRi+VnvxJ 6J6woDPlvTTktlp5Gst1JLYM98kr/LTmkjeVcCwwdIjqBSI/YQ4hcP4xvF/GdIWO926S Xf6Q== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=DCwH0wiKF/El42pRRdboo09wPFbnbEwgqsNVRLNY1rQ=; b=iOXClMF/5m5pNL4J2f5pNFfN3VMlVVFyU/YQc4tHQyGxQst3HTRjww17yux7J+n0LR Bs6xzGNplf5m7sDiq+dQf8laKzk2ypaZaeyWTCbCeREOFH9MkTzqtn+MWm/ZGWy3zl5+ i8dtin83opYjJh6q/IxLEv+U4wFIWO7muuKJwShXZKOT1Halbg5EGgHUWxxQ7l9WYykL TxejPJd5fV4PIkyG0w4uIc6VGe8elBg6YBdxvaZoIi9jhQy1CaWmIYYV4CQRj6rOiiZ8 07RpBE2aTqXrmnzinryJJ90U6vbZZ1vPs3PxW858Eq3ulTJdtWikP+1+YyKUDVT+Elw2 L7Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=p3ps+igl; 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 gt13-20020a1709072d8d00b007830f14a97esi5896804ejc.739.2022.10.02.00.59.14; Sun, 02 Oct 2022 00:59:15 -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=20210112 header.b=p3ps+igl; 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 BFB3A68BB2A; Sun, 2 Oct 2022 10:58:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f48.google.com (mail-io1-f48.google.com [209.85.166.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD05A68BA2F for ; Sun, 2 Oct 2022 10:58:46 +0300 (EEST) Received: by mail-io1-f48.google.com with SMTP id h194so6187542iof.4 for ; Sun, 02 Oct 2022 00:58:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=pn73k4HWZjyIYKxNjD/tzWJTO4r8/iIXYYlyHQ6LM+0=; b=p3ps+iglXcUXLAK2PCbm61WQPrheV/33TyIMoIuWthwcq6/Jfl6g9Xd6i55tUAhgkg zhjXRbxFkoY9sZVfwyYg21sD78YgOnD+nrdp9oOylvwPjWpd2zkYlG0WiwALULgTCy+3 NqRDet3/etELibwltZ/k9OlgunT4P/7WltuBuWYvChonUg2TxBG2f7dRNM9eVVY+wK1T BqMQSZGI6m8xaaoLK3PKL4ki/EwoAUA4zjLJ+8ZimTGjbgUTG/2ManbNtGLXfrOHd01o Jp/uWIaCVFeleYgzrsIAKRomhF2+JH/at3jOexo8I5BHgNMHJPztxGOvzGxcOhOVyxiq VwGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=pn73k4HWZjyIYKxNjD/tzWJTO4r8/iIXYYlyHQ6LM+0=; b=dUVrvmXDNVtyVIB3zpAGGsFq0CnNMqoalAa8MGsAwViSNklT8O6/AISQzN+QZv/Lcc i0iVUWBWduDGoUB/Zu4SAs0Azbgjsp2IKWrYBu0ttZeAwXRbj9PElBZrBcvZWsrIm2c6 KZK+lhIrsMykBqmBC0xtFcI4Oj/Z6AatiEsZW9aOumcCMm5226czKHfTRCTywgMeZ/jU YpYHC0R1mtWmjYrCBy1ePDPHRGRyqAkuX943Md8P4CTKuLNHHDJMQXDyxYkYJh1at31d Tc864Ty/9Gco49tYfoM5WPuC8CEIn4kFMvba8aIonX3GvS1G63iE1t/A7oelbTYZZL7J EGoA== X-Gm-Message-State: ACrzQf0hvLUd0o8sAg2uDG+CJ6I+dt2AybLO09opLk09SsnqUV/AOsop yykFJ0T2ewIZOnqPyFg1B7LfAYsaa+k= X-Received: by 2002:a05:6638:1c08:b0:35b:1319:2d9e with SMTP id ca8-20020a0566381c0800b0035b13192d9emr8095173jab.233.1664697525547; Sun, 02 Oct 2022 00:58:45 -0700 (PDT) Received: from gauss.local (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id g99-20020a02856c000000b00362983f80a3sm691203jai.30.2022.10.02.00.58.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Oct 2022 00:58:45 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Oct 2022 03:58:35 -0400 Message-Id: <20221002075835.415465-3-leo.izen@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221002075835.415465-1-leo.izen@gmail.com> References: <20221002075835.415465-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/libjxl: use RGB32F or RGBA32F for 32-bit float JPEG XL 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: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8YSrFrDeIhyB Use AV_PIX_FMT_RGB32F or AV_PIX_FMT_RGBA32F for encoding and decoding JPEG XL files when encountered, rather than returning an error and refusing to do anything. Signed-off-by: Leo Izen --- libavcodec/libjxldec.c | 15 +++++++++------ libavcodec/libjxlenc.c | 1 + 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c index de48bea4b2..92b98388d4 100644 --- a/libavcodec/libjxldec.c +++ b/libavcodec/libjxldec.c @@ -104,9 +104,12 @@ static enum AVPixelFormat libjxl_get_pix_fmt(void *avctx, const JxlBasicInfo *ba return basic_info->alpha_bits ? AV_PIX_FMT_YA8 : AV_PIX_FMT_GRAY8; } if (basic_info->exponent_bits_per_sample || basic_info->bits_per_sample > 16) { - if (basic_info->alpha_bits) - return AV_PIX_FMT_NONE; format->data_type = JXL_TYPE_FLOAT; + if (basic_info->alpha_bits) { + av_log(avctx, AV_LOG_WARNING, "Decoding gray+alpha JXL input as RGBA\n"); + format->num_channels = 4; + return AV_PIX_FMT_RGBAF32; + } return AV_PIX_FMT_GRAYF32; } format->data_type = JXL_TYPE_UINT16; @@ -119,10 +122,10 @@ static enum AVPixelFormat libjxl_get_pix_fmt(void *avctx, const JxlBasicInfo *ba format->data_type = JXL_TYPE_UINT8; return basic_info->alpha_bits ? AV_PIX_FMT_RGBA : AV_PIX_FMT_RGB24; } - if (basic_info->bits_per_sample > 16) - av_log(avctx, AV_LOG_WARNING, "Downsampling larger integer to 16-bit via libjxl\n"); - if (basic_info->exponent_bits_per_sample) - av_log(avctx, AV_LOG_WARNING, "Downsampling float to 16-bit integer via libjxl\n"); + if (basic_info->exponent_bits_per_sample || basic_info->bits_per_sample > 16) { + format->data_type = JXL_TYPE_FLOAT; + return basic_info->alpha_bits ? AV_PIX_FMT_RGBAF32 : AV_PIX_FMT_RGBF32; + } format->data_type = JXL_TYPE_UINT16; return basic_info->alpha_bits ? AV_PIX_FMT_RGBA64 : AV_PIX_FMT_RGB48; } diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c index 0793ed251b..f9ae086e38 100644 --- a/libavcodec/libjxlenc.c +++ b/libavcodec/libjxlenc.c @@ -474,6 +474,7 @@ const FFCodec ff_libjxl_encoder = { .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB48, AV_PIX_FMT_RGBA64, + AV_PIX_FMT_RGBF32, AV_PIX_FMT_RGBAF32, AV_PIX_FMT_GRAY8, AV_PIX_FMT_YA8, AV_PIX_FMT_GRAY16, AV_PIX_FMT_YA16, AV_PIX_FMT_GRAYF32,