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 1C3944B984 for ; Tue, 2 Jul 2024 15:14:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 24BA468D8E9; Tue, 2 Jul 2024 18:14:35 +0300 (EEST) Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BF2168D647 for ; Tue, 2 Jul 2024 18:14:28 +0300 (EEST) Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-a72af03ebdfso616051566b.3 for ; Tue, 02 Jul 2024 08:14:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719933267; x=1720538067; 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=X9q08Btxpdq1odFIMPA3P2q2iGTaR3hTshSYvvfS6Is=; b=EboG3go4j9wAoR0jC100PIRR882atmgZtedE7Po+uCGK0JAO2eofKSATK0EVs5Dmjd WKUUAX2aAitCstBlpvvtT89/oimvUOytnMMa08Vu/kmfIXXDVsc4oJ4Ax2d2JpW8dk3u MGo3GF8O0iWV8SG1aV489NI+8K/LkddSE1D/aU1ZvAsscAGfE9yknGTIsL/C9aRvZibx qaHx0lrvkbzNX9KN8iaI6yo0+CPeKCcjhQfCKEBoGfUyprXUbZCxPKXKARsm0ozCi1nU yGm2VHqFb7+28AYwLdYbOP7OdDMlnRjB4YFOVKHJMRoMX0KTa/nRvBwqBmZdgZJlK62T nB4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719933267; x=1720538067; 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=X9q08Btxpdq1odFIMPA3P2q2iGTaR3hTshSYvvfS6Is=; b=FynRSThIGwCes6b2tFLiH7GlioTm+2eX11Uard4f9N+IkjEp0o4LUji/Kic2NJJNX0 NugSf9ZInOVyYQaBANwhSmra66DDj7XdaklXm/9EBCsY/Pn3VnWfjdElYmLH6wJ5PK/o EgpVDZeFNX+WKnxEUieGH7HHDGtg+S/Sko4YlX+P40m8YirdMla9OtvJncEq8VXtGykQ vcBAmNFMxzqXPCa73idIhpwZ4gMpeH0f8nkTQMqNv4r6MuDsC68M4JjYmdpTL3asgnnz 3sojyaVmvFAFF1bXONc81cbPYHRJSiiQOINwR2ykQeJivYYaKPMxNrpwdyIajw7IZRGf aFpA== X-Gm-Message-State: AOJu0YxXVg0rt4qXUSoF75XQSVljVPaWev6Ff7UIxAPSx12/aIWk9CyX 5+Pb8Zb8CYuy/pUxWYrqJgDwe7hfiq3NtrQV3IzWSWChUGltuJ/fCgJFxQ/oLAi8/FdOOUrCS+u XEFHWEGWu54jeAUxOiAyjQW1/zML/5g== X-Google-Smtp-Source: AGHT+IGH0Cyxk6lxICuu8R0ZcRFenWXLvSLNIytYZS5g8vxRFny0TBjDe4aJxvM8sY58OBoByQMkSZFBe96JJkwvOwQ= X-Received: by 2002:a17:906:27c9:b0:a6f:6ae6:8ae8 with SMTP id a640c23a62f3a-a751445fa34mr593027266b.74.1719933266780; Tue, 02 Jul 2024 08:14:26 -0700 (PDT) MIME-Version: 1.0 References: <20240702134424.133688-1-leo.izen@gmail.com> <20240702134424.133688-2-leo.izen@gmail.com> In-Reply-To: <20240702134424.133688-2-leo.izen@gmail.com> From: Sean McGovern Date: Tue, 2 Jul 2024 11:14:16 -0400 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH 2/2] avcodec/pngenc: fix mDCv typo 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: Hi Leo, On Tue, Jul 2, 2024, 09:44 Leo Izen wrote: > When mDCv support was added, there was a typo in both variable names > and also the MKTAG itself, incorrectly listing it as mDVc. The tag name > stands for Mastering Display Color Volume so mDCv is correct. > > Typo originally introduced in 78949041417caaef0c82b2b23d7defdd88aa2378. > > Signed-off-by: Leo Izen > Reported-by: Ramiro Polla > --- > libavcodec/pngenc.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c > index 89c3d5b83e..7ae16fa2c5 100644 > --- a/libavcodec/pngenc.c > +++ b/libavcodec/pngenc.c > @@ -450,17 +450,17 @@ static int encode_headers(AVCodecContext *avctx, > const AVFrame *pict) > > side_data = av_frame_get_side_data(pict, > AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); > if (side_data) { > - AVMasteringDisplayMetadata *mdvc = (AVMasteringDisplayMetadata *) > side_data->data; > - if (mdvc->has_luminance && mdvc->has_primaries) { > + AVMasteringDisplayMetadata *mdcv = (AVMasteringDisplayMetadata *) > side_data->data; > + if (mdcv->has_luminance && mdcv->has_primaries) { > for (int i = 0; i < 3; i++) { > - AV_WB16(s->buf + 2*i, > PNG_Q2D(mdvc->display_primaries[i][0], 50000)); > - AV_WB16(s->buf + 2*i + 2, > PNG_Q2D(mdvc->display_primaries[i][1], 50000)); > + AV_WB16(s->buf + 2*i, > PNG_Q2D(mdcv->display_primaries[i][0], 50000)); > + AV_WB16(s->buf + 2*i + 2, > PNG_Q2D(mdcv->display_primaries[i][1], 50000)); > } > - AV_WB16(s->buf + 12, PNG_Q2D(mdvc->white_point[0], 50000)); > - AV_WB16(s->buf + 14, PNG_Q2D(mdvc->white_point[1], 50000)); > - AV_WB32(s->buf + 16, PNG_Q2D(mdvc->max_luminance, 10000)); > - AV_WB32(s->buf + 20, PNG_Q2D(mdvc->min_luminance, 10000)); > - png_write_chunk(&s->bytestream, MKTAG('m', 'D', 'V', 'c'), > s->buf, 24); > + AV_WB16(s->buf + 12, PNG_Q2D(mdcv->white_point[0], 50000)); > + AV_WB16(s->buf + 14, PNG_Q2D(mdcv->white_point[1], 50000)); > + AV_WB32(s->buf + 16, PNG_Q2D(mdcv->max_luminance, 10000)); > + AV_WB32(s->buf + 20, PNG_Q2D(mdcv->min_luminance, 10000)); > + png_write_chunk(&s->bytestream, MKTAG('m', 'D', 'C', 'v'), > s->buf, 24); > } > } > > -- > 2.45.2 > > _______________________________________________ > 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". > This did also land on the 7.0 branch so I assume it will get a backport if approved? -- Sean McGovern > _______________________________________________ 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".