From patchwork Wed May 26 01:26:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Valerii Zapodovnikov X-Patchwork-Id: 27949 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp4377962iof; Tue, 25 May 2021 18:26:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrCS493xDFqudCH9eG0B0Y9KV3QHQWmr8raBss7SaYsRVoI23YvzWjnAWeBTp1neeosHSP X-Received: by 2002:a05:6402:1582:: with SMTP id c2mr34564269edv.388.1621992378322; Tue, 25 May 2021 18:26:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621992378; cv=none; d=google.com; s=arc-20160816; b=DDNL0JBOxPkhhcWDZDWrkTBTRc29OGTWJ/JG+vkbwSVhVr6PFwf5CGKHYwbo0RDMlU wcprTsgfJx/9xMLcCwwkWsz+NQbgoLJOJQiPNXFUHixFYckQLXwNK2nDtuCMvn0H1rOp yTwe8rQ4930kLfHZiqPy+JNBahf247Z/K8WHoFxGZmXp5tB7QN6KB787/k5TMnm8iSuN O/yP82Jfu/ElQmbrciqcG7jn5zE0/S761S8/FyEzh+Gk7E4FRtILkeUOWN7t6CZmcu89 /jlkBvEIcdPcfVvnqFMAZOCbZPXzDT1soJHhOL1njTVL8vzQj6HJqHKmlORR09Kw+jwb 8i9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=sZYhRV4Ysu9N1mPruTu7cOMrmiO6yogfVHQSRDS0J88=; b=yUOJ91BQHRE+RgcpTItLS8VdbWqK7RZVi35cWXpca0NGeBc8LaDwuqw3Iq02iDJnfS l4njzm4/Wd3mmyN9ryiNqBdgcIME2aIMf4citLZ+zArh5xeVJ13fykRAE1jJ4KKPriXK KUq3APVNKafgYIzWKqLvqyJXLNfvvwzAcz7mwESGT1GbgOhB7fl7YCjuFzPcrfkkoTny iEzpRnRHK2z2Jgel4u0Wz4E4huTLsRMJ2eg3i8ZtVwllyvd89Yep2pElgD9ueH9OVze0 X+zeCpwgVQkmSndrZCsaHP9Cf6EfRF1sWYQ9EngKF/Tq3n3TPatEydUGXE9BOTvrAFRM 9kcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rxxBHLuD; 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 n7si9265160ejx.652.2021.05.25.18.26.17; Tue, 25 May 2021 18:26:18 -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=20161025 header.b=rxxBHLuD; 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 19FD3680B68; Wed, 26 May 2021 04:26:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB00268069C for ; Wed, 26 May 2021 04:26:06 +0300 (EEST) Received: by mail-lf1-f45.google.com with SMTP id j6so46282138lfr.11 for ; Tue, 25 May 2021 18:26:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=OeBIZNueOEdI+lSFXU6QrWkS4McdLO3GHXT6xbpGzZA=; b=rxxBHLuDvRGEw0PYSF3KE6d0zs4LKpBzacONXNlnAtKsYxT+uWNsQgGo5KeHCzWj/K IL8Aic++FTau7VoiO0nkZfskuzMLi2RNMsFxDgWvuURQYJs0JHg0DbHYkwkWtW2KhuuG gVSGJWocIcqYGz1ZMm44Nrwz0hu0QrEQ2LseveCvLMIL3g6bbgmF3izGor3v6ezxogoI GDN/TYYQ39hmP5BoFRGLECRj5Z3TzRibKxw5tiln6EspWebwMDDnnnEKXrtUB77FuwHl W4y6quA6BRRihs3cv6BG8ssq0TpBUIU9vn4eeDEEfirPgt/aeDC50BUe4+aMb/xnpxXg hzfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=OeBIZNueOEdI+lSFXU6QrWkS4McdLO3GHXT6xbpGzZA=; b=go4Q8ezcL6oOaEPEAU206/bF21by4KRXrJaT+SxIWlEBStn71hX4uxaV1PJgIpybgd dv8+Wn+d3ocBdadEKnXTGatvhNn85FAGCmNPZVpRo8+weBxxgEf0sbYLchv+u13FVR8e WpMtaF35H4qdKeSVTDwfl+FMm+5Q9jp0aYnCMAki3hh8vk+VPSIcYBCUYo+QUdWedQAo /xf8xDulI3HsTEQPhglVR37ZP3wDIe+a7NLP8Bvz88Ul19S+036mWjdGSXhZx7AXGEFh +3Tx3Xf8k1nbDNACUR9FUjkt/MmeZ28hoTHuu0lUE/WK669rD5glOx9zsXG15jrMYgjX hvTQ== X-Gm-Message-State: AOAM5304ryenkYZWnclhuxCJhhfW/Nzm1KhTBO/t9WOMQjK2QN2Dp+Eg WfKXYmJ0YmU8Lmle2hpFTI5zOHIdW8BGwIhaaO4= X-Received: by 2002:ac2:5fca:: with SMTP id q10mr304277lfg.531.1621992365740; Tue, 25 May 2021 18:26:05 -0700 (PDT) Received: from localhost ([2a00:1370:812d:8d4d:8d84:163e:25b3:1177]) by smtp.gmail.com with ESMTPSA id d3sm1877346lfv.9.2021.05.25.18.26.04 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 25 May 2021 18:26:05 -0700 (PDT) From: Valerii Zapodovnikov To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 May 2021 04:26:02 +0300 Message-Id: <20210526012603.12511-1-val.zapod.vz@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] pixfmt: fixed wrong fix of comment 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cDwAOtuzgiSR This mostly reverts 785bfb1d7bb8de567c3aac1d9cc369b55ac9fb7b. But I also added some clarifications so that nobody mixes primaries with matrix again. SMPTE 240 and 170 primaires are the same, while matrix coeff. are different, because 240 is derived from 170's new primaries and white point while 170 uses BT.601 derived from BT.470 System M (yes, with Illuminant C) a.k.a. NTSC 1953. Some nits too. --- libavutil/pixfmt.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 30591133a4..9513e88389 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -443,25 +443,25 @@ enum AVPixelFormat { /** * Chromaticity coordinates of the source primaries. - * These values match the ones defined by ISO/IEC 23001-8_2013 § 7.1. + * These values match the ones defined by ISO/IEC 23001-8_2013 § 7.1 and ITU-T H.273. */ enum AVColorPrimaries { AVCOL_PRI_RESERVED0 = 0, - AVCOL_PRI_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B + AVCOL_PRI_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP 177 Annex B AVCOL_PRI_UNSPECIFIED = 2, AVCOL_PRI_RESERVED = 3, AVCOL_PRI_BT470M = 4, ///< also FCC Title 47 Code of Federal Regulations 73.682 (a)(20) AVCOL_PRI_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM AVCOL_PRI_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC - AVCOL_PRI_SMPTE240M = 7, ///< functionally identical to above + AVCOL_PRI_SMPTE240M = 7, ///< identical to above, also called "SMPTE C" even though it uses D65 AVCOL_PRI_FILM = 8, ///< colour filters using Illuminant C AVCOL_PRI_BT2020 = 9, ///< ITU-R BT2020 AVCOL_PRI_SMPTE428 = 10, ///< SMPTE ST 428-1 (CIE 1931 XYZ) AVCOL_PRI_SMPTEST428_1 = AVCOL_PRI_SMPTE428, AVCOL_PRI_SMPTE431 = 11, ///< SMPTE ST 431-2 (2011) / DCI P3 AVCOL_PRI_SMPTE432 = 12, ///< SMPTE ST 432-1 (2010) / P3 D65 / Display P3 - AVCOL_PRI_EBU3213 = 22, ///< EBU Tech. 3213-E / JEDEC P22 phosphors + AVCOL_PRI_EBU3213 = 22, ///< EBU Tech. 3213-E (nothing there) / one of JEDEC P22 group phosphors AVCOL_PRI_JEDEC_P22 = AVCOL_PRI_EBU3213, AVCOL_PRI_NB ///< Not part of ABI }; @@ -500,15 +500,15 @@ enum AVColorTransferCharacteristic { * These values match the ones defined by ISO/IEC 23001-8_2013 § 7.3. */ enum AVColorSpace { - AVCOL_SPC_RGB = 0, ///< order of coefficients is actually GBR, also IEC 61966-2-1 (sRGB) - AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B + AVCOL_SPC_RGB = 0, ///< order of coefficients is actually GBR, also IEC 61966-2-1 (sRGB), YZX and ST 428-1 + AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / derived in SMPTE RP177 Annex B AVCOL_SPC_UNSPECIFIED = 2, - AVCOL_SPC_RESERVED = 3, + AVCOL_SPC_RESERVED = 3, ///< reserved for future use by ITU-T and ISO/IEC just like 15-255 are AVCOL_SPC_FCC = 4, ///< FCC Title 47 Code of Federal Regulations 73.682 (a)(20) AVCOL_SPC_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601 - AVCOL_SPC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC - AVCOL_SPC_SMPTE240M = 7, ///< functionally identical to above - AVCOL_SPC_YCGCO = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16 + AVCOL_SPC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above + AVCOL_SPC_SMPTE240M = 7, ///< derived from 170M primairies and D65 white point, 170M is derived from BT470 System M + AVCOL_SPC_YCGCO = 8, ///< used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16 AVCOL_SPC_YCOCG = AVCOL_SPC_YCGCO, AVCOL_SPC_BT2020_NCL = 9, ///< ITU-R BT2020 non-constant luminance system AVCOL_SPC_BT2020_CL = 10, ///< ITU-R BT2020 constant luminance system @@ -530,7 +530,7 @@ enum AVColorSpace { * recommended, as it also defines the full range representation. * * Common definitions: - * - For RGB and luminance planes such as Y in YCbCr and I in ICtCp, + * - For RGB and luma planes such as Y in YCbCr and I in ICtCp, * 'E' is the original value in range of 0.0 to 1.0. * - For chrominance planes such as Cb,Cr and Ct,Cp, 'E' is the original * value in range of -0.5 to 0.5. @@ -544,13 +544,13 @@ enum AVColorRange { /** * Narrow or limited range content. * - * - For luminance planes: + * - For luma planes: * * (219 * E + 16) * 2^(n-8) * * F.ex. the range of 16-235 for 8 bits * - * - For chrominance planes: + * - For chroma planes: * * (224 * E + 128) * 2^(n-8) * @@ -561,13 +561,13 @@ enum AVColorRange { /** * Full range content. * - * - For RGB and luminance planes: + * - For RGB and luma planes: * * (2^n - 1) * E * * F.ex. the range of 0-255 for 8 bits * - * - For chrominance planes: + * - For chroma planes: * * (2^n - 1) * E + 2^(n - 1) *