Make VEA client of command buffer; move sync. IPC to VDA/VEA::Initialize()

content/common/gpu/media/gpu_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_GPU_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 31 matching lines @@
 
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // media::VideoDecodeAccelerator::Client implementation.
   virtual void ProvidePictureBuffers(uint32 requested_num_of_buffers,
                                      const gfx::Size& dimensions,
                                      uint32 texture_target) OVERRIDE;
   virtual void DismissPictureBuffer(int32 picture_buffer_id) OVERRIDE;
   virtual void PictureReady(const media::Picture& picture) OVERRIDE;
-  virtual void NotifyInitializeDone() OVERRIDE;
   virtual void NotifyError(media::VideoDecodeAccelerator::Error error) OVERRIDE;
   virtual void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id) OVERRIDE;
   virtual void NotifyFlushDone() OVERRIDE;
   virtual void NotifyResetDone() OVERRIDE;
 
   // GpuCommandBufferStub::DestructionObserver implementation.
   virtual void OnWillDestroyStub() OVERRIDE;
 
   // Function to delegate sending to actual sender.
   virtual bool Send(IPC::Message* message) OVERRIDE;
 
   // Initialize the accelerator with the given profile and send the
   // |init_done_msg| when done.
-  // The renderer process handle is valid as long as we have a channel between
-  // GPU process and the renderer.
   void Initialize(const media::VideoCodecProfile profile,
                   IPC::Message* init_done_msg);
 
  private:
   class MessageFilter;
 
   // We only allow self-delete, from OnWillDestroyStub(), after cleanup there.
   virtual ~GpuVideoDecodeAccelerator();
 
   // Handlers for IPC messages.
   void OnDecode(base::SharedMemoryHandle handle, int32 id, uint32 size);
   void OnAssignPictureBuffers(const std::vector<int32>& buffer_ids,
                               const std::vector<uint32>& texture_ids);
   void OnReusePictureBuffer(int32 picture_buffer_id);
   void OnFlush();
   void OnReset();
   void OnDestroy();
 
   // Called on IO thread when |filter_| has been removed.
   void OnFilterRemoved();
 
   // Sets the texture to cleared.
   void SetTextureCleared(const media::Picture& picture);
 
-  // Message to Send() when initialization is done.  Is only non-NULL during
-  // initialization and is owned by the IPC channel underlying the
-  // GpuCommandBufferStub.
-  IPC::Message* init_done_msg_;
+  // Helper for replying to the creation request.
+  void SendCreateDecoderReply(IPC::Message* message, int32 route_id);
 
   // Route ID to communicate with the host.
   int32 host_route_id_;
 
-  // Unowned pointer to the underlying GpuCommandBufferStub.
+  // Unowned pointer to the underlying GpuCommandBufferStub.  |this| is
+  // registered as a DestuctionObserver of |stub_| and will self-delete when
+  // |stub_| is destroyed.
   GpuCommandBufferStub* stub_;
 
   // The underlying VideoDecodeAccelerator.
   scoped_ptr<VideoDecodeAcceleratorImpl> video_decode_accelerator_;
 
   // Callback for making the relevant context current for GL calls.
   // Returns false if failed.
   base::Callback<bool(void)> make_context_current_;
 
   // The texture dimensions as requested by ProvidePictureBuffers().
@@ skipping 25 matching lines @@
 
   // A map from picture buffer ID to TextureRef that have not been cleared.
   std::map<int32, scoped_refptr<gpu::gles2::TextureRef> > uncleared_textures_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(GpuVideoDecodeAccelerator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_H_