Merge remote-tracking branch 'origin/5.9' into 5.10

Change-Id: I7566f543ce11ff6cddc4d17e2c258a582f365b65

1 files changed, 4 insertions, 14 deletions

diff --git a/src/qtmultimediaquicktools/shaders/yuyvvideo.frag b/src/qtmultimediaquicktools/shaders/yuyvvideo.frag
index 72732cd66..5ce8b7366 100644
--- a/src/qtmultimediaquicktools/shaders/yuyvvideo.frag
+++ b/src/qtmultimediaquicktools/shaders/yuyvvideo.frag
@@ -1,22 +1,12 @@
-uniform sampler2D yuvTexture; // YUYV macropixel texture passed as RGBA format
-uniform mediump float imageWidth; // The YUYV texture appears to the shader with 1/2 the image width since we use the RGBA format to pass YUYV
+uniform sampler2D yTexture; // Y component passed as GL_LUMINANCE_ALPHA, in yuyv Y = r
+uniform sampler2D uvTexture; // UV component passed as RGBA macropixel, in uyvy U = g, V = a
 uniform mediump mat4 colorMatrix;
 uniform lowp float opacity;
-
 varying highp vec2 qt_TexCoord;
 
 void main()
 {
-   // For Y0 U0 Y1 V0  macropixel, lookup Y0 or Y1 based on whether
-   // the original texture x coord is even or odd.
-   mediump float Y;
-   if (fract(floor(qt_TexCoord.x * imageWidth + 0.5) / 2.0) > 0.0)
-       Y = texture2D(yuvTexture, qt_TexCoord).b;       // odd so choose Y1
-   else
-       Y = texture2D(yuvTexture, qt_TexCoord).r;       // even so choose Y0
-   mediump float Cb = texture2D(yuvTexture, qt_TexCoord).g;
-   mediump float Cr = texture2D(yuvTexture, qt_TexCoord).a;
+    mediump vec3 YUV = vec3(texture2D(yTexture, qt_TexCoord).r, texture2D(uvTexture, qt_TexCoord).ga);
 
-   mediump vec4 color = vec4(Y, Cb, Cr, 1.0);
-   gl_FragColor = colorMatrix * color * opacity;
+    gl_FragColor = colorMatrix * vec4(YUV, 1.0) * opacity;
 }