From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id B72654298B for ; Thu, 7 Jul 2022 18:33:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 349E568B9BF; Thu, 7 Jul 2022 21:33:01 +0300 (EEST) 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-Google-Smtp-Source: AGRyM1vmgfg6s8GDtqq4bt8ambmmrc7FVgpzTXbq63b0YKrlAQ/jxoHZlcJX9ZvrI0/eee92TKuX7w== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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) -- 2.37.0 _______________________________________________ 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".