summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy
diff options
context:
space:
mode:
authordalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-05 13:39:21 +0000
committerdalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-05 13:39:21 +0000
commitdfc48e4ce465db7e44e7cb7a4d2628958e1787a0 (patch)
treed387f8da52225eb08fe29d6bc17808d04739b26c /ppapi/proxy
parent42e66e5f9dc55b57bfc95f8a49836fba59ad0cba (diff)
downloadchromium_src-dfc48e4ce465db7e44e7cb7a4d2628958e1787a0.zip
chromium_src-dfc48e4ce465db7e44e7cb7a4d2628958e1787a0.tar.gz
chromium_src-dfc48e4ce465db7e44e7cb7a4d2628958e1787a0.tar.bz2
Switch OnMoreData() to use AudioBus.
As titled, with this change we're now piping float data around the pipeline from end to end. This change is in preparation for browser side channel remixing and resampling. As a consequence of this change the shared memory now represents the contents of an AudioBus object, which is essentially audio data in a float planar format. BUG=114700 TEST=Should be no audible change. Ran all existing tests. Compiled ran WebAudio/HTML5/WebRTC on all platforms and PPAPI on Linux. Review URL: https://chromiumcodereview.appspot.com/10832285 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154951 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
-rw-r--r--ppapi/proxy/ppb_audio_proxy.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/ppapi/proxy/ppb_audio_proxy.cc b/ppapi/proxy/ppb_audio_proxy.cc
index 2bd5c89..2f91fc7 100644
--- a/ppapi/proxy/ppb_audio_proxy.cc
+++ b/ppapi/proxy/ppb_audio_proxy.cc
@@ -323,6 +323,8 @@ void PPB_Audio_Proxy::OnMsgNotifyAudioStreamCreated(
IPC::PlatformFileForTransitToPlatformFile(socket_handle.descriptor()));
base::SharedMemory temp_mem(handle.shmem(), false);
} else {
+ EnterResourceNoLock<PPB_AudioConfig_API> config(
+ static_cast<Audio*>(enter.object())->GetCurrentConfig(), true);
// See the comment above about how we must call
// TotalSharedMemorySizeInBytes to get the actual size of the buffer. Here,
// we must call PacketSizeInBytes to get back the size of the audio buffer,
@@ -330,7 +332,8 @@ void PPB_Audio_Proxy::OnMsgNotifyAudioStreamCreated(
static_cast<Audio*>(enter.object())->SetStreamInfo(
enter.resource()->pp_instance(), handle.shmem(),
media::PacketSizeInBytes(handle.size()),
- IPC::PlatformFileForTransitToPlatformFile(socket_handle.descriptor()));
+ IPC::PlatformFileForTransitToPlatformFile(socket_handle.descriptor()),
+ config.object()->GetSampleFrameCount());
}
}