Add initialization callback support for Video Decoder PPAPI.

webkit/plugins/ppapi/ppb_video_decoder_impl.cc

 // Copyright (c) 2011 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 "webkit/plugins/ppapi/ppb_video_decoder_impl.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "media/video/picture.h"
@@ skipping 26 matching lines @@
   scoped_refptr<PPB_VideoDecoder_Impl> decoder(
       new PPB_VideoDecoder_Impl(instance));
 
   return BoolToPPBool(decoder->GetConfigs(proto_config,
                                           matching_configs,
                                           matching_configs_size,
                                           num_of_matching_configs));
 }
 
 PP_Resource Create(PP_Instance instance_id,
-                   PP_VideoConfigElement* decoder_config) {
+                   PP_VideoConfigElement* decoder_config,
+                   PP_CompletionCallback callback) {
   PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id);
   if (!instance)
     return 0;
 
   scoped_refptr<PPB_VideoDecoder_Impl> decoder(
       new PPB_VideoDecoder_Impl(instance));
 
-  if (!decoder->Init(const_cast<PP_VideoConfigElement*>(decoder_config)))
+  if (!decoder->Init(
+      const_cast<PP_VideoConfigElement*>(decoder_config), callback)) {
     return 0;
+  }
 
   return decoder->GetReference();
 }
 
 PP_Bool IsVideoDecoder(PP_Resource resource) {
   return BoolToPPBool(!!Resource::GetAs<PPB_VideoDecoder_Impl>(resource));
 }
 
 PP_Bool Decode(PP_Resource decoder_id,
                PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
@@ skipping 134 matching lines @@
   platform_video_decoder_->GetConfigs(requested, &matched);
 
   uint32 i;
   for (i = 0; i < matched.size() && i < matching_configs_size; i++)
     matching_configs[i] = matched[i];
   *num_of_matching_configs = i;
 
   return true;
 }
 
-bool PPB_VideoDecoder_Impl::Init(PP_VideoConfigElement* decoder_config) {
+bool PPB_VideoDecoder_Impl::Init(PP_VideoConfigElement* decoder_config,
+                                 PP_CompletionCallback callback) {
   if (!instance())
     return false;
 
   platform_video_decoder_.reset(
       instance()->delegate()->CreateVideoDecoder(this));
 
   std::vector<uint32> copied;
   // TODO(vrk): Validate configs before copy.
   CopyToConfigList(decoder_config, &copied);
   platform_video_decoder_->Initialize(copied);
 
+  initialization_callback_ = callback;
+
   return platform_video_decoder_.get()? true : false;
 }
 
 bool PPB_VideoDecoder_Impl::Decode(
     PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
     PP_CompletionCallback callback) {
   if (!platform_video_decoder_.get())
     return false;
 
   media::BitstreamBuffer decode_buffer(
@@ skipping 142 matching lines @@
 void PPB_VideoDecoder_Impl::NotifyFlushDone() {
   if (flush_callback_.func == NULL)
     return;
 
   // Call the callback that was stored to be called when Flush is done.
   PP_CompletionCallback callback = PP_BlockUntilComplete();
   std::swap(callback, flush_callback_);
   PP_RunCompletionCallback(&callback, PP_OK);
 }
 
+void PPB_VideoDecoder_Impl::NotifyInitializeDone() {
+  if (initialization_callback_.func == NULL)
+    return;
+
+  PP_CompletionCallback callback = PP_BlockUntilComplete();
+  std::swap(callback, initialization_callback_);
+  PP_RunCompletionCallback(&callback, PP_OK);
+}
+
 }  // namespace ppapi
 }  // namespace webkit
 
 // These functions are declared in picture.h but are defined here because of
 // dependencies (we can't depend on ppapi types from media).
 namespace media {
 BufferInfo::BufferInfo(const PP_BufferInfo_Dev& info)
     : id_(info.id),
       size_(info.size.width, info.size.height) {
 }
@@ skipping 14 matching lines @@
   assert(pepper_buffer->is_mapped());
   data_ = pepper_buffer->mapped_buffer();
 }
 
 Picture::Picture(const PP_Picture_Dev& picture)
     : picture_buffer_id_(picture.picture_buffer_id),
       bitstream_buffer_id_(picture.bitstream_buffer_id) {
 }
 
 }  // namespace media