Revert 150007 - Only dlopen() OMX/VAAPI libs in the GPU process, and only lazily dlsym() their symb…

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 36 matching lines @@
   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;
   void Destroy() OVERRIDE;
 
   base::WeakPtr<OmxVideoDecodeAccelerator> weak_this() { return weak_this_; }
 
-  // Do any necessary initialization before the sandbox is enabled.
-  static void PreSandboxInitialization();
-
  private:
   // Because OMX state-transitions are described solely by the "state reached"
   // (3.1.2.9.1, table 3-7 of the spec), we track what transition was requested
   // using this enum.  Note that it is an error to request a transition while
   // |*this| is in any state other than NO_TRANSITION, unless requesting
   // DESTROYING or ERRORING.
   enum CurrentStateChange {
     NO_TRANSITION,  // Not in the middle of a transition.
     INITIALIZING,
     FLUSHING,
@@ skipping 69 matching lines @@
   // Whenever port settings change, the first thing we must do is disable the
   // port (see Figure 3-18 of the OpenMAX IL spec linked to above).  When the
   // port is disabled, the component will call us back here.  We then re-enable
   // the port once we have textures, and that's the second method below.
   void OnOutputPortDisabled();
   void OnOutputPortEnabled();
 
   // Decode bitstream buffers that were queued (see queued_bitstream_buffers_).
   void DecodeQueuedBitstreamBuffers();
 
-  // Lazily initialize static data after sandbox is enabled.  Return false on
-  // init failure.
-  static bool PostSandboxInitialization();
-
   // Weak pointer to |this|; used to safely trampoline calls from the OMX thread
   // to the ChildThread.  Since |this| is kept alive until OMX is fully shut
   // down, only the OMX->Child thread direction needs to be guarded this way.
   base::WeakPtr<OmxVideoDecodeAccelerator> weak_this_;
 
   // True once Initialize() has returned true; before this point there's never a
   // point in calling client_->NotifyError().
   bool init_begun_;
 
   // IL-client state.
@@ skipping 44 matching lines @@
   // NOTE: all calls to this object *MUST* be executed in message_loop_.
   Client* client_;
 
   scoped_ptr<Gles2TextureToEglImageTranslator> texture_to_egl_image_translator_;
 
   // These members are only used during Initialization.
   Codec codec_;
   uint32 h264_profile_;  // OMX_AVCProfile requested during Initialization.
   bool component_name_is_nvidia_h264ext_;
 
-  // Has static initialization of pre-sandbox components completed successfully?
-  static bool pre_sandbox_init_done_;
-
   // Method to handle events
   void EventHandlerCompleteTask(OMX_EVENTTYPE event,
                                 OMX_U32 data1,
                                 OMX_U32 data2);
 
   // Method to receive buffers from component's input port
   void EmptyBufferDoneTask(OMX_BUFFERHEADERTYPE* buffer);
 
   // Method to receive buffers from component's output port
   void FillBufferDoneTask(OMX_BUFFERHEADERTYPE* buffer);
@@ skipping 12 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_