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

Side by Side Diff: media/tools/player_x11/gl_video_renderer.cc

Issue 19622002: Use a direct include of the message_loop header in media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/tools/player_x11/gl_video_renderer.h" 5 #include "media/tools/player_x11/gl_video_renderer.h"
6 6
7 #include <X11/Xutil.h> 7 #include <X11/Xutil.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "media/base/buffers.h" 11 #include "media/base/buffers.h"
12 #include "media/base/video_frame.h" 12 #include "media/base/video_frame.h"
13 #include "media/base/yuv_convert.h" 13 #include "media/base/yuv_convert.h"
14 #include "ui/gl/gl_implementation.h" 14 #include "ui/gl/gl_implementation.h"
15 15
16 enum { kNumYUVPlanes = 3 }; 16 enum { kNumYUVPlanes = 3 };
17 17
18 static GLXContext InitGLContext(Display* display, Window window) { 18 static GLXContext InitGLContext(Display* display, Window window) {
19 // Some versions of NVIDIA's GL libGL.so include a broken version of 19 // Some versions of NVIDIA's GL libGL.so include a broken version of
20 // dlopen/dlsym, and so linking it into chrome breaks it. So we dynamically 20 // dlopen/dlsym, and so linking it into chrome breaks it. So we dynamically
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 verts[0] = x0; verts[1] = y0; 248 verts[0] = x0; verts[1] = y0;
249 verts[2] = x0; verts[3] = y1; 249 verts[2] = x0; verts[3] = y1;
250 verts[4] = x1; verts[5] = y0; 250 verts[4] = x1; verts[5] = y0;
251 verts[6] = x1; verts[7] = y1; 251 verts[6] = x1; verts[7] = y1;
252 glVertexAttribPointer(tc_location, 2, GL_FLOAT, GL_FALSE, 0, verts); 252 glVertexAttribPointer(tc_location, 2, GL_FLOAT, GL_FALSE, 0, verts);
253 253
254 // We are getting called on a thread. Release the context so that it can be 254 // We are getting called on a thread. Release the context so that it can be
255 // made current on the main thread. 255 // made current on the main thread.
256 glXMakeCurrent(display_, 0, NULL); 256 glXMakeCurrent(display_, 0, NULL);
257 } 257 }
OLDNEW
« no previous file with comments | « media/tools/demuxer_bench/demuxer_bench.cc ('k') | media/tools/player_x11/x11_video_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698