Pass Client pointer in Initialize() for VDA/VEA

content/renderer/media/pepper_platform_video_decoder.cc

 // 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.
 
 #include "content/renderer/media/pepper_platform_video_decoder.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "content/child/child_process.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/renderer/render_thread_impl.h"
 
 using media::BitstreamBuffer;
 
 namespace content {
 
-PlatformVideoDecoder::PlatformVideoDecoder(
-    VideoDecodeAccelerator::Client* client,
-    int32 command_buffer_route_id)
-    : client_(client),
-      command_buffer_route_id_(command_buffer_route_id) {
-  DCHECK(client);
-}
+PlatformVideoDecoder::PlatformVideoDecoder(int32 command_buffer_route_id)
+    : command_buffer_route_id_(command_buffer_route_id) {}
 
 PlatformVideoDecoder::~PlatformVideoDecoder() {}
 
-bool PlatformVideoDecoder::Initialize(media::VideoCodecProfile profile) {
+bool PlatformVideoDecoder::Initialize(
+    media::VideoCodecProfile profile,
+    media::VideoDecodeAccelerator::Client* client) {
+  client_ = client;
+
   // TODO(vrk): Support multiple decoders.
   if (decoder_)
     return true;
 
   RenderThreadImpl* render_thread = RenderThreadImpl::current();
 
   // This is not synchronous, but subsequent IPC messages will be buffered, so
   // it is okay to immediately send IPC messages through the returned channel.
   GpuChannelHost* channel =
       render_thread->EstablishGpuChannelSync(
           CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
 
   if (!channel)
     return false;
 
   // Send IPC message to initialize decoder in GPU process.
-  decoder_ =
-      channel->CreateVideoDecoder(command_buffer_route_id_, profile, this);
-  return decoder_.get() != NULL;
+  decoder_ = channel->CreateVideoDecoder(command_buffer_route_id_, profile);
+  return (decoder_ && decoder_->Initialize(profile, this));
 }
 
 void PlatformVideoDecoder::Decode(const BitstreamBuffer& bitstream_buffer) {
   DCHECK(decoder_.get());
   decoder_->Decode(bitstream_buffer);
 }
 
 void PlatformVideoDecoder::AssignPictureBuffers(
     const std::vector<media::PictureBuffer>& buffers) {
   DCHECK(decoder_.get());
@@ skipping 61 matching lines @@
   DCHECK(RenderThreadImpl::current());
   client_->NotifyFlushDone();
 }
 
 void PlatformVideoDecoder::NotifyResetDone() {
   DCHECK(RenderThreadImpl::current());
   client_->NotifyResetDone();
 }
 
 }  // namespace content