changes for proxy audio

webkit/glue/plugins/pepper_audio.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 "webkit/glue/plugins/pepper_audio.h"
 
 #include "base/logging.h"
 #include "ppapi/c/dev/ppb_audio_dev.h"
 #include "ppapi/c/dev/ppb_audio_trusted_dev.h"
+#include "ppapi/c/pp_completion_callback.h"
 #include "webkit/glue/plugins/pepper_common.h"
 
 namespace pepper {
 
 namespace {
 
 // PPB_AudioConfig -------------------------------------------------------------
 
 uint32_t RecommendSampleFrameCount(uint32_t requested_sample_frame_count);
 
@@ skipping 50 matching lines @@
   &CreateStereo16bit,
   &RecommendSampleFrameCount,
   &IsAudioConfig,
   &GetSampleRate,
   &GetSampleFrameCount
 };
 
 // PPB_Audio -------------------------------------------------------------------
 
 PP_Resource Create(PP_Instance instance_id, PP_Resource config_id,
-                   PPB_Audio_Callback callback, void* user_data) {
+                   PPB_Audio_Callback user_callback, void* user_data) {
   PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id);
   if (!instance)
     return 0;
   // TODO(neb): Require callback to be present for untrusted plugins.

[darin (slow to review), 2010/11/24 20:34:35]

it seems like it'll be easy to enforce this TODO now that Create is not called
by trusted code.

[nfullagar, 2010/11/24 23:01:05]

Added check for NULL user_callback here, and check for NULL completion callback
in the trusted case.  Removed todo comment.

-  scoped_refptr<Audio> audio(new Audio(instance->module()));
-  if (!audio->Init(instance->delegate(), config_id, callback, user_data))
+  scoped_refptr<Audio> audio(new Audio(instance->module(), instance_id));
+  if (!audio->Init(instance->delegate(), config_id,
+                   user_callback, user_data))
     return 0;
   return audio->GetReference();
 }
 
 PP_Bool IsAudio(PP_Resource resource) {
   scoped_refptr<Audio> audio = Resource::GetAs<Audio>(resource);
   return BoolToPPBool(!!audio);
 }
 
 PP_Resource GetCurrentConfiguration(PP_Resource audio_id) {
@@ skipping 14 matching lines @@
 const PPB_Audio_Dev ppb_audio = {
   &Create,
   &IsAudio,
   &GetCurrentConfiguration,
   &StartPlayback,
   &StopPlayback,
 };
 
 // PPB_AudioTrusted ------------------------------------------------------------
 
-PP_Resource GetBuffer(PP_Resource audio_id) {
-  // TODO(neb): Implement me!
-  return 0;
+PP_Resource CreateTrusted(PP_Instance instance_id) {
+  PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id);
+  if (!instance)
+    return 0;
+  scoped_refptr<Audio> audio(new Audio(instance->module(), instance_id));
+  return audio->GetReference();
 }
 
-int GetOSDescriptor(PP_Resource audio_id) {
-  // TODO(neb): Implement me!
-  return -1;
+int32_t Open(PP_Resource audio_id,
+             PP_Resource config_id,
+             PP_CompletionCallback created) {
+  scoped_refptr<Audio> audio = Resource::GetAs<Audio>(audio_id);
+  if (!audio)
+    return PP_ERROR_BADARGUMENT;
+  PP_Instance instance_id = audio->pp_instance();
+  PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id);
+  if (!instance)
+    return PP_ERROR_FAILED;
+  return audio->OpenTrusted(instance->delegate(), config_id, created);
+}
+
+int32_t GetSyncSocket(PP_Resource audio_id, int* sync_socket) {
+  scoped_refptr<Audio> audio = Resource::GetAs<Audio>(audio_id);
+  if (audio)
+    return audio->GetSyncSocket(sync_socket);
+  return PP_ERROR_BADARGUMENT;
+}
+
+int32_t GetSharedMemory(PP_Resource audio_id,
+                        int* shm_handle,
+                        int32_t* shm_size) {
+  scoped_refptr<Audio> audio = Resource::GetAs<Audio>(audio_id);
+  if (audio)
+    return audio->GetSharedMemory(shm_handle, shm_size);
+  return PP_ERROR_BADARGUMENT;
 }
 
 const PPB_AudioTrusted_Dev ppb_audiotrusted = {
-  &GetBuffer,
-  &GetOSDescriptor
+  &CreateTrusted,
+  &Open,
+  &GetSyncSocket,
+  &GetSharedMemory,
 };
 
 }  // namespace
 
 // AudioConfig -----------------------------------------------------------------
 
 AudioConfig::AudioConfig(PluginModule* module,
                          PP_AudioSampleRate_Dev sample_rate,
                          uint32_t sample_frame_count)
     : Resource(module),
