From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 546FB4BC00 for ; Wed, 23 Jul 2025 16:19:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 096D968CB95; Wed, 23 Jul 2025 19:19:45 +0300 (EEST) Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 91C5C68C25D for ; Wed, 23 Jul 2025 19:19:38 +0300 (EEST) Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-60702d77c60so94581a12.3 for ; Wed, 23 Jul 2025 09:19:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753287577; x=1753892377; darn=ffmpeg.org; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=nLKmcUibw+bBV2tpw834QJgbewr5tJ95tlmJ/ecQnV8=; b=Farkes5mnnIP8qy58TYW+6UhaK52e126N/Wtg+Kqf7nqNPh25EBB85vkVWBi7MEifd 6OVutbYKsqHcAJ5B+JrzrImTp/C5IioXmn4jlbNRnlQhazEP45mB8cI0yoi0wjkRy37X NnKmP/IY/voio+86XpQXkaAdkxqMHhtyThQZLeAPQhtCNur/1fSr7YRsWi8mQF0RjF7U oV7LWPkv5qLTss2j1KETlG3p786HSwsAJr6gd/96g+k16qUcX+SCdGip5asJQ3exeQ7b 2qaphRhDSk4syEoC4cH5+I5oOv8/JYsaYRsMi9zXM02tRGPdfpB/hNMRD5qwoINXmrPW Tcww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753287577; x=1753892377; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nLKmcUibw+bBV2tpw834QJgbewr5tJ95tlmJ/ecQnV8=; b=ApUrlmyYwMETmi9tsnsD84XSOuroDe5ZvlDdd22Lkjc6zvD/eNkWaYSKRHv3IrpCWY aLMqiXA3Mh+FyBSJTFc6NnWXgRUOP35djkSHkIfQaqFqaFwnT2eYbfCwlSdu/xVx3SxZ k+7hSfRDkW0JDIhVLCq6Nv1Z901X1e9bO9J2Rwch1v2Xjvoq5kxBPV3SgXu6outDcquf OtQw/aq4fRi2/QV5liHwa6U9XNi/N9n5t9y340hTU++cGFWKCHV/kvCOsQ9/oVr0RkTq ObT0wkDrn2lX2LFVtd5cdBRw6w18+1P0cgzsuOnpMQOkhAV6ZwdWSoxsGQN7MdvFZv3g BfHA== X-Gm-Message-State: AOJu0YwbuUduJ5c2qvyjdIU1Ip3rOcX6Tc1xvB3P7dKi/ZnbCKJct2kk 6g64LIOnynE2z6UY06K7UOtH0LKsPnO3czMJ/9491DGAUNKxQD70PmmkYePftYh1cYPh3dFe8Wi a9u7819WeKhIyeoDwa95E7oJz00tn3jJ78g== X-Gm-Gg: ASbGncsXJnJ7hynErOYbFHCQ0j9hVWFjfvuPBChVIrZCgB1cPCYMgd4MP2A25SaHyb/ +gGHoBpiFf5fqWsIpQvGT0i6sIDRk//5+CyoNqF7wZgZ9zfai9/HFtk81Z9Kt5GxfmYoMDjnZhR v01t6FWga/DgI7d+oWTAHRdnh8tfJc5nl+HCUloojtXSUdxqT62KyQ3B8EeUdKZ2Dffb9LRHL1/ OCO X-Google-Smtp-Source: AGHT+IFhFKu21uPA0wKKRx2LHJiPH1blHQOtk+h77m2djEE3W2Wi4d6w9b8zjAEbguu725x01lkXRgQnUqKGDkb/YBQ= X-Received: by 2002:a50:cd1d:0:b0:607:f082:5fbf with SMTP id 4fb4d7f45d1cf-6149b432064mr2403394a12.12.1753287576775; Wed, 23 Jul 2025 09:19:36 -0700 (PDT) MIME-Version: 1.0 References: <20250723135626.1390296-1-ffmpeg@haasn.xyz> <20250723135626.1390296-11-ffmpeg@haasn.xyz> In-Reply-To: <20250723135626.1390296-11-ffmpeg@haasn.xyz> From: Kacper Michajlow Date: Wed, 23 Jul 2025 18:19:03 +0200 X-Gm-Features: Ac12FXwSnMJltX6OQ83ZOUyQ1SVxzWDAqwShlJBxgxAJE57dULqsmXRgr1iGFLU Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH v2 10/18] avcodec/jpegxl: parse and signal correct alpha mode 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-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: On Wed, 23 Jul 2025 at 15:57, Niklas Haas wrote: > > From: Niklas Haas > > This header bit ("alpha_associated") was incorrectly ignored. > --- > libavcodec/jpegxl_parse.c | 7 +++++-- > libavcodec/jpegxl_parse.h | 1 + > libavcodec/jpegxl_parser.c | 5 +++++ > 3 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/jpegxl_parse.c b/libavcodec/jpegxl_parse.c > index 022eed322d..47b831e2b4 100644 > --- a/libavcodec/jpegxl_parse.c > +++ b/libavcodec/jpegxl_parse.c > @@ -190,6 +190,7 @@ static void jpegxl_get_bit_depth(GetBitContext *gb, FFJXLMetadata *meta) > static int jpegxl_read_extra_channel_info(GetBitContext *gb, FFJXLMetadata *meta, int validate) > { > int default_alpha = get_bits1(gb); > + int alpha_associated = 0; > uint32_t type, name_len = 0; > > if (!default_alpha) { > @@ -213,7 +214,7 @@ static int jpegxl_read_extra_channel_info(GetBitContext *gb, FFJXLMetadata *meta > skip_bits_long(gb, name_len); > > if (!default_alpha && type == JPEGXL_CT_ALPHA) > - skip_bits1(gb); > + alpha_associated = get_bits1(gb); > > if (type == JPEGXL_CT_SPOT_COLOR) > skip_bits_long(gb, 16 * 4); > @@ -221,8 +222,10 @@ static int jpegxl_read_extra_channel_info(GetBitContext *gb, FFJXLMetadata *meta > if (type == JPEGXL_CT_CFA) > jxl_u32(gb, 1, 0, 3, 19, 0, 2, 4, 8); > > - if (meta && type == JPEGXL_CT_ALPHA) > + if (meta && type == JPEGXL_CT_ALPHA) { > meta->have_alpha = 1; > + meta->alpha_associated = alpha_associated; > + } > > return 0; > } > diff --git a/libavcodec/jpegxl_parse.h b/libavcodec/jpegxl_parse.h > index 0602f4d409..bb929ccee1 100644 > --- a/libavcodec/jpegxl_parse.h > +++ b/libavcodec/jpegxl_parse.h > @@ -35,6 +35,7 @@ typedef struct FFJXLMetadata { > uint32_t coded_height; > int bit_depth; > int have_alpha; > + int alpha_associated; > /* > * offset, in bits, of the animation header > * zero if not animated > diff --git a/libavcodec/jpegxl_parser.c b/libavcodec/jpegxl_parser.c > index 75acc53708..c13601f3d7 100644 > --- a/libavcodec/jpegxl_parser.c > +++ b/libavcodec/jpegxl_parser.c > @@ -1074,6 +1074,11 @@ static void populate_fields(AVCodecParserContext *s, AVCodecContext *avctx, cons > else > s->format = meta->have_alpha ? AV_PIX_FMT_RGBAF32 : AV_PIX_FMT_RGBF32; > } > + > + if (meta->have_alpha) { > + avctx->alpha_mode |= meta->alpha_associated ? AVALPHA_MODE_PREMULTIPLIED > + : AVALPHA_MODE_STRAIGHT; Is this OR expected here? Setting (2 | 1) seems strange, no? - Kacper > + } > } > > static int skip_icc_profile(void *avctx, JXLParseContext *ctx, GetBitContext *gb) > -- > 2.50.1 > > _______________________________________________ > 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". _______________________________________________ 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".