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 29C174350D for ; Thu, 14 Jul 2022 19:06:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6AEBC68BA61; Thu, 14 Jul 2022 22:06:41 +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 C8C3F68B992 for ; Thu, 14 Jul 2022 22:06:34 +0300 (EEST) Received: by mail-qt1-f173.google.com with SMTP id c20so2191549qtw.8 for ; Thu, 14 Jul 2022 12:06:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=I+YEEMbVQSyhRGJ/ypsQgnJsH5Nzw3Z46/Ls838lmwk=; b=F0SYNT/h9KrNpB5DcMmlyYDyOJSPxfdH+kAUaIqkKR8lcHh6Wi5NRPa9YwYmUSE7oH OefgUqKN3sMaq/0YLe9RNUx4gMd0CvtLtB0K5ynSykxLgOrDr8d+0Fe8wZmIuTwyVwOJ IYyPx5iZtPdRFJwUTVrhR+f0dlw2d8pG/dzvhd+V/iAm8+RS7DENkEstkXOroxq6xCxe TrvuQAIoDBou2xUFsGa3qtGuRm25/J887oSLPfpIKAqVHvAQ6mO6GJHgtpA/GFJ0hyZ2 xxnSlpRxYGEAohfDou8ENMxOFClhQkgVHdGETChZNt3Qi1k7Dq00AfSHcN9/tyIKCFq7 NPRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=I+YEEMbVQSyhRGJ/ypsQgnJsH5Nzw3Z46/Ls838lmwk=; b=TjQbz+JijYly9qkxtpUCsv++VLdvmbs/4wOcDhio2lVUnXRBxjgjVGcBc+BB6wq2xq 5JDbbzDmM+VANk0VenLCVqzqksWHQcOn8/TPLOoFkDLOfZ7wMvwhda0dikcULw9e0jO/ nJAsnnUHHVN529MamPOr97uX+PGc1guQkj06T+1SiVbi0QSUKYw2suUHk21k/Z6tAJhA T7cFCNi6Vr4JdiE3euMB1fbP8fCyDzWkahKNIwHc/IeRRhlsrHRZEEo9Vf4j7n0CFXVb AsdTHKPyk0O6N0tP8zMhH0e4TliBQSThzkU5TAoj89KeZ+TnWZJ6iOCeUqkaSENb9mlg DzlA== X-Gm-Message-State: AJIora86OPTok7xwb6vZhJbxUONBwBvlKNlSUyvL9heu68DUncWZ0eVe IpSSyBfEV7xSWw0AO5dc+KM/R9nTy5w= X-Google-Smtp-Source: AGRyM1uJP4JK6JptYMGRPi3RxNUYdOKo5X1VjPA2hDZK+/5A8XK5fodlxCaD5MjIAeSJ+DMQwoAFfw== X-Received: by 2002:a05:622a:1742:b0:31d:299d:cbae with SMTP id l2-20020a05622a174200b0031d299dcbaemr9631350qtk.476.1657825593339; Thu, 14 Jul 2022 12:06:33 -0700 (PDT) Received: from [192.168.1.35] (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id s5-20020a05620a0bc500b006b555509398sm1865410qki.136.2022.07.14.12.06.32 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 14 Jul 2022 12:06:32 -0700 (PDT) Message-ID: Date: Thu, 14 Jul 2022 15:06:31 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Content-Language: en-US-large To: FFmpeg Development References: <20220707183248.129374-1-leo.izen@gmail.com> From: Leo Izen In-Reply-To: <20220707183248.129374-1-leo.izen@gmail.com> Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 7/7/22 14:32, Leo Izen wrote: > 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) Bumping for review. - Leo Izen (thebombzen) _______________________________________________ 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".