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 764524116D for ; Fri, 15 Jul 2022 17:25:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0784D68B965; Fri, 15 Jul 2022 20:25:49 +0300 (EEST) Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9193268B865 for ; Fri, 15 Jul 2022 20:25:42 +0300 (EEST) Received: by mail-qt1-f182.google.com with SMTP id c20so4230544qtw.8 for ; Fri, 15 Jul 2022 10:25:42 -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=bBly9ceJ6DzjivGhzq67DV1I1E42Lol3uHRQU5GMPCY=; b=iCuVPi/0sEgxwgkPsW5qu9ZGA5T1WTKQyuDMj8s61JTMs6OM9iJ0qv+UIF4tDlySm/ 5OajiqmWfvdqNUbstK6dJKGfPV3chcEcECrGLev3YiqKJlG6PbFQrX8qFnHJsyeG/y5B G3h4PH/EnQbRs7v/Wq8vHRLHkQlpQ7m5sR1mZM7FrLZQ3L/V747O6iwGltsj/Zc2qZVH mgzK98WcwxlgG21G2azrXtykrk+xIajTcsFFDNFo0WDAP0adRGxUQRw9rJa0ujn4ftMN O4+9z91zJHVDUhHtK29pjdJu8IRKE1u3zf7sIl+wfZleCBcMB1pPIh40haR3UbthA0zF uQXQ== 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=bBly9ceJ6DzjivGhzq67DV1I1E42Lol3uHRQU5GMPCY=; b=yDQLInfGgaEG9QB4XI6mDJVdpV0fogO8/XCPfgxl1drZYZtgUJpkFIhDptNsYDCzpV npqbCAzmn30yOIj+aWGx4KPs2oTeJX5Fj/2aXdfHTeRlh/sv1btNbMAXoUyva+7a7j3T NrOcQCZvxq/Q6fpTEED+ptCtMyxLS3D2i1gXcNICu9Ke7q///2zyc0AisVu1nFrjO4+X OVQNbgYbc7HQaiF8Opzb0VnUjQDRFFNf3jf6U5GwuUb9/G7pdN5NmPx2zRPOTYaqgXc0 hQxT2TdWEQd74OgXjcliP6YSH8a3jIHwP8zdq6W8NYLsyJTLctXdYd7mXwA7Q6mVJRUE Wdxw== X-Gm-Message-State: AJIora/1YZh7bxZMWgGY2Jn9k5XGH8YS44n/wT2+HY7A0OsuAHCxQgVO ESnGsBjhsW84EcDTPV1bVqtiPxS0I5Q= X-Google-Smtp-Source: AGRyM1usGECBcXvmsq8rf3SUlj01AutmH7ClCyktk4peegNgJl32Dk7bbf2fPZ2S6nXg+70TMS9tUA== X-Received: by 2002:ac8:7f81:0:b0:31d:483b:8c8 with SMTP id z1-20020ac87f81000000b0031d483b08c8mr13288441qtj.473.1657905940924; Fri, 15 Jul 2022 10:25:40 -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 az44-20020a05620a172c00b006af4a816963sm4813576qkb.133.2022.07.15.10.25.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jul 2022 10:25:40 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Jul 2022 13:25:37 -0400 Message-Id: <20220715172537.25483-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.37.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c index 6a948cc3ae..3910d93e82 100644 --- a/libavcodec/libjxlenc.c +++ b/libavcodec/libjxlenc.c @@ -211,6 +211,11 @@ static int libjxl_populate_primaries(JxlColorEncoding *jxl_color, enum AVColorPr jxl_color->primaries = JXL_PRIMARIES_P3; jxl_color->white_point = JXL_WHITE_POINT_D65; return 0; + case AVCOL_PRI_UNSPECIFIED: + 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; + return 0; } desc = av_csp_primaries_desc_from_id(prm); -- 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".