Skip to content

Commit ffcf7d3

Browse files
committed
vulkan yuv->rgb conv: mark coefs as BT.709
The values were marked as a placehoolder (as in GL) but are constants here, namely BT.709 so rename it as such.
1 parent f213c06 commit ffcf7d3

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

src/video_display/vulkan/shaders/UYVA16_conv.comp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ void main()
2222

2323
vec4 yuv = (texture(inputImage, textureCoords).grba) / 65535.0;
2424

25-
float Y_SCALED_PLACEHOLDER = 1.1643835;
26-
float R_CR_PLACEHOLDER = 1.7926522;
27-
float G_CB_PLACEHOLDER = -0.21323606;
28-
float G_CR_PLACEHOLDER = -0.5330038;
29-
float B_CB_PLACEHOLDER = 2.11242;
25+
float Y_SCALED = 1.1643835;
26+
float R_CR_709 = 1.7926522;
27+
float G_CB_709 = -0.21323606;
28+
float G_CR_709 = -0.5330038;
29+
float B_CB_709 = 2.11242;
3030

31-
yuv.r = Y_SCALED_PLACEHOLDER * (yuv.r - 0.0625);
31+
yuv.r = Y_SCALED * (yuv.r - 0.0625);
3232
yuv.g = yuv.g - 0.5;
3333
yuv.b = yuv.b - 0.5;
34-
float r = yuv.r + R_CR_PLACEHOLDER * yuv.b;
35-
float g = yuv.r + G_CB_PLACEHOLDER * yuv.g + G_CR_PLACEHOLDER * yuv.b;
36-
float b = yuv.r + B_CB_PLACEHOLDER * yuv.g;
34+
float r = yuv.r + R_CR_709 * yuv.b;
35+
float g = yuv.r + G_CB_709 * yuv.g + G_CR_709 * yuv.b;
36+
float b = yuv.r + B_CB_709 * yuv.g;
3737

3838
imageStore(resultImage, pixelCoords, vec4(r, g, b, 1.0));
3939
}

src/video_display/vulkan/shaders/UYVY8_conv.comp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ void main()
2525
yuv.r = yuv.a;
2626
}
2727

28-
float Y_SCALED_PLACEHOLDER = 1.1643835;
29-
float R_CR_PLACEHOLDER = 1.7926522;
30-
float G_CB_PLACEHOLDER = -0.21323606;
31-
float G_CR_PLACEHOLDER = -0.5330038;
32-
float B_CB_PLACEHOLDER = 2.11242;
28+
float Y_SCALED = 1.1643835;
29+
float R_CR_709 = 1.7926522;
30+
float G_CB_709 = -0.21323606;
31+
float G_CR_709 = -0.5330038;
32+
float B_CB_709 = 2.11242;
3333

34-
yuv.r = Y_SCALED_PLACEHOLDER * (yuv.r - 0.0625);
34+
yuv.r = Y_SCALED * (yuv.r - 0.0625);
3535
yuv.g = yuv.g - 0.5;
3636
yuv.b = yuv.b - 0.5;
37-
float r = yuv.r + R_CR_PLACEHOLDER * yuv.b;
38-
float g = yuv.r + G_CB_PLACEHOLDER * yuv.g + G_CR_PLACEHOLDER * yuv.b;
39-
float b = yuv.r + B_CB_PLACEHOLDER * yuv.g;
37+
float r = yuv.r + R_CR_709 * yuv.b;
38+
float g = yuv.r + G_CB_709 * yuv.g + G_CR_709 * yuv.b;
39+
float b = yuv.r + B_CB_709 * yuv.g;
4040

4141
imageStore(resultImage, pixelCoords, vec4(r, g, b, 1));
4242
}

0 commit comments

Comments
 (0)