Add a new parameter |latency| to PPB_Audio.

content/renderer/pepper/ppb_audio_impl.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/pepper/ppb_audio_impl.h"
 
 #include "base/logging.h"
 #include "content/renderer/pepper/common.h"
 #include "content/renderer/pepper/pepper_platform_audio_output.h"
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
@@ skipping 12 matching lines @@
 using ppapi::thunk::PPB_Audio_API;
 using ppapi::thunk::PPB_AudioConfig_API;
 using ppapi::TrackedCallback;
 
 namespace content {
 
 // PPB_Audio_Impl --------------------------------------------------------------
 
 PPB_Audio_Impl::PPB_Audio_Impl(PP_Instance instance)
     : Resource(ppapi::OBJECT_IS_IMPL, instance),
-      audio_(NULL),
-      sample_frame_count_(0) {
+      audio_(NULL) {
 }
 
 PPB_Audio_Impl::~PPB_Audio_Impl() {
   // Calling ShutDown() makes sure StreamCreated cannot be called anymore and
   // releases the audio data associated with the pointer. Note however, that
   // until ShutDown returns, StreamCreated may still be called. This will be
   // OK since we'll just immediately clean up the data it stored later in this
   // destructor.
   if (audio_) {
     audio_->ShutDown();
     audio_ = NULL;
   }
 }
 
 // static
-PP_Resource PPB_Audio_Impl::Create(PP_Instance instance,
-                                   PP_Resource config,
-                                   PPB_Audio_Callback audio_callback,
-                                   void* user_data) {
+PP_Resource PPB_Audio_Impl::Create(
+    PP_Instance instance,
+    PP_Resource config,
+    const ppapi::AudioCallbackCombined& audio_callback,
+    void* user_data) {
   scoped_refptr<PPB_Audio_Impl> audio(new PPB_Audio_Impl(instance));
   if (!audio->Init(config, audio_callback, user_data))
     return 0;
   return audio->GetReference();
 }
 
 PPB_Audio_API* PPB_Audio_Impl::AsPPB_Audio_API() {
   return this;
 }
 
 bool PPB_Audio_Impl::Init(PP_Resource config,
-                          PPB_Audio_Callback callback, void* user_data) {
+                          const ppapi::AudioCallbackCombined& callback,
+                          void* user_data) {
   // Validate the config and keep a reference to it.
   EnterResourceNoLock<PPB_AudioConfig_API> enter(config, true);
   if (enter.failed())
     return false;
   config_ = config;
 
-  if (!callback)
+  if (!callback.IsValid())
     return false;
   SetCallback(callback, user_data);
 
   PepperPluginInstance* instance = PepperPluginInstance::Get(pp_instance());
   if (!instance)
     return false;
 
   // When the stream is created, we'll get called back on StreamCreated().
   CHECK(!audio_);
   audio_ = PepperPlatformAudioOutput::Create(
       static_cast<int>(enter.object()->GetSampleRate()),
       static_cast<int>(enter.object()->GetSampleFrameCount()),
       instance->GetRenderView()->GetRoutingID(),
       this);
-  sample_frame_count_ = enter.object()->GetSampleFrameCount();
   return audio_ != NULL;
 }
 
 PP_Resource PPB_Audio_Impl::GetCurrentConfig() {
   // AddRef on behalf of caller, while keeping a ref for ourselves.
   PpapiGlobals::Get()->GetResourceTracker()->AddRefResource(config_);
   return config_;
 }
 
 PP_Bool PPB_Audio_Impl::StartPlayback() {
@@ skipping 53 matching lines @@
 
 int32_t PPB_Audio_Impl::GetSharedMemory(int* shm_handle,
                                         uint32_t* shm_size) {
   return GetSharedMemoryImpl(shm_handle, shm_size);
 }
 
 void PPB_Audio_Impl::OnSetStreamInfo(
     base::SharedMemoryHandle shared_memory_handle,
     size_t shared_memory_size,
     base::SyncSocket::Handle socket_handle) {
+  EnterResourceNoLock<PPB_AudioConfig_API> enter(config_, true);
   SetStreamInfo(pp_instance(), shared_memory_handle, shared_memory_size,
-                socket_handle, sample_frame_count_);
+                socket_handle, enter.object()->GetSampleRate(),
+                enter.object()->GetSampleFrameCount());
 }
 
 }  // namespace content