[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: |
Udo Giacomozzi |
|
Subject: |
[Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp ... |
|
Date: |
Sat, 28 Oct 2006 11:41:11 +0000 |
CVSROOT: /cvsroot/gnash
Module name: gnash
Changes by: Udo Giacomozzi <udog> 06/10/28 11:41:11
Modified files:
. : ChangeLog
backend : render_handler_ogl.cpp
server : Makefile.am video_stream_instance.cpp
server/parser : Makefile.am
Log message:
Extended makefiles, moved YUV_video to it's own file so that Gnash
compiles again for other backends
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1431&r2=1.1432
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&r1=1.10&r2=1.11
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.1431
retrieving revision 1.1432
diff -u -b -r1.1431 -r1.1432
--- ChangeLog 28 Oct 2006 10:05:34 -0000 1.1431
+++ ChangeLog 28 Oct 2006 11:41:10 -0000 1.1432
@@ -2,6 +2,10 @@
* backend/render_handler_agg.cpp: added bogus YUV_video to make
it compile again; fixed some warnings
+ * backend/render_handler_ogl.cpp, server/Makefile.am,
+ server/video_stream_instance.cpp, server/parser/Makefile.am:
+ Extended makefiles, moved YUV_video to it's own file so that
+ Gnash compiles again for other backends
2006-10-28 Markus Gothe <address@hidden>
Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- backend/render_handler_ogl.cpp 28 Oct 2006 09:19:40 -0000 1.39
+++ backend/render_handler_ogl.cpp 28 Oct 2006 11:41:11 -0000 1.40
@@ -6,7 +6,7 @@
// A render_handler that uses SDL & OpenGL
-/* $Id: render_handler_ogl.cpp,v 1.39 2006/10/28 09:19:40 nihilus Exp $ */
+/* $Id: render_handler_ogl.cpp,v 1.40 2006/10/28 11:41:11 udog Exp $ */
//#include "gnash.h"
#include "render_handler.h"
@@ -64,87 +64,6 @@
};
// YUV_video_ogl declaration
-enum {Y, U, V, T, NB_TEXS};
-
-YUV_video::YUV_video(int w, int h):
- m_width(w),
- m_height(h)
- {
- planes[Y].w = m_width;
- planes[Y].h = m_height;
- planes[Y].size = m_width * m_height;
- planes[Y].offset = 0;
-
- planes[U] = planes[Y];
- planes[U].w >>= 1;
- planes[U].h >>= 1;
- planes[U].size >>= 2;
- planes[U].offset = planes[Y].size;
-
- planes[V] = planes[U];
- planes[V].offset += planes[U].size;
-
- m_size = planes[Y].size + (planes[U].size << 1);
-
- for (int i = 0; i < 3; ++i)
- {
- planes[i].id = 0; //texids[i];
-
- unsigned int ww = planes[i].w;
- unsigned int hh = planes[i].h;
- planes[i].unit = 0; // i[units];
- planes[i].p2w = (ww & (ww - 1)) ? video_nlpo2(ww) : ww;
- planes[i].p2h = (hh & (hh - 1)) ? video_nlpo2(hh) : hh;
- float tw = (double) ww / planes[i].p2w;
- float th = (double) hh / planes[i].p2h;
-
- planes[i].coords[0][0] = 0.0;
- planes[i].coords[0][1] = 0.0;
- planes[i].coords[1][0] = tw;
- planes[i].coords[1][1] = 0.0;
- planes[i].coords[2][0] = tw;
- planes[i].coords[2][1] = th;
- planes[i].coords[3][0] = 0.0;
- planes[i].coords[3][1] = th;
- }
-
- m_data = new uint8_t[m_size];
-
-// m_bounds->m_x_min = 0.0f;
-// m_bounds->m_x_max = 1.0f;
-// m_bounds->m_y_min = 0.0f;
-// m_bounds->m_y_max = 1.0f;
- }
-
- YUV_video::~YUV_video()
- {
- if (m_data) delete [] m_data;
- }
-
- unsigned int YUV_video::video_nlpo2(unsigned int x) const
- {
- x |= (x >> 1);
- x |= (x >> 2);
- x |= (x >> 4);
- x |= (x >> 8);
- x |= (x >> 16);
- return x + 1;
- }
-
- void YUV_video::update(uint8_t* data)
- {
- memcpy(m_data, data, m_size);
- }
-
- int YUV_video::size() const
- {
- return m_size;
- }
-
- void YUV_video::display(const matrix* m, const rect* bounds)
- {
- }
-
static GLfloat yuv2rgb[2][4] = {{0.500000f, 0.413650f, 0.944700f, 0.f},
{0.851850f, 0.320550f, 0.500000f, 1.f}};
static GLint iquad[] = {-1, 1, 1, 1, 1, -1, -1, -1};
Index: server/Makefile.am
===================================================================
RCS file: /cvsroot/gnash/gnash/server/Makefile.am,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- server/Makefile.am 26 Oct 2006 22:46:33 -0000 1.80
+++ server/Makefile.am 28 Oct 2006 11:41:11 -0000 1.81
@@ -36,7 +36,7 @@
#
#
-# $Id: Makefile.am,v 1.80 2006/10/26 22:46:33 strk Exp $
+# $Id: Makefile.am,v 1.81 2006/10/28 11:41:11 udog Exp $
AUTOMAKE_OPTIONS =
@@ -114,6 +114,8 @@
swf/TagLoadersTable.cpp \
swf/tag_loaders.cpp \
types.cpp \
+ video_yuv.cpp \
+ video_stream_instance.cpp \
$(NULL)
noinst_HEADERS = \
Index: server/video_stream_instance.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/video_stream_instance.cpp 27 Oct 2006 14:26:42 -0000 1.1
+++ server/video_stream_instance.cpp 28 Oct 2006 11:41:11 -0000 1.2
@@ -4,7 +4,7 @@
#include "as_value.h"
#include "NetStream.h"
#include "render.h"
-#include <SDL.h>
+//#include <SDL.h>
namespace gnash {
Index: server/parser/Makefile.am
===================================================================
RCS file: /cvsroot/gnash/gnash/server/parser/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/parser/Makefile.am 15 Oct 2006 09:11:20 -0000 1.10
+++ server/parser/Makefile.am 28 Oct 2006 11:41:11 -0000 1.11
@@ -36,7 +36,7 @@
#
#
-# $Id: Makefile.am,v 1.10 2006/10/15 09:11:20 nihilus Exp $
+# $Id: Makefile.am,v 1.11 2006/10/28 11:41:11 udog Exp $
AUTOMAKE_OPTIONS =
@@ -81,7 +81,8 @@
movie_def_impl.cpp \
morph2_character_def.cpp \
shape_character_def.cpp \
- sprite_definition.cpp
+ sprite_definition.cpp \
+ video_stream_def.cpp
noinst_HEADERS = \
action_buffer.h \