Index: content/common/gpu/media/video_decode_accelerator_unittest.cc |
=================================================================== |
--- content/common/gpu/media/video_decode_accelerator_unittest.cc (revision 120554) |
+++ content/common/gpu/media/video_decode_accelerator_unittest.cc (working copy) |
@@ -154,10 +154,14 @@ |
// Platform specific display surface returned here. |
EGLDisplay PlatformGetDisplay(); |
+ Display* get_native_disp() { return x_display_; } |
+ |
EGLDisplay egl_display() { return egl_display_; } |
EGLContext egl_context() { return egl_context_; } |
+ EGLSurface egl_surface(int w_id) { return egl_surfaces_[w_id]; } |
+ |
MessageLoop* message_loop() { return message_loop_; } |
protected: |
@@ -569,8 +573,12 @@ |
ClientState state() { return state_; } |
int num_done_bitstream_buffers() { return num_done_bitstream_buffers_; } |
int num_decoded_frames() { return num_decoded_frames_; } |
+ Display* get_native_disp() { return rendering_helper_->get_native_disp(); } |
EGLDisplay egl_display() { return rendering_helper_->egl_display(); } |
EGLContext egl_context() { return rendering_helper_->egl_context(); } |
+ EGLSurface egl_surface(int w_id) { |
+ return rendering_helper_->egl_surface(w_id); |
+ } |
double frames_per_second(); |
bool decoder_deleted() { return !decoder_; } |
@@ -655,7 +663,9 @@ |
#else // OS_WIN |
scoped_refptr<OmxVideoDecodeAccelerator> decoder = |
new OmxVideoDecodeAccelerator(this); |
- decoder->SetEglState(egl_display(), egl_context()); |
+ decoder->SetEglState(get_native_disp(), |
+ egl_display(), egl_context(), |
+ egl_surface(rendering_window_id_) ); |
#endif // OS_WIN |
decoder_ = decoder.release(); |
SetState(CS_DECODER_SET); |