Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1146)

Unified Diff: media/tools/player_x11/x11_video_renderer.h

Issue 596055: Implement GLES video renderer in player_x11 (Closed)
Patch Set: nits fixed Created 10 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/tools/player_x11/x11_video_renderer.h
diff --git a/media/tools/player_x11/x11_video_renderer.h b/media/tools/player_x11/x11_video_renderer.h
index ed94e6d754229d541cf9cea6399dbe64589d6e7c..84c7303ce4f1f54bcfe690ce83fc5b8ed1aa4a00 100644
--- a/media/tools/player_x11/x11_video_renderer.h
+++ b/media/tools/player_x11/x11_video_renderer.h
@@ -5,8 +5,6 @@
#ifndef MEDIA_TOOLS_PLAYER_X11_X11_VIDEO_RENDERER_H_
#define MEDIA_TOOLS_PLAYER_X11_X11_VIDEO_RENDERER_H_
-#include <GL/glew.h>
-#include <GL/glxew.h>
#include <X11/Xlib.h>
#include "base/lock.h"
@@ -26,12 +24,11 @@ class X11VideoRenderer : public media::VideoRendererBase {
// This method is called to paint the current video frame to the assigned
// window.
- void Paint();
+ virtual void Paint();
scherkus (not reviewing) 2010/02/12 01:04:20 this no longers need to be virtual
// media::FilterFactoryImpl2 Implementation.
static bool IsMediaFormatSupported(const media::MediaFormat& media_format);
- // Returns the instance of this class.
static X11VideoRenderer* instance() { return instance_; }
protected:
@@ -64,19 +61,6 @@ class X11VideoRenderer : public media::VideoRendererBase {
bool use_render_;
- bool use_gl_;
-
- // GL context.
- GLXContext gl_context_;
-
- // 3 textures, one for each plane.
- GLuint textures_[3];
-
- // Shaders and program for YUV->RGB conversion.
- GLuint vertex_shader_;
- GLuint fragment_shader_;
- GLuint program_;
-
static X11VideoRenderer* instance_;
DISALLOW_COPY_AND_ASSIGN(X11VideoRenderer);

Powered by Google App Engine
This is Rietveld 408576698