From patchwork Thu Jul 7 18:32:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 36702 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp5073630pzh; Thu, 7 Jul 2022 11:33:03 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uNC1dZVgNbv+xY2x8Ou3hAKe4I080IRS4mCk6cc/zo/3e1IUTrL7WV9XLs4yyc/Z4tCaxZ X-Received: by 2002:a17:907:7607:b0:72b:1c8a:da9b with SMTP id jx7-20020a170907760700b0072b1c8ada9bmr1646661ejc.108.1657218783684; Thu, 07 Jul 2022 11:33:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657218783; cv=none; d=google.com; s=arc-20160816; b=PKJiDiFFzNruRl+Y44hpAB7kNnSZ2XWkso4FSDJSVOBYg8ro7PFWZijJVc9HqH1M2h JlqPUUaW+wCGfSShTifLxBLImTHSXC072uYsG/nlj5ezvT2ItSo4UnA2/PyAVYRoUUQF TwQnen2eIxxqmhuBXPLzhMVxeH/rFVZBfwBWaUImtQ5qX//L7KwC8NS6EXFUyRVdJWZo ua5HTC6uuHgleSmX+hEekETuHWKJDe+328FcAgYYv1KRFocVI+nkZclD7F519a/Emvlh Tc6t4ijtTgr7PT+egmnQKl+/wdBZ6QKlav1/twFAvRKTv91p93osgOcoLkHPl2pi/1Th uvjw== 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=IAb1IjBK/3ZWtiyTLBrrJBDSAAlFS+E9uTk6YuYOagM=; b=Zdlb1LN31EtoYQeU0+tXkBpld3bqtNEvHJE/0/XG8qf1LUTkjjbocLzJjtZjzyuqcs 4TB0HIAy453U+2N+5fHQExLWHY3OasGimHZymcCt4AL5FFB97jqP/VHeRBLIlci+BHZO 6XSE1VDU5kyr4hR3AXL4T4uXyzU0tX5u9XXhm0TB9BDj2VsLOoljWIRZg/k2iKHaW55n dX8ED0OH1Y0S2LrEwg7kN2rX6zQhNmp+57fPxjTZP+9CPpObc/ojl0MBe3WeOic6Dm+I KtmKyum9OsXZ4xNPNtFCDn5SnIJU8+el68RYIXV8DwzU1saYOPc35ZYn/Ui7NcYyNm2g WwLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=fadDttyW; 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 hs40-20020a1709073ea800b0072aa56cd0a3si1088863ejc.28.2022.07.07.11.33.03; Thu, 07 Jul 2022 11:33:03 -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=fadDttyW; 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 6C25968B8F3; Thu, 7 Jul 2022 21:33:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F33F68B8B2 for ; Thu, 7 Jul 2022 21:32:54 +0300 (EEST) Received: by mail-qt1-f173.google.com with SMTP id z13so24013990qts.12 for ; Thu, 07 Jul 2022 11:32:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pv79vuq61rUHAci/cWoTSEUPGZVtKszK13YVdgJipv0=; b=fadDttyWELtKFb4zsNXe1YN92DVfSm0CSVNwiCx7zRV7pmIuXxw3yjfPQMZ+K8Wmqo yvn7s+S1l1xnXXCQuj0C6fQpplPa9lqy4P0GsFosW0oFAFxZ9fd3tuUTpYaEMMd6C+Ol c9ZpjJslWTSwRaRXFytIbN4OELWKOqaCQCPU/0UUruU7xdMTNc6gEUaBGaZmcqm0ZDqY 9P1b8qEBhvKP4Nmm8uDqXnDk0GIurd/LeB883EA8qHaf6IBHTrj//quWDfKonP3QA2Po +f0hF9lm1Acl4NwX49pw8YYFg8ws0fKNw/USkP0/ps1PMfT6yKNmyw7bkvuL7EVlrIFi +NRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pv79vuq61rUHAci/cWoTSEUPGZVtKszK13YVdgJipv0=; b=n0sjWc+r3Gu93SBUx9rMH2tIzvUgxWt6tkPnhr/TLoCHToC/lEdl5deZNla1d+2Kzx WixoWjvg5L3ks3bLWV4WJR+/CgRIGetQaIKZjK8cvhex1HDBUMQ4U1EtJRDOnQK8bsoG a7Dy0yKihTclpoIgi/NBhQO5ImxRS2Vkg99k5R9+O0Mdne4mpi3BJRRBAfNpGNG7Hejz Opxs8XEyXr/s6rHWL/3UeDXRw8Xm8a0ZtuhORlFiOuS0miurR6JezCxF/uUNn01CAkwE BmPbHDI5e5k3pnMURoZv2CFsh9HuMl+2gBTctjIbXQdfVGZOjA8YHFlY/mpEYVELMss6 eV1w== X-Gm-Message-State: AJIora9iiDFtLOxdX0s73N1YGGT94NQ9KxL6Hq1RWKMOGaOy1UV/8R5E XXpirpBOV+cC2QbVHPrrYIwID26nnZo= X-Received: by 2002:a05:6214:f0f:b0:472:99fc:e34a with SMTP id gw15-20020a0562140f0f00b0047299fce34amr37164499qvb.108.1657218772244; Thu, 07 Jul 2022 11:32:52 -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 y17-20020a05620a25d100b006a6a5d1e240sm35985970qko.34.2022.07.07.11.32.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 11:32:51 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Jul 2022 14:32:48 -0400 Message-Id: <20220707183248.129374-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.37.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libjxlenc: avoid hard failure with unspecified primaries 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: u0SfnJ6mbSKN This patch prevents the libjxl encoder wrapper from failing to encode images when the input video has untagged primaries. It will instead assume BT.709/sRGB primaries and print a warning. Signed-off-by: Leo Izen --- libavcodec/libjxlenc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c index 6a948cc3ae..d6d25fe970 100644 --- a/libavcodec/libjxlenc.c +++ b/libavcodec/libjxlenc.c @@ -343,8 +343,11 @@ static int libjxl_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFra ret = libjxl_populate_primaries(&jxl_color, frame->color_primaries && frame->color_primaries != AVCOL_PRI_UNSPECIFIED ? frame->color_primaries : avctx->color_primaries); - if (ret < 0) - return ret; + if (ret < 0) { + av_log(avctx, AV_LOG_WARNING, "Unknown primaries, assuming BT.709/sRGB. Colors may be wrong.\n"); + jxl_color.primaries = JXL_PRIMARIES_SRGB; + jxl_color.white_point = JXL_WHITE_POINT_D65; + } sd = av_frame_get_side_data(frame, AV_FRAME_DATA_ICC_PROFILE); if (sd && sd->size && JxlEncoderSetICCProfile(ctx->encoder, sd->data, sd->size) != JXL_ENC_SUCCESS)