Connect GpuVideoDecodeServiceHost with ggl::Context and CommandBufferProxy

chrome/renderer/media/ipc_video_decoder.cc

 // Copyright (c) 2010 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 "chrome/renderer/media/ipc_video_decoder.h"
 
 #include "base/task.h"
+#include "chrome/renderer/ggl/ggl.h"
 #include "media/base/callback.h"
 #include "media/base/filters.h"
 #include "media/base/filter_host.h"
 #include "media/base/limits.h"
 #include "media/base/media_format.h"
 #include "media/base/video_frame.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/ffmpeg/ffmpeg_util.h"
 #include "media/filters/ffmpeg_interfaces.h"
 
@@ skipping 21 matching lines @@
                           demuxer_stream,
                           callback));
     return;
   }
 
   CHECK(!demuxer_stream_);
   demuxer_stream_ = demuxer_stream;
   initialize_callback_.reset(callback);
 
   // We require bit stream converter for openmax hardware decoder.
+  // TODO(hclam): This is a wrong place to initialize the demuxer stream's
+  // bitstream converter.
   demuxer_stream->EnableBitstreamConverter();
 
   // Get the AVStream by querying for the provider interface.
   AVStreamProvider* av_stream_provider;
   if (!demuxer_stream->QueryInterface(&av_stream_provider)) {
     GpuVideoDecoderInitDoneParam param;
     OnInitializeDone(false, param);
     return;
   }
 
   AVStream* av_stream = av_stream_provider->GetAVStream();
   width_ = av_stream->codec->width;
   height_ = av_stream->codec->height;
 
-  // Create hardware decoder instance.
-  GpuVideoServiceHost* gpu_video_service_host = GpuVideoServiceHost::get();
-  gpu_video_decoder_host_ = gpu_video_service_host->CreateVideoDecoder(this);
+  // TODO(hclam): Pass an actual context instead of NULL.
+  gpu_video_decoder_host_ = ggl::CreateVideoDecoder(NULL);
 
   // Initialize hardware decoder.
   GpuVideoDecoderInitParam param = {0};
   param.width_ = width_;
   param.height_ = height_;
-  if (!gpu_video_decoder_host_->Initialize(param)) {
+  if (!gpu_video_decoder_host_->Initialize(this, param)) {
     GpuVideoDecoderInitDoneParam param;
     OnInitializeDone(false, param);
   }
 }
 
 void IpcVideoDecoder::OnInitializeDone(
     bool success, const GpuVideoDecoderInitDoneParam& param) {
   if (MessageLoop::current() != renderer_thread_message_loop_) {
     renderer_thread_message_loop_->PostTask(
         FROM_HERE,
@@ skipping 254 matching lines @@
       return false;
 
   // TODO(jiesun): Although we current only support H264 hardware decoding,
   // in the future, we should query GpuVideoService for capabilities.
   int codec_id;
   return format.GetAsInteger(MediaFormat::kFFmpegCodecID, &codec_id) &&
          codec_id == CODEC_ID_H264;
 }
 
 }  // namespace media
-