Work on improving PpbAudioConfig:RecommendSampleFrameCount

ppapi/tests/test_audio.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "ppapi/tests/test_audio.h"
 
 #include <string.h>
 
 #include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/c/ppb_audio.h"
 #include "ppapi/cpp/module.h"
@@ skipping 45 matching lines @@
     4096
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kSampleRates); i++) {
     PP_AudioSampleRate sample_rate = kSampleRates[i];
 
     for (size_t j = 0; j < ARRAYSIZE_UNSAFE(kRequestFrameCounts); j++) {
       // Make a config, create the audio resource, and release the config.
       uint32_t request_frame_count = kRequestFrameCounts[j];
       uint32_t frame_count = audio_config_interface_->RecommendSampleFrameCount(
-          sample_rate, request_frame_count);
+          instance_->pp_instance(), sample_rate, request_frame_count);
       PP_Resource ac = audio_config_interface_->CreateStereo16Bit(
           instance_->pp_instance(), sample_rate, frame_count);
       ASSERT_TRUE(ac);
       PP_Resource audio = audio_interface_->Create(
           instance_->pp_instance(), ac, TrivialAudioCallback, NULL);
       core_interface_->ReleaseResource(ac);
       ac = 0;
 
       ASSERT_TRUE(audio);
       ASSERT_TRUE(audio_interface_->IsAudio(audio));
@@ skipping 21 matching lines @@
 }
 
 // Test that releasing the resource without calling |StopPlayback()| "works".
 // TODO(viettrungluu): Figure out how to check that |StopPlayback()| properly
 // waits for in-flight callbacks.
 std::string TestAudio::TestDestroyNoStop() {
   const PP_AudioSampleRate kSampleRate = PP_AUDIOSAMPLERATE_44100;
   const uint32_t kRequestFrameCount = 2048;
 
   uint32_t frame_count = audio_config_interface_->RecommendSampleFrameCount(
-      kSampleRate, kRequestFrameCount);
+      instance_->pp_instance(), kSampleRate, kRequestFrameCount);
   PP_Resource ac = audio_config_interface_->CreateStereo16Bit(
       instance_->pp_instance(), kSampleRate, frame_count);
   ASSERT_TRUE(ac);
   PP_Resource audio = audio_interface_->Create(
       instance_->pp_instance(), ac, TrivialAudioCallback, NULL);
   core_interface_->ReleaseResource(ac);
   ac = 0;
 
   ASSERT_TRUE(audio);
   ASSERT_TRUE(audio_interface_->IsAudio(audio));
 
   // Start playback and release the resource.
   ASSERT_TRUE(audio_interface_->StartPlayback(audio));
   core_interface_->ReleaseResource(audio);
 
   PASS();
 }
 
 std::string TestAudio::TestFailures() {
   const PP_AudioSampleRate kSampleRate = PP_AUDIOSAMPLERATE_44100;
   const uint32_t kRequestFrameCount = 2048;
 
   // Test invalid parameters to |Create()|.
 
   // We want a valid config for some of our tests of |Create()|.
   uint32_t frame_count = audio_config_interface_->RecommendSampleFrameCount(
-      kSampleRate, kRequestFrameCount);
+      instance_->pp_instance(), kSampleRate, kRequestFrameCount);
   PP_Resource ac = audio_config_interface_->CreateStereo16Bit(
       instance_->pp_instance(), kSampleRate, frame_count);
   ASSERT_TRUE(ac);
 
   // Invalid instance -> failure.
   PP_Resource audio = audio_interface_->Create(
       0, ac, TrivialAudioCallback, NULL);
   ASSERT_EQ(0, audio);
 
   // Invalid config -> failure.
@@ skipping 12 matching lines @@
   // Test the other functions with an invalid audio resource.
   ASSERT_FALSE(audio_interface_->IsAudio(0));
   ASSERT_EQ(0, audio_interface_->GetCurrentConfig(0));
   ASSERT_FALSE(audio_interface_->StartPlayback(0));
   ASSERT_FALSE(audio_interface_->StopPlayback(0));
 
   PASS();
 }
 
 // TODO(viettrungluu): Test that callbacks get called, playback happens, etc.