[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp
From: |
Tomas Groth |
Subject: |
[Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp |
Date: |
Mon, 25 Dec 2006 12:29:08 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Tomas Groth <tgc> 06/12/25 12:29:08
Modified files:
. : ChangeLog
backend : render_handler_ogl.cpp
Log message:
* backend/render_handler_ogl.cpp: Made the OpenGl backend
actually use RGB for video...
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2001&r2=1.2002
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.61&r2=1.62
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2001
retrieving revision 1.2002
diff -u -b -r1.2001 -r1.2002
--- ChangeLog 24 Dec 2006 21:56:19 -0000 1.2001
+++ ChangeLog 25 Dec 2006 12:29:07 -0000 1.2002
@@ -1,3 +1,8 @@
+2006-12-25 Tomas Groth Christensen <address@hidden>
+
+ * backend/render_handler_ogl.cpp: Made the OpenGl backend
+ actually use RGB for video...
+
2006-12-24 Sandro Santilli <address@hidden>
* server/swf.h: add name for tag 777 (from a contribution to Ming).
Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- backend/render_handler_ogl.cpp 23 Dec 2006 16:03:56 -0000 1.61
+++ backend/render_handler_ogl.cpp 25 Dec 2006 12:29:08 -0000 1.62
@@ -6,7 +6,7 @@
// A render_handler that uses SDL & OpenGL
-/* $Id: render_handler_ogl.cpp,v 1.61 2006/12/23 16:03:56 tgc Exp $ */
+/* $Id: render_handler_ogl.cpp,v 1.62 2006/12/25 12:29:08 tgc Exp $ */
//#include "gnash.h"
#include "render_handler.h"
@@ -343,11 +343,11 @@
delete bi;
}
-#define GLYUV
+#define GLYUV 0
// Returns the format the current renderer wants videoframes in.
int videoFrameFormat() {
-#ifdef GLYUV
+#if GLYUV
return YUV;
#else
return RGB;
@@ -356,7 +356,7 @@
/// Draws the video frames
void drawVideoFrame(image::image_base* baseframe, const matrix* m,
const rect* bounds){
-#ifdef GLYUV
+#if GLYUV
image::yuv* frame = static_cast<image::yuv*>(baseframe);
#else
image::rgb* frame = static_cast<image::rgb*>(baseframe);
@@ -372,7 +372,7 @@
glMatrixMode(GL_COLOR);
glPushMatrix();
-#ifdef GLYUV
+#if GLYUV
glLoadMatrixf(yuv_rgb);
glPixelTransferf(GL_GREEN_BIAS, -0.5f);
glPixelTransferf(GL_BLUE_BIAS, -0.5f);
@@ -392,7 +392,7 @@
float h_bounds = TWIPS_TO_PIXELS(c.m_y - a.m_y);
unsigned char* ptr = frame->m_data;
-#ifdef GLYUV
+#if GLYUV
GLenum rgb[3] = {GL_RED, GL_GREEN, GL_BLUE};
float xpos = a.m_x < 0 ? 0.0f : a.m_x; //hack