[Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/11/04 07:59:19

Modified files:
        .              : ChangeLog 
        backend        : render_handler_ogl.cpp 

Log message:
        Added matrix for YUV->RGB-conversion.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1507&r2=1.1508
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1507
retrieving revision 1.1508
diff -u -b -r1.1507 -r1.1508
--- ChangeLog   4 Nov 2006 01:37:15 -0000       1.1507
+++ ChangeLog   4 Nov 2006 07:59:19 -0000       1.1508
@@ -1,3 +1,7 @@
+2006-11-04 Markus Gothe <address@hidden>
+
+       * backend/render_handler_ogl.cpp: Added matrix for YUV->RGB-conversion.
+
 2006-11-03 Sandro Santilli <address@hidden>
 
        * server/parser/button_character_def.{cpp,h}: fixed last

Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- backend/render_handler_ogl.cpp      3 Nov 2006 21:50:34 -0000       1.48
+++ backend/render_handler_ogl.cpp      4 Nov 2006 07:59:19 -0000       1.49
@@ -6,7 +6,7 @@
 // A render_handler that uses SDL & OpenGL
 
 
-/* $Id: render_handler_ogl.cpp,v 1.48 2006/11/03 21:50:34 nihilus Exp $ */
+/* $Id: render_handler_ogl.cpp,v 1.49 2006/11/04 07:59:19 nihilus Exp $ */
 
 //#include "gnash.h"
 #include "render_handler.h"
@@ -60,9 +60,15 @@
 };
 // YUV_video_ogl declaration
 
-// TODO: Implement this usiging glVertex or similiar...
+// TODO: Implement this usiging glMatrix*().
 
 static GLfloat yuv2rgb[2][4] = {{0.500000f, 0.413650f, 0.944700f, 0.f},        
{0.851850f, 0.320550f, 0.500000f, 1.f}};
+static GLfloat yuv2rgbmatrix[16] = {
+       1, 1, 1, 0,
+       0, -0.344136, 1.773, 0,
+       1.402, -0.714136, 0, 0,
+       0, 0, 0, 0
+};
 static GLint iquad[] = {-1, 1, 1, 1, 1, -1, -1, -1};
 
 class YUV_video_ogl : public gnash::YUV_video
@@ -93,6 +99,8 @@
 
        private:
 
+               GLuint texids[NB_TEXS];
+               
                void YUV_tex_params()
                {
                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, 
GL_CLAMP_TO_EDGE);
@@ -300,8 +308,6 @@
                        }
                }
 
-               GLuint texids[NB_TEXS];
-
 };
 
 class render_handler_ogl : public gnash::triangulating_render_handler
@@ -693,7 +699,7 @@
                            // Very simple texture: 2 texels wide, 1 texel high.
                            // Both texels are white; left texel is all clear, 
right texel is all opaque.
                            unsigned char       edge_data[8] = { 255, 255, 255, 
0, 255, 255, 255, 255 };
-                           unsigned int        s_edge_texture_id = 0;
+                           GLuint s_edge_texture_id = 0;
 
                            glActiveTextureARB(GL_TEXTURE1_ARB);
                            glEnable(GL_TEXTURE_2D);