Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c |
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c |
index c83a1f6d5b812bcea6ae2c088ec575d67e31f93b..c2f4bfb3feff131b25aa38933038506baf54e652 100644 |
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c |
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c |
@@ -1,4 +1,4 @@ |
-/* Copyright (c) 2013 The Chromium Authors. All rights reserved. |
+/* Copyright (c) 2014 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. |
*/ |
@@ -46,6 +46,7 @@ |
#include "ppapi/c/extensions/dev/ppb_ext_socket_dev.h" |
#include "ppapi/c/ppb_audio.h" |
#include "ppapi/c/ppb_audio_config.h" |
+#include "ppapi/c/ppb_audio_frame.h" |
#include "ppapi/c/ppb_console.h" |
#include "ppapi/c/ppb_core.h" |
#include "ppapi/c/ppb_file_io.h" |
@@ -59,6 +60,7 @@ |
#include "ppapi/c/ppb_image_data.h" |
#include "ppapi/c/ppb_input_event.h" |
#include "ppapi/c/ppb_instance.h" |
+#include "ppapi/c/ppb_media_stream_audio_track.h" |
#include "ppapi/c/ppb_media_stream_video_track.h" |
#include "ppapi/c/ppb_message_loop.h" |
#include "ppapi/c/ppb_messaging.h" |
@@ -155,6 +157,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_WheelInputEvent_1_0; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_KeyboardInputEvent_1_0; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TouchInputEvent_1_0; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_IMEInputEvent_1_0; |
+static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MediaStreamAudioTrack_0_1; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MediaStreamVideoTrack_0_1; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MessageLoop_1_0; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Messaging_1_0; |
@@ -248,6 +251,8 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Ext_Socket_Dev_0_2; |
/* Not generating wrapper methods for PPB_AudioConfig_1_1 */ |
+/* Not generating wrapper methods for PPB_AudioFrame_0_1 */ |
+ |
/* Begin wrapper methods for PPB_Console_1_0 */ |
static void Pnacl_M25_PPB_Console_Log(PP_Instance instance, PP_LogLevel level, struct PP_Var* value) { |
@@ -916,6 +921,45 @@ static void Pnacl_M13_PPB_IMEInputEvent_GetSelection(PP_Resource ime_event, uint |
/* Not generating wrapper methods for PPB_Instance_1_0 */ |
+/* Begin wrapper methods for PPB_MediaStreamAudioTrack_0_1 */ |
+ |
+static PP_Bool Pnacl_M34_PPB_MediaStreamAudioTrack_IsMediaStreamAudioTrack(PP_Resource resource) { |
+ const struct PPB_MediaStreamAudioTrack_0_1 *iface = Pnacl_WrapperInfo_PPB_MediaStreamAudioTrack_0_1.real_iface; |
+ return iface->IsMediaStreamAudioTrack(resource); |
+} |
+ |
+static int32_t Pnacl_M34_PPB_MediaStreamAudioTrack_Configure(PP_Resource audio_track, uint32_t samples_per_frame, uint32_t max_buffered_frames) { |
+ const struct PPB_MediaStreamAudioTrack_0_1 *iface = Pnacl_WrapperInfo_PPB_MediaStreamAudioTrack_0_1.real_iface; |
+ return iface->Configure(audio_track, samples_per_frame, max_buffered_frames); |
+} |
+ |
+static void Pnacl_M34_PPB_MediaStreamAudioTrack_GetId(struct PP_Var* _struct_result, PP_Resource audio_track) { |
+ const struct PPB_MediaStreamAudioTrack_0_1 *iface = Pnacl_WrapperInfo_PPB_MediaStreamAudioTrack_0_1.real_iface; |
+ *_struct_result = iface->GetId(audio_track); |
+} |
+ |
+static PP_Bool Pnacl_M34_PPB_MediaStreamAudioTrack_HasEnded(PP_Resource audio_track) { |
+ const struct PPB_MediaStreamAudioTrack_0_1 *iface = Pnacl_WrapperInfo_PPB_MediaStreamAudioTrack_0_1.real_iface; |
+ return iface->HasEnded(audio_track); |
+} |
+ |
+static int32_t Pnacl_M34_PPB_MediaStreamAudioTrack_GetFrame(PP_Resource audio_track, PP_Resource* frame, struct PP_CompletionCallback* callback) { |
+ const struct PPB_MediaStreamAudioTrack_0_1 *iface = Pnacl_WrapperInfo_PPB_MediaStreamAudioTrack_0_1.real_iface; |
+ return iface->GetFrame(audio_track, frame, *callback); |
+} |
+ |
+static int32_t Pnacl_M34_PPB_MediaStreamAudioTrack_RecycleFrame(PP_Resource audio_track, PP_Resource frame) { |
+ const struct PPB_MediaStreamAudioTrack_0_1 *iface = Pnacl_WrapperInfo_PPB_MediaStreamAudioTrack_0_1.real_iface; |
+ return iface->RecycleFrame(audio_track, frame); |
+} |
+ |
+static void Pnacl_M34_PPB_MediaStreamAudioTrack_Close(PP_Resource audio_track) { |
+ const struct PPB_MediaStreamAudioTrack_0_1 *iface = Pnacl_WrapperInfo_PPB_MediaStreamAudioTrack_0_1.real_iface; |
+ iface->Close(audio_track); |
+} |
+ |
+/* End wrapper methods for PPB_MediaStreamAudioTrack_0_1 */ |
+ |
/* Begin wrapper methods for PPB_MediaStreamVideoTrack_0_1 */ |
static PP_Bool Pnacl_M34_PPB_MediaStreamVideoTrack_IsMediaStreamVideoTrack(PP_Resource resource) { |
@@ -4031,6 +4075,8 @@ static int32_t Pnacl_M29_PPB_Ext_Socket_Dev_GetJoinedGroups(PP_Instance instance |
/* Not generating wrapper interface for PPB_AudioConfig_1_1 */ |
+/* Not generating wrapper interface for PPB_AudioFrame_0_1 */ |
+ |
struct PPB_Console_1_0 Pnacl_Wrappers_PPB_Console_1_0 = { |
.Log = (void (*)(PP_Instance instance, PP_LogLevel level, struct PP_Var value))&Pnacl_M25_PPB_Console_Log, |
.LogWithSource = (void (*)(PP_Instance instance, PP_LogLevel level, struct PP_Var source, struct PP_Var value))&Pnacl_M25_PPB_Console_LogWithSource |
@@ -4210,6 +4256,16 @@ struct PPB_IMEInputEvent_1_0 Pnacl_Wrappers_PPB_IMEInputEvent_1_0 = { |
/* Not generating wrapper interface for PPB_Instance_1_0 */ |
+struct PPB_MediaStreamAudioTrack_0_1 Pnacl_Wrappers_PPB_MediaStreamAudioTrack_0_1 = { |
+ .IsMediaStreamAudioTrack = (PP_Bool (*)(PP_Resource resource))&Pnacl_M34_PPB_MediaStreamAudioTrack_IsMediaStreamAudioTrack, |
+ .Configure = (int32_t (*)(PP_Resource audio_track, uint32_t samples_per_frame, uint32_t max_buffered_frames))&Pnacl_M34_PPB_MediaStreamAudioTrack_Configure, |
+ .GetId = (struct PP_Var (*)(PP_Resource audio_track))&Pnacl_M34_PPB_MediaStreamAudioTrack_GetId, |
+ .HasEnded = (PP_Bool (*)(PP_Resource audio_track))&Pnacl_M34_PPB_MediaStreamAudioTrack_HasEnded, |
+ .GetFrame = (int32_t (*)(PP_Resource audio_track, PP_Resource* frame, struct PP_CompletionCallback callback))&Pnacl_M34_PPB_MediaStreamAudioTrack_GetFrame, |
+ .RecycleFrame = (int32_t (*)(PP_Resource audio_track, PP_Resource frame))&Pnacl_M34_PPB_MediaStreamAudioTrack_RecycleFrame, |
+ .Close = (void (*)(PP_Resource audio_track))&Pnacl_M34_PPB_MediaStreamAudioTrack_Close |
+}; |
+ |
struct PPB_MediaStreamVideoTrack_0_1 Pnacl_Wrappers_PPB_MediaStreamVideoTrack_0_1 = { |
.IsMediaStreamVideoTrack = (PP_Bool (*)(PP_Resource resource))&Pnacl_M34_PPB_MediaStreamVideoTrack_IsMediaStreamVideoTrack, |
.Configure = (int32_t (*)(PP_Resource video_track, uint32_t max_buffered_frames))&Pnacl_M34_PPB_MediaStreamVideoTrack_Configure, |
@@ -5190,6 +5246,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_IMEInputEvent_1_0 = { |
.real_iface = NULL |
}; |
+static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MediaStreamAudioTrack_0_1 = { |
+ .iface_macro = PPB_MEDIASTREAMAUDIOTRACK_INTERFACE_0_1, |
+ .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_MediaStreamAudioTrack_0_1, |
+ .real_iface = NULL |
+}; |
+ |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MediaStreamVideoTrack_0_1 = { |
.iface_macro = PPB_MEDIASTREAMVIDEOTRACK_INTERFACE_0_1, |
.wrapped_iface = (void *) &Pnacl_Wrappers_PPB_MediaStreamVideoTrack_0_1, |
@@ -5706,6 +5768,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = { |
&Pnacl_WrapperInfo_PPB_KeyboardInputEvent_1_0, |
&Pnacl_WrapperInfo_PPB_TouchInputEvent_1_0, |
&Pnacl_WrapperInfo_PPB_IMEInputEvent_1_0, |
+ &Pnacl_WrapperInfo_PPB_MediaStreamAudioTrack_0_1, |
&Pnacl_WrapperInfo_PPB_MediaStreamVideoTrack_0_1, |
&Pnacl_WrapperInfo_PPB_MessageLoop_1_0, |
&Pnacl_WrapperInfo_PPB_Messaging_1_0, |