History

[media] v4l2-tpg-core: drop SYCC, use higher precision 601 conversion matrix

The SYCC Y'CbCr encoding is identical to the 601 encoding. Since the SYCC define is about to be removed for use in the kernel we need to drop it in the TPG code as well. This patch also adds a 4th decimal to the 601 conversion matrix. That was specified by the sYCC spec and it makes sense to use this across the board. [mchehab@s-opensource.com: fix conflicts with LaTeX math expression patch] Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>

Hans Verkuil committed 10 years ago

Commit 9ddbf681 parent 1ee6dd52 files · +21 −23Browse files

Unified · Split

2 files
  1. Documentation/media/uapi/v4l/pixfmt-007.rst +15 −15
  2. drivers/media/common/v4l2-tpg/v4l2-tpg-core.c +6 −8
Documentation/media/uapi/v4l/pixfmt-007.rst+15−15
@@ -97,11 +97,11 @@ the following ``V4L2_YCBCR_ENC_601`` encoding: · 96 unmodified lines
9797
9898 .. math::
9999
100− Y' = 0.299R' + 0.587G' + 0.114B'
100+ Y' = 0.2990R' + 0.5870G' + 0.1140B'
101101
102− Cb = -0.169R' - 0.331G' + 0.5B'
102+ Cb = -0.1687R' - 0.3313G' + 0.5B'
103103
104− Cr = 0.5R' - 0.419G' - 0.081B'
104+ Cr = 0.5R' - 0.4187G' - 0.0813B'
105105
106106 Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range
107107 [-0.5…0.5]. This conversion to Y'CbCr is identical to the one defined in
@@ -241,11 +241,11 @@ scaled and offset: · 133 unmodified lines
241241
242242 .. math::
243243
244− Y' = \frac{219}{256} * (0.299R' + 0.587G' + 0.114B') + \frac{16}{256}
244+ Y' = \frac{219}{256} * (0.2990R' + 0.5870G' + 0.1140B') + \frac{16}{256}
245245
246− Cb = \frac{224}{256} * (-0.169R' - 0.331G' + 0.5B')
246+ Cb = \frac{224}{256} * (-0.1687R' - 0.3313G' + 0.5B')
247247
248− Cr = \frac{224}{256} * (0.5R' - 0.419G' - 0.081B')
248+ Cr = \frac{224}{256} * (0.5R' - 0.4187G' - 0.0813B')
249249
250250 Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range
251251 [-0.5…0.5]. The non-standard xvYCC 709 or xvYCC 601 encodings can be
@@ -440,11 +440,11 @@ the following ``V4L2_YCBCR_ENC_601`` encoding: · 188 unmodified lines
440440
441441 .. math::
442442
443− Y' = 0.299R' + 0.587G' + 0.114B'
443+ Y' = 0.2990R' + 0.5870G' + 0.1140B'
444444
445− Cb = -0.169R' - 0.331G' + 0.5B'
445+ Cb = -0.1687R' - 0.3313G' + 0.5B'
446446
447− Cr = 0.5R' - 0.419G' - 0.081B'
447+ Cr = 0.5R' - 0.4187G' - 0.0813B'
448448
449449 Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range
450450 [-0.5…0.5]. This transform is identical to one defined in SMPTE
@@ -842,11 +842,11 @@ the following ``V4L2_YCBCR_ENC_601`` encoding: · 391 unmodified lines
842842
843843 .. math::
844844
845− Y' = 0.299R' + 0.587G' + 0.114B'
845+ Y' = 0.2990R' + 0.5870G' + 0.1140B'
846846
847− Cb = -0.169R' - 0.331G' + 0.5B'
847+ Cb = -0.1687R' - 0.3313G' + 0.5B'
848848
849− Cr = 0.5R' - 0.419G' - 0.081B'
849+ Cr = 0.5R' - 0.4187G' - 0.0813B'
850850
851851 Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range
852852 [-0.5…0.5]. The Y'CbCr quantization is limited range. This transform is
@@ -940,11 +940,11 @@ the following ``V4L2_YCBCR_ENC_601`` encoding: · 87 unmodified lines
940940
941941 .. math::
942942
943− Y' = 0.299R' + 0.587G' + 0.114B'
943+ Y' = 0.2990R' + 0.5870G' + 0.1140B'
944944
945− Cb = -0.169R' - 0.331G' + 0.5B'
945+ Cb = -0.1687R' - 0.3313G' + 0.5B'
946946
947− Cr = 0.5R' - 0.419G' - 0.081B'
947+ Cr = 0.5R' - 0.4187G' - 0.0813B'
948948
949949 Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range
950950 [-0.5…0.5]. The Y'CbCr quantization is limited range. This transform is
drivers/media/common/v4l2-tpg/v4l2-tpg-core.c+6−8
@@ -504,14 +504,14 @@ static void color_to_ycbcr(struct tpg_data *tpg, int r, int g, int b, · 503 unmodified lines
504504 #define COEFF(v, r) ((int)(0.5 + (v) * (r) * 256.0))
505505
506506 static const int bt601[3][3] = {
507− { COEFF(0.299, 219), COEFF(0.587, 219), COEFF(0.114, 219) },
508− { COEFF(-0.169, 224), COEFF(-0.331, 224), COEFF(0.5, 224) },
509− { COEFF(0.5, 224), COEFF(-0.419, 224), COEFF(-0.081, 224) },
507+ { COEFF(0.299, 219), COEFF(0.587, 219), COEFF(0.114, 219) },
508+ { COEFF(-0.1687, 224), COEFF(-0.3313, 224), COEFF(0.5, 224) },
509+ { COEFF(0.5, 224), COEFF(-0.4187, 224), COEFF(-0.0813, 224) },
510510 };
511511 static const int bt601_full[3][3] = {
512− { COEFF(0.299, 255), COEFF(0.587, 255), COEFF(0.114, 255) },
513− { COEFF(-0.169, 255), COEFF(-0.331, 255), COEFF(0.5, 255) },
514− { COEFF(0.5, 255), COEFF(-0.419, 255), COEFF(-0.081, 255) },
512+ { COEFF(0.299, 255), COEFF(0.587, 255), COEFF(0.114, 255) },
513+ { COEFF(-0.1687, 255), COEFF(-0.3313, 255), COEFF(0.5, 255) },
514+ { COEFF(0.5, 255), COEFF(-0.4187, 255), COEFF(-0.0813, 255) },
515515 };
516516 static const int rec709[3][3] = {
517517 { COEFF(0.2126, 219), COEFF(0.7152, 219), COEFF(0.0722, 219) },
@@ -558,7 +558,6 @@ static void color_to_ycbcr(struct tpg_data *tpg, int r, int g, int b, · 40 unmodified lines
558558
559559 switch (tpg->real_ycbcr_enc) {
560560 case V4L2_YCBCR_ENC_601:
561− case V4L2_YCBCR_ENC_SYCC:
562561 rgb2ycbcr(full ? bt601_full : bt601, r, g, b, y_offset, y, cb, cr);
563562 break;
564563 case V4L2_YCBCR_ENC_XV601:
@@ -674,7 +673,6 @@ static void ycbcr_to_color(struct tpg_data *tpg, int y, int cb, int cr, · 109 unmodified lines
674673
675674 switch (tpg->real_ycbcr_enc) {
676675 case V4L2_YCBCR_ENC_601:
677− case V4L2_YCBCR_ENC_SYCC:
678676 ycbcr2rgb(full ? bt601_full : bt601, y, cb, cr, y_offset, r, g, b);
679677 break;
680678 case V4L2_YCBCR_ENC_XV601:

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t