Merge 77608 - 2011-02-03 Victoria Kirst <vrk@google.com>...

Source/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 42 matching lines @@
 
 VideoLayerChromium::SharedValues::SharedValues(GraphicsContext3D* context)
     : m_context(context)
     , m_yuvShaderProgram(0)
     , m_rgbaShaderProgram(0)
     , m_yuvShaderMatrixLocation(0)
     , m_yuvWidthScaleFactorLocation(0)
     , m_rgbaShaderMatrixLocation(0)
     , m_rgbaWidthScaleFactorLocation(0)
     , m_ccMatrixLocation(0)
+    , m_signAdjLocation(0)
     , m_yTextureLocation(0)
     , m_uTextureLocation(0)
     , m_vTextureLocation(0)
     , m_rgbaTextureLocation(0)
     , m_yuvAlphaLocation(0)
     , m_rgbaAlphaLocation(0)
     , m_initialized(false)
 {
     // Frame textures are allocated based on stride width, not visible frame
     // width, such that there is a guarantee that the frame rows line up
@@ skipping 16 matching lines @@
         "}                            \n";
 
     char yuvFragmentShaderString[] =
         "precision mediump float;                             \n"
         "precision mediump int;                               \n"
         "varying vec2 v_texCoord;                             \n"
         "uniform sampler2D y_texture;                         \n"
         "uniform sampler2D u_texture;                         \n"
         "uniform sampler2D v_texture;                         \n"
         "uniform float alpha;                                 \n"
+        "uniform float adj;                                   \n"
         "uniform mat3 cc_matrix;                              \n"
         "void main()                                          \n"
         "{                                                    \n"
         "  float y = texture2D(y_texture, v_texCoord).x;      \n"
-        "  float u = texture2D(u_texture, v_texCoord).r - .5; \n"
-        "  float v = texture2D(v_texture, v_texCoord).r - .5; \n"
+        "  float u = texture2D(u_texture, v_texCoord).x - adj; \n"
+        "  float v = texture2D(v_texture, v_texCoord).x - adj; \n"
         "  vec3 rgb = cc_matrix * vec3(y, u, v);              \n"
-        "  gl_FragColor = vec4(rgb.x, rgb.y, rgb.z, 1.0) * alpha; \n"
+        "  gl_FragColor = vec4(rgb, float(1)) * alpha;        \n"
         "}                                                    \n";
 
     char rgbaFragmentShaderString[] =
         "precision mediump float;                             \n"
         "varying vec2 v_texCoord;                             \n"
         "uniform sampler2D rgba_texture;                      \n"
         "uniform float alpha;                                 \n"
         "void main()                                          \n"
         "{                                                    \n"
-        "  vec4 texColor = texture2D(rgba_texture, vec2(v_texCoord.x, 1.0 - v_texCoord.y)); \n"
+        "  vec4 texColor = texture2D(rgba_texture, vec2(v_texCoord.x, float(1) - v_texCoord.y)); \n"
         "  gl_FragColor = vec4(texColor.x, texColor.y, texColor.z, texColor.w) * alpha; \n"
         "}                                                    \n";
 
     m_rgbaShaderProgram = createShaderProgram(m_context, vertexShaderString, rgbaFragmentShaderString);
     if (!m_rgbaShaderProgram) {
         LOG_ERROR("VideoLayerChromium: Failed to create rgba shader program");
         return;
     }
 
     m_yuvShaderProgram = createShaderProgram(m_context, vertexShaderString, yuvFragmentShaderString);
     if (!m_yuvShaderProgram) {
         LOG_ERROR("VideoLayerChromium: Failed to create yuv shader program");
         return;
     }
 
     m_yuvShaderMatrixLocation = m_context->getUniformLocation(m_yuvShaderProgram, "matrix");
     m_yuvWidthScaleFactorLocation = m_context->getUniformLocation(m_yuvShaderProgram, "widthScaleFactor");
     m_yTextureLocation = m_context->getUniformLocation(m_yuvShaderProgram, "y_texture");
     m_uTextureLocation = m_context->getUniformLocation(m_yuvShaderProgram, "u_texture");
     m_vTextureLocation = m_context->getUniformLocation(m_yuvShaderProgram, "v_texture");
     m_ccMatrixLocation = m_context->getUniformLocation(m_yuvShaderProgram, "cc_matrix");
+    m_signAdjLocation = m_context->getUniformLocation(m_yuvShaderProgram, "adj");
     m_yuvAlphaLocation = m_context->getUniformLocation(m_yuvShaderProgram, "alpha");
 
     ASSERT(m_yuvShaderMatrixLocation != -1);
     ASSERT(m_yuvWidthScaleFactorLocation != -1);
     ASSERT(m_yTextureLocation != -1);
     ASSERT(m_uTextureLocation != -1);
     ASSERT(m_vTextureLocation != -1);
     ASSERT(m_ccMatrixLocation != -1);
+    ASSERT(m_signAdjLocation != -1);
     ASSERT(m_yuvAlphaLocation != -1);
 
     m_rgbaShaderMatrixLocation = m_context->getUniformLocation(m_rgbaShaderProgram, "matrix");
     m_rgbaTextureLocation = m_context->getUniformLocation(m_rgbaShaderProgram, "rgba_texture");
     m_rgbaWidthScaleFactorLocation = m_context->getUniformLocation(m_rgbaShaderProgram, "widthScaleFactor");
     m_rgbaAlphaLocation = m_context->getUniformLocation(m_rgbaShaderProgram, "alpha");
 
     ASSERT(m_rgbaShaderMatrixLocation != -1);
     ASSERT(m_rgbaTextureLocation != -1);
     ASSERT(m_rgbaWidthScaleFactorLocation != -1);
@@ skipping 212 matching lines @@
     layerRenderer()->useShader(sv->yuvShaderProgram());
     unsigned frameWidth = m_frameSizes[VideoFrameChromium::yPlane].width();
     unsigned textureWidth = m_textureSizes[VideoFrameChromium::yPlane].width();
     float widthScaleFactor = static_cast<float>(frameWidth) / textureWidth;
     GLC(context, context->uniform1f(sv->yuvWidthScaleFactorLocation(), widthScaleFactor));
 
     GLC(context, context->uniform1i(sv->yTextureLocation(), 1));
     GLC(context, context->uniform1i(sv->uTextureLocation(), 2));
     GLC(context, context->uniform1i(sv->vTextureLocation(), 3));
 
+    // This value of 0.5 maps to 128. It is used in the YUV to RGB conversion
+    // formula to turn unsigned u and v values to signed u and v values.
+    // This is loaded as a uniform because certain drivers have problems
+    // reading literal float values.
+    GLC(context, context->uniform1f(sv->signAdjLocation(), 0.5));
+
     GLC(context, context->uniformMatrix3fv(sv->ccMatrixLocation(), 0, const_cast<float*>(yuv2RGB), 1));
 
     drawTexturedQuad(context, layerRenderer()->projectionMatrix(), drawTransform(),
                      bounds().width(), bounds().height(), drawOpacity(),
                      sv->yuvShaderMatrixLocation(), sv->yuvAlphaLocation());
 
     // Reset active texture back to texture 0.
     GLC(context, context->activeTexture(GraphicsContext3D::TEXTURE0));
 }
 
@@ skipping 32 matching lines @@
     for (unsigned plane = 0; plane < frame->planes(); plane++) {
         m_textures[plane] = frame->texture(plane);
         m_textureSizes[plane] = frame->requiredTextureSize(plane);
         m_frameSizes[plane] = m_textureSizes[plane];
     }
 }
 
 } // namespace WebCore
 
 #endif // USE(ACCELERATED_COMPOSITING)