Index: media/tools/player_x11/player_x11.cc |
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc |
index e6f05bf317098b10e18e105f10a4c258d699d6a6..170355828b8e49a64e80ec116a1d1d80612ad22e 100644 |
--- a/media/tools/player_x11/player_x11.cc |
+++ b/media/tools/player_x11/player_x11.cc |
@@ -83,18 +83,15 @@ void SetOpaque(bool /*opaque*/) { |
} |
typedef base::Callback<void(media::VideoFrame*)> PaintCB; |
-void Paint(MessageLoop* message_loop, const PaintCB& paint_cb) { |
+void Paint(MessageLoop* message_loop, const PaintCB& paint_cb, |
+ const scoped_refptr<media::VideoFrame>& video_frame) { |
if (message_loop != MessageLoop::current()) { |
message_loop->PostTask(FROM_HERE, base::Bind( |
- &Paint, message_loop, paint_cb)); |
+ &Paint, message_loop, paint_cb, video_frame)); |
return; |
} |
- scoped_refptr<media::VideoFrame> video_frame; |
- g_video_renderer->GetCurrentFrame(&video_frame); |
acolwell GONE FROM CHROMIUM
2013/02/01 00:24:34
I think g_video_renderer can go away now.
Perhap
scherkus (not reviewing)
2013/02/01 22:45:25
Done.
|
- if (video_frame) |
- paint_cb.Run(video_frame); |
- g_video_renderer->PutCurrentFrame(video_frame); |
+ paint_cb.Run(video_frame); |
} |
static void OnBufferingState(media::Pipeline::BufferingState buffering_state) {} |