summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 18:54:08 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 18:54:08 +0000
commitf3d9d21ed23cddac9723a1016f474daaa671c2a0 (patch)
tree52e618432270c62e3af799dacb5727cc8f4f1d5a /ppapi
parentbea5c46ef47c329892167eabc4cbefbc8e06d9a0 (diff)
downloadchromium_src-f3d9d21ed23cddac9723a1016f474daaa671c2a0.zip
chromium_src-f3d9d21ed23cddac9723a1016f474daaa671c2a0.tar.gz
chromium_src-f3d9d21ed23cddac9723a1016f474daaa671c2a0.tar.bz2
Pepper: Fix the definition of |PPB_AudioInput_Callback|.
The |sample_buffer| parameter is an "in" parameter, not "out". (And consequently should be |const void*|, not |void*|.) TBR=dmichael@chromium.org Review URL: http://codereview.chromium.org/8662014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111379 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/api/dev/ppb_audio_input_dev.idl4
-rw-r--r--ppapi/c/dev/ppb_audio_input_dev.h6
-rw-r--r--ppapi/proxy/resource_creation_proxy.cc2
3 files changed, 6 insertions, 6 deletions
diff --git a/ppapi/api/dev/ppb_audio_input_dev.idl b/ppapi/api/dev/ppb_audio_input_dev.idl
index ba6b578..24543ae 100644
--- a/ppapi/api/dev/ppb_audio_input_dev.idl
+++ b/ppapi/api/dev/ppb_audio_input_dev.idl
@@ -15,9 +15,9 @@ label Chrome {
/**
* <code>PPB_AudioInput_Callback</code> defines the type of an audio callback
* function used to provide the audio buffer with data. This callback will be
- * called on a separate thread to the creation thread.
+ * called on a separate thread from the creation thread.
*/
-typedef void PPB_AudioInput_Callback([out] mem_t sample_buffer,
+typedef void PPB_AudioInput_Callback([in] mem_t sample_buffer,
[in] uint32_t buffer_size_in_bytes,
[inout] mem_t user_data);
diff --git a/ppapi/c/dev/ppb_audio_input_dev.h b/ppapi/c/dev/ppb_audio_input_dev.h
index ed9e098..73d9bc5 100644
--- a/ppapi/c/dev/ppb_audio_input_dev.h
+++ b/ppapi/c/dev/ppb_audio_input_dev.h
@@ -3,7 +3,7 @@
* found in the LICENSE file.
*/
-/* From dev/ppb_audio_input_dev.idl modified Mon Nov 14 17:58:16 2011. */
+/* From dev/ppb_audio_input_dev.idl modified Wed Nov 23 09:26:09 2011. */
#ifndef PPAPI_C_DEV_PPB_AUDIO_INPUT_DEV_H_
#define PPAPI_C_DEV_PPB_AUDIO_INPUT_DEV_H_
@@ -31,9 +31,9 @@
/**
* <code>PPB_AudioInput_Callback</code> defines the type of an audio callback
* function used to provide the audio buffer with data. This callback will be
- * called on a separate thread to the creation thread.
+ * called on a separate thread from the creation thread.
*/
-typedef void (*PPB_AudioInput_Callback)(void* sample_buffer,
+typedef void (*PPB_AudioInput_Callback)(const void* sample_buffer,
uint32_t buffer_size_in_bytes,
void* user_data);
/**
diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc
index c1e3807..d044745 100644
--- a/ppapi/proxy/resource_creation_proxy.cc
+++ b/ppapi/proxy/resource_creation_proxy.cc
@@ -87,7 +87,7 @@ PP_Resource ResourceCreationProxy::CreateAudioTrusted(PP_Instance instance) {
PP_Resource ResourceCreationProxy::CreateAudioInput(
PP_Instance instance,
PP_Resource config_id,
- PPB_Audio_Callback audio_input_callback,
+ PPB_AudioInput_Callback audio_input_callback,
void* user_data) {
return PPB_AudioInput_Proxy::CreateProxyResource(instance, config_id,
audio_input_callback,