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 3BD224B98B for ; Tue, 2 Jul 2024 15:52:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 108FF68D8BA; Tue, 2 Jul 2024 18:52:48 +0300 (EEST) Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C56568D859 for ; Tue, 2 Jul 2024 18:52:41 +0300 (EEST) Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-58b966b41fbso1131861a12.1 for ; Tue, 02 Jul 2024 08:52:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719935560; x=1720540360; 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=32KOwruo1PvVup0S1EOY+O4694XTGoiSzC7CR8JEv9E=; b=V0braP/FBfraLUotde0RizC1JJU0UXkctWuNFQFDsDSd4H97gxvF4MbRpdpINeGdMY FMvcZUQTo4loy4twfZBKXiJaxrr62xEPEiTKKfRM2296/ZEuS7dE4B8d9UzDrkLaqLl9 eTnVOxOofKcEhp9JbsrEgvSJgs74aDFb4QP3iUYNe6IYgFOT1Ub2GMtk8IVywnKIer0K mh4WdnXRU1Z8a4wCYwCwGXR965I7ERu9wqhertlANZX99GruJGUKg1/Yna3dFhf7UeO9 LXphs6UjYjMP5+1XjZ4dupM3a8NEl4sWJz0c8n64njpphqPlkuwYaY05Nsjfh1BZ6U6e voKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719935560; x=1720540360; 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=32KOwruo1PvVup0S1EOY+O4694XTGoiSzC7CR8JEv9E=; b=KkudXKOLh9RHz45fcVHYA62Va1sD86m25+tKCb1ZYRaTPttijQ3eaN7LuJIBNSMnj0 7sv0GNrwV+51YZmpK2/UNxDTw9urY4f4c+135T4tBRBlWvkUqc3hguJkNkK0rToW3IBf yholBV29JBUUepUJQaeU1oEXUPr/9HEdrDJC5xZrzbVSGtG4/b+bqbaciYA27Zep+0td Aw8vr8C5MvQuAdCHGuT2Wjm5EK9rG4gl3iI/ps/IUU2Rj1oDQnQCkn8zmpwJSaZ86skO GhF++/KHomXXnBDmjdnxjFSJBBRjGGnZQoALe02xWTEYz40yPNm2f4pQyIvaF+Z0TdEb Cxmg== X-Gm-Message-State: AOJu0YylBRBFCexnZ+DRx14tCbWSXMhEZIBb3V/DP4NmmRlGefrRRwNy EexGz3ZFqWJt23knanziu8V3AHEcuBs9wbpvKr3/8jAbAU6WVD25zW0BO47uUXG3OgqZAmG59rb aYc9KVLChugzOPNwTTs9NPgT+84c25Q== X-Google-Smtp-Source: AGHT+IFPXYGkLk1AfpDoxI+xUlL9dqL7OvTozXiH1uDG1ZH11wuwCH1FaCI5BkoizCF8C+cvud5e5VTv60lHAH9zRrA= X-Received: by 2002:a17:906:b295:b0:a72:8fc7:ef7f with SMTP id a640c23a62f3a-a751445f3d6mr518676466b.65.1719935560376; Tue, 02 Jul 2024 08:52:40 -0700 (PDT) MIME-Version: 1.0 References: <20240702134424.133688-1-leo.izen@gmail.com> <20240702134424.133688-2-leo.izen@gmail.com> In-Reply-To: From: Sean McGovern Date: Tue, 2 Jul 2024 11:52:29 -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 Andreas, On Tue, Jul 2, 2024, 11:48 Andreas Rheinhardt < andreas.rheinhardt@outlook.com> wrote: > Sean McGovern: > > 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? > > > > Why should it be backported? This patch has no user-facing consequences. > > - Andreas > > _______________________________________________ > 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". > Even though it fixes the written tag in the call to png_write_chunk()? -- 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".