OMX: Make context current before using EGLImage functions.

content/common/gpu/media/omx_video_decode_accelerator.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_OMX_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_OMX_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <dlfcn.h>
 #include <map>
 #include <queue>
@@ skipping 20 matching lines @@
 // The implementation assumes an OpenMAX IL 1.1.2 implementation conforming to
 // http://www.khronos.org/registry/omxil/specs/OpenMAX_IL_1_1_2_Specification.pdf
 //
 // This class lives on a single thread (the GPU process ChildThread) and DCHECKs
 // that it is never accessed from any other.  OMX callbacks are trampolined from
 // the OMX component's thread to maintain this invariant, using |weak_this()|.
 class CONTENT_EXPORT OmxVideoDecodeAccelerator :
     public media::VideoDecodeAccelerator {
  public:
   // Does not take ownership of |client| which must outlive |*this|.
-  OmxVideoDecodeAccelerator(EGLDisplay egl_display, EGLContext egl_context,
-                            media::VideoDecodeAccelerator::Client* client);
+  OmxVideoDecodeAccelerator(
+      EGLDisplay egl_display, EGLContext egl_context,
+      media::VideoDecodeAccelerator::Client* client,
+      const base::Callback<bool(void)>& make_context_current);
   virtual ~OmxVideoDecodeAccelerator();
 
   // media::VideoDecodeAccelerator implementation.
   bool Initialize(media::VideoCodecProfile profile) OVERRIDE;
   void Decode(const media::BitstreamBuffer& bitstream_buffer) OVERRIDE;
   virtual void AssignPictureBuffers(
       const std::vector<media::PictureBuffer>& buffers) OVERRIDE;
   void ReusePictureBuffer(int32 picture_buffer_id) OVERRIDE;
   void Flush() OVERRIDE;
   void Reset() OVERRIDE;
@@ skipping 121 matching lines @@
   OMX_U32 output_port_;
   int output_buffers_at_component_;
 
   gfx::Size last_requested_picture_buffer_dimensions_;
 
   // NOTE: someday there may be multiple contexts for a single decoder.  But not
   // today.
   // TODO(fischman,vrk): handle lost contexts?
   EGLDisplay egl_display_;
   EGLContext egl_context_;
+  base::Callback<bool(void)> make_context_current_;
 
   // Free input OpenMAX buffers that can be used to take bitstream from demuxer.
   std::queue<OMX_BUFFERHEADERTYPE*> free_input_buffers_;
 
   // For output buffer recycling cases.
   OutputPictureById pictures_;
 
   // To kick the component from Loaded to Idle before we know the real size of
   // the video (so can't yet ask for textures) we populate it with fake output
   // buffers.  Keep track of them here.
@@ skipping 48 matching lines @@
                                     OMX_PTR event_data);
   static OMX_ERRORTYPE EmptyBufferCallback(OMX_HANDLETYPE component,
                                            OMX_PTR priv_data,
                                            OMX_BUFFERHEADERTYPE* buffer);
   static OMX_ERRORTYPE FillBufferCallback(OMX_HANDLETYPE component,
                                           OMX_PTR priv_data,
                                           OMX_BUFFERHEADERTYPE* buffer);
 };
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_OMX_VIDEO_DECODE_ACCELERATOR_H_