From patchwork Tue Jul 2 13:44:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 50285 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp2552663vqv; Tue, 2 Jul 2024 09:14:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXLlXRCc0QaoTlmuOx4eQImHPRimLz7o1wvGzQ3CeAX4K9kwrzET8/Q249GmWYWwP/Zr9NmuCBw1wykNUIT6Yh/HtG7EzFWHJI92A== X-Google-Smtp-Source: AGHT+IGJ2a+wdCJ6u2ceHUom572x1TOoCmzvo1K5KtjaDzGQgcDHpDfUX7L0B2h/iezgENgk6kvA X-Received: by 2002:a2e:300c:0:b0:2ec:4f01:2c0f with SMTP id 38308e7fff4ca-2ee5e3bf062mr69748321fa.26.1719936844245; Tue, 02 Jul 2024 09:14:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719936844; cv=none; d=google.com; s=arc-20160816; b=wz8bmrLEh/jO8IR60rh3qqP1orQmR6fYnMuJCFWAbhe7uWip0GbbX+esYWz7TMXFqV qR3FSErM/4EncLYVs0GHoOQ91ZbOgwaMD1kMPRqvClNX+m7GYRxISG2YKRJEYZ0TN0uh nH2AUTxzqNVJuCud5kEaSiAqMPJNqikC8gmEQHbZF6AN6FSJzTg5NNiP6F4pqUQNW52w pleMkWmSYt0qceQQMq+92lBbutas635NliIGs6Xqfv+RzwVANQXvfWFJjYfqVgLqQgQp bM16/D3v2mO8gnCYVvDtjy7HpOCNIvGFypGHQCPajLqW6QbzUKZ7ue4O7N/cJfAZdFvZ i+Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=sIvEA4vcfqjclJhtSS1/6/1AqpoiWhgRrFni4TZpcCY=; fh=wbRw4dmpm5HLdLOi49E3B1xR6OR4JvuzzqZfDAQQ2R4=; b=TFMTYsyJA9XAUR1JdICJ5Fd6btEUfKwEt/vUsNt7Z+tz4H0K/EeQcWUftOR9lYa7qg Kaq+9Jxk5pDEXItiovjw7untsn5w8pCKS92C2/a+H7u6sr/H23y1ZqckItssn0tghrYO RUOViPXkgqGZyG9xwOlc+yXXwlRh2+O2GjgJWacZ2S03GQVnNsroeul6RwGJaUQuGUn9 EyK2q62rO8J7bvkvO3WT5DFjuHO7dGz1p6rVNBMC/flTCxu2AkVSfq9r0JdxvJfGQmlX 0Ea2wgzdEBLKi9KYV1NL1Ju/JkghuYulBAm6fPtbP0L/k7chmncWC7OYphlzezGz/Ec0 5RdQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="lP/oNa1C"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2ee514bfab8si25968611fa.32.2024.07.02.09.14.03; Tue, 02 Jul 2024 09:14:04 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="lP/oNa1C"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5306D68D8F0; Tue, 2 Jul 2024 16:44:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f182.google.com (mail-yw1-f182.google.com [209.85.128.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 00F1568D8AE for ; Tue, 2 Jul 2024 16:44:28 +0300 (EEST) Received: by mail-yw1-f182.google.com with SMTP id 00721157ae682-64a4a3e0869so1010287b3.3 for ; Tue, 02 Jul 2024 06:44:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719927867; x=1720532667; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=E8v/O8LpM8h9ny9GBt87yUd9A0ABGtpWnhtQUXUL3m0=; b=lP/oNa1C458YDB+7L39eTy+v5NOlWWIlV/J5PMr5Ft4/740HJ/hmPw+r9bdTAZNbnn TD7qwbsdt6UNb3+4exe5lA86S6ckp9AR++bRY+tgzeWFarxbrrM/cpTtYdkCS+jeRN5x rb96s0gDlllIge5Yb5+RvzCwzU3iYoIyor70fxotp5/zvItVk1c7WZcKF6/sElBei0Ll UyGlhPWKkdetc2emB60rp+lueH9KTmHE5V1Ge/3BA7Xs/6N+Zup+jjsfocF4fkuFUc8E 8u506uq5M1M6CLjTT+0zJkRT312hxOv7qlUpc/+YTqmgqxcXrUQnIA7Zcmg8Q3bu8dS9 IW1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719927867; x=1720532667; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E8v/O8LpM8h9ny9GBt87yUd9A0ABGtpWnhtQUXUL3m0=; b=nmWgIqHyIZD2YVeJ8ir3wQ0+ERQvDRSFrugHYRopzy2XJ5QIBD4/Yy70MPO4G6Lm7/ gU+hmBZ+oAXJIGEjfHGGZXXyEBd/K+RsJPydr5ONLWrax/LJXfq5SruHeQAytw8MFHu9 Jp0UOknEqMbS5xyi+0XCMyWKREYMHMCS9AMmv3gFwGEeJtF/0bZDett6ex4AwNGgtuzU /MS0oBbfyrHbim29DvhkY6ujRJaxHySwZ5dw/dWF9OJ0nr2GDg+1ts07XEZZ3mnyDfVl EvpLVyJwf6MjVIWyxk+zCYIL+mCFLoeS4MYmkpJernoMrc3RxpHhn+S92u+HseIjsQ+H z43Q== X-Gm-Message-State: AOJu0Yxtpb7JrKadAOJsFUW1vXTloAmZ3p9+0sZxfftswBya0nXn3EUo CE+dksEE2XohAfm6c+OK4z5gatQKWeK7KBLp0xCzEZIk3wuzxT9WpnMVLQ== X-Received: by 2002:a81:91cd:0:b0:627:a25d:6e76 with SMTP id 00721157ae682-64c71802f38mr59017397b3.2.1719927867439; Tue, 02 Jul 2024 06:44:27 -0700 (PDT) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id 00721157ae682-64a9c40907csm17540187b3.139.2024.07.02.06.44.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 06:44:27 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jul 2024 09:44:24 -0400 Message-ID: <20240702134424.133688-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240702134424.133688-1-leo.izen@gmail.com> References: <20240702134424.133688-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [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 Cc: Ramiro Polla , Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6Aexs7c8XJZ7 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); } }