@@ skipping 14 matching lines @@
   const int kSizeOfSample = sizeof(int16_t);
   return static_cast<size_t>(sample_frame_count_ * kSizeOfSample * kChannels);
 }
 
 AudioConfig* AudioConfig::AsAudioConfig() {
   return this;
 }
 
 // Audio -----------------------------------------------------------------------
 
-Audio::Audio(PluginModule* module)
+Audio::Audio(PluginModule* module, PP_Instance instance_id)
     : Resource(module),
       playing_(false),
+      pp_instance_(instance_id),
+      audio_(NULL),
       socket_(NULL),
       shared_memory_(NULL),
       shared_memory_size_(0),
       callback_(NULL),
-      user_data_(NULL) {
+      user_data_(NULL),
+      create_callback_pending_(false) {
+  create_callback_ = PP_MakeCompletionCallback(NULL, NULL);
 }
 
 Audio::~Audio() {
   // Calling ShutDown() makes sure StreamCreated cannot be called anymore.
   audio_->ShutDown();
+  audio_ = NULL;
+
   // Closing the socket causes the thread to exit - wait for it.
   socket_->Close();
   if (audio_thread_.get()) {
     audio_thread_->Join();
     audio_thread_.reset();
   }
+
+  // If the completion callback hasn't fired yet, do so here
+  // with an error condition.
+  if (create_callback_pending_) {
+    PP_RunCompletionCallback(&create_callback_, PP_ERROR_ABORTED);
+    create_callback_pending_ = false;
+  }
   // Shared memory destructor will unmap the memory automatically.
 }
 
 const PPB_Audio_Dev* Audio::GetInterface() {
   return &ppb_audio;
 }
 
 const PPB_AudioTrusted_Dev* Audio::GetTrustedInterface() {
   return &ppb_audiotrusted;
 }
 
 Audio* Audio::AsAudio() {
   return this;
 }
 
-bool Audio::Init(PluginDelegate* plugin_delegate, PP_Resource config_id,
+bool Audio::Init(PluginDelegate* plugin_delegate,
+                 PP_Resource config_id,
                  PPB_Audio_Callback callback, void* user_data) {
-  CHECK(!audio_.get());
+  CHECK(!audio_);
   config_ = Resource::GetAs<AudioConfig>(config_id);
   if (!config_)
     return false;
   callback_ = callback;
   user_data_ = user_data;
-  // When the stream is created, we'll get called back in StreamCreated().
-  audio_.reset(plugin_delegate->CreateAudio(config_->sample_rate(),
-                                            config_->sample_frame_count(),
-                                            this));
-  return audio_.get() != NULL;
+
+  // When the stream is created, we'll get called back on StreamCreated().
+  audio_ = plugin_delegate->CreateAudio(config_->sample_rate(),
+                                        config_->sample_frame_count(),
+                                        this);
+  return audio_ != NULL;
+}
+
+int32_t Audio::OpenTrusted(PluginDelegate* plugin_delegate,

[darin (slow to review), 2010/11/24 20:34:35]

nit: might be nice to call this "Open" to match up with the API method name.

[nfullagar, 2010/11/24 23:01:05]

Done.

+                           PP_Resource config_id,
+                           PP_CompletionCallback create_callback) {
+  DCHECK(!audio_);
+  config_ = Resource::GetAs<AudioConfig>(config_id);
+  if (!config_)
+    return PP_ERROR_BADARGUMENT;
+
+  // When the stream is created, we'll get called back on StreamCreated().
+  audio_ = plugin_delegate->CreateAudio(config_->sample_rate(),
+                                        config_->sample_frame_count(),
+                                        this);
+  if (audio_ == NULL)

[darin (slow to review), 2010/11/24 20:34:35]

nit: in chromium code, we usually write "if (!audio_)" instead.

[nfullagar, 2010/11/24 23:01:05]

Done.

+    return PP_ERROR_FAILED;
+
+  // At this point, we are guaranteeing ownership of the completion
+  // callback.  Audio promises to fire the completion callback
+  // once and only once.
+  create_callback_ = create_callback;
+  create_callback_pending_ = true;
+  return PP_ERROR_WOULDBLOCK;
+}
+
+int32_t Audio::GetSyncSocket(int* sync_socket) {
+  if (socket_ != NULL) {
+#if defined(OS_POSIX)
+    *sync_socket = socket_->handle();
+#elif defined(OS_WIN)
+    *sync_socket = reinterpret_cast<int>(socket_->handle());
+#else
+    #error "Platform not supported."
+#endif
+    return PP_OK;
+  }
+  return PP_ERROR_FAILED;
+}
+
+int32_t Audio::GetSharedMemory(int* shm_handle, int32_t* shm_size) {
+  if (shared_memory_ != NULL) {
+#if defined(OS_POSIX)
+    *shm_handle = shared_memory_->handle().fd;
+#elif defined(OS_WIN)
+    *shm_handle = reinterpret_cast<int>(shared_memory_->handle());
+#else
+    #error "Platform not supported."
+#endif
+    *shm_size = shared_memory_size_;
+    return PP_OK;
+  }
+  return PP_ERROR_FAILED;
 }
 
 bool Audio::StartPlayback() {
   if (playing_)
     return true;
 
   CHECK(!audio_thread_.get());
   if (callback_ && socket_.get()) {
     audio_thread_.reset(new base::DelegateSimpleThread(this,
                                                        "plugin_audio_thread"));
@@ skipping 18 matching lines @@
   return true;
 }
 
 void Audio::StreamCreated(base::SharedMemoryHandle shared_memory_handle,
                           size_t shared_memory_size,
                           base::SyncSocket::Handle socket_handle) {
   socket_.reset(new base::SyncSocket(socket_handle));
   shared_memory_.reset(new base::SharedMemory(shared_memory_handle, false));
   shared_memory_size_ = shared_memory_size;
 
+  // Trusted side of proxy can specify a callback to recieve handles.
+  if (create_callback_pending_) {
+    PP_RunCompletionCallback(&create_callback_, 0);
+    create_callback_pending_ = false;
+  }
+
+  // Recurring callback to fill audio buffers.

[darin (slow to review), 2010/11/24 20:34:35]

nit: this comment is confusing... what is it trying to tell me?

[nfullagar, 2010/11/24 23:01:05]

clarified

   if (callback_) {
     shared_memory_->Map(shared_memory_size_);
+
     // In common case StartPlayback() was called before StreamCreated().
     if (playing_) {
       audio_thread_.reset(new base::DelegateSimpleThread(this,
           "plugin_audio_thread"));
       audio_thread_->Start();
     }
   }
 }
 
 void Audio::Run() {
   int pending_data;
   void* buffer = shared_memory_->memory();
   size_t buffer_size_in_bytes = config_->BufferSize();
 
   while (sizeof(pending_data) ==
       socket_->Receive(&pending_data, sizeof(pending_data)) &&
       pending_data >= 0) {
     // Exit the thread on pause.
     if (pending_data < 0)
       return;
     callback_(buffer, buffer_size_in_bytes, user_data_);
   }
 }
 
 }  // namespace pepper
-