summaryrefslogtreecommitdiffstats
path: root/ppapi/cpp/dev
diff options
context:
space:
mode:
authoryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-07 07:48:48 +0000
committeryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-07 07:48:48 +0000
commiteed24562b1e6a431fc726195e1114eed01b1694f (patch)
tree2ae570b6f55f7043e62bc25dca335d03ba75bb52 /ppapi/cpp/dev
parente974ad29d8f31b1f86bb551dc99ad4e5e62b002c (diff)
downloadchromium_src-eed24562b1e6a431fc726195e1114eed01b1694f.zip
chromium_src-eed24562b1e6a431fc726195e1114eed01b1694f.tar.gz
chromium_src-eed24562b1e6a431fc726195e1114eed01b1694f.tar.bz2
PPB_AudioInput_Dev: support multiple audio input devices - Part 1.
- This CL implements PPB_AudioInput_Dev v0.2 and extends examples/audio_input. - This CL doesn't actually open devices other than the default one. That will be in a separate CL. BUG=None TEST=examples/audio_input Review URL: http://codereview.chromium.org/9557007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/cpp/dev')
-rw-r--r--ppapi/cpp/dev/audio_input_dev.cc212
-rw-r--r--ppapi/cpp/dev/audio_input_dev.h66
2 files changed, 265 insertions, 13 deletions
diff --git a/ppapi/cpp/dev/audio_input_dev.cc b/ppapi/cpp/dev/audio_input_dev.cc
index 386345b..2429259 100644
--- a/ppapi/cpp/dev/audio_input_dev.cc
+++ b/ppapi/cpp/dev/audio_input_dev.cc
@@ -1,11 +1,15 @@
-// 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/cpp/dev/audio_input_dev.h"
#include "ppapi/c/dev/ppb_audio_input_dev.h"
+#include "ppapi/c/pp_bool.h"
#include "ppapi/c/pp_errors.h"
+#include "ppapi/cpp/completion_callback.h"
+#include "ppapi/cpp/dev/device_ref_dev.h"
+#include "ppapi/cpp/dev/resource_array_dev.h"
#include "ppapi/cpp/instance_handle.h"
#include "ppapi/cpp/module.h"
#include "ppapi/cpp/module_impl.h"
@@ -14,36 +18,222 @@ namespace pp {
namespace {
-template <> const char* interface_name<PPB_AudioInput_Dev>() {
- return PPB_AUDIO_INPUT_DEV_INTERFACE;
+template <> const char* interface_name<PPB_AudioInput_Dev_0_2>() {
+ return PPB_AUDIO_INPUT_DEV_INTERFACE_0_2;
+}
+
+template <> const char* interface_name<PPB_AudioInput_Dev_0_1>() {
+ return PPB_AUDIO_INPUT_DEV_INTERFACE_0_1;
}
} // namespace
+struct AudioInput_Dev::EnumerateDevicesState {
+ EnumerateDevicesState(std::vector<DeviceRef_Dev>* in_devices,
+ const CompletionCallback& in_callback,
+ AudioInput_Dev* in_audio_input)
+ : devices_resource(0),
+ devices(in_devices),
+ callback(in_callback),
+ audio_input(in_audio_input) {
+ }
+
+ PP_Resource devices_resource;
+ // This is owned by the user of AudioInput_Dev::EnumerateDevices().
+ std::vector<DeviceRef_Dev>* devices;
+ CompletionCallback callback;
+ AudioInput_Dev* audio_input;
+};
+
+AudioInput_Dev::AudioInput_Dev() : enum_state_(NULL),
+ audio_input_callback_(NULL),
+ user_data_(NULL) {
+}
+
AudioInput_Dev::AudioInput_Dev(const InstanceHandle& instance,
const AudioConfig& config,
PPB_AudioInput_Callback callback,
void* user_data)
- : config_(config) {
- if (has_interface<PPB_AudioInput_Dev>()) {
- PassRefFromConstructor(get_interface<PPB_AudioInput_Dev>()->Create(
+ : config_(config),
+ enum_state_(NULL),
+ audio_input_callback_(callback),
+ user_data_(user_data) {
+ if (has_interface<PPB_AudioInput_Dev_0_2>()) {
+ PassRefFromConstructor(get_interface<PPB_AudioInput_Dev_0_2>()->Create(
+ instance.pp_instance()));
+ } else if (has_interface<PPB_AudioInput_Dev_0_1>()) {
+ PassRefFromConstructor(get_interface<PPB_AudioInput_Dev_0_1>()->Create(
instance.pp_instance(), config.pp_resource(), callback, user_data));
}
}
+AudioInput_Dev::AudioInput_Dev(const InstanceHandle& instance)
+ : enum_state_(NULL),
+ audio_input_callback_(NULL),
+ user_data_(NULL) {
+ if (has_interface<PPB_AudioInput_Dev_0_2>()) {
+ PassRefFromConstructor(get_interface<PPB_AudioInput_Dev_0_2>()->Create(
+ instance.pp_instance()));
+ }
+}
+
+AudioInput_Dev::AudioInput_Dev(const AudioInput_Dev& other)
+ : Resource(other),
+ config_(other.config_),
+ enum_state_(NULL),
+ audio_input_callback_(other.audio_input_callback_),
+ user_data_(other.user_data_) {
+}
+
+AudioInput_Dev::~AudioInput_Dev() {
+ AbortEnumerateDevices();
+}
+
+AudioInput_Dev& AudioInput_Dev::operator=(const AudioInput_Dev& other) {
+ AbortEnumerateDevices();
+
+ Resource::operator=(other);
+ config_ = other.config_;
+ audio_input_callback_ = other.audio_input_callback_;
+ user_data_ = other.user_data_;
+ return *this;
+}
+
// static
bool AudioInput_Dev::IsAvailable() {
- return has_interface<PPB_AudioInput_Dev>();
+ return has_interface<PPB_AudioInput_Dev_0_2>() ||
+ has_interface<PPB_AudioInput_Dev_0_1>();
+}
+
+int32_t AudioInput_Dev::EnumerateDevices(std::vector<DeviceRef_Dev>* devices,
+ const CompletionCallback& callback) {
+ if (!has_interface<PPB_AudioInput_Dev_0_2>())
+ return callback.MayForce(PP_ERROR_NOINTERFACE);
+ if (!devices)
+ return callback.MayForce(PP_ERROR_BADARGUMENT);
+ if (!callback.pp_completion_callback().func)
+ return callback.MayForce(PP_ERROR_BLOCKS_MAIN_THREAD);
+ if (enum_state_)
+ return callback.MayForce(PP_ERROR_INPROGRESS);
+
+ // It will be deleted in OnEnumerateDevicesComplete().
+ enum_state_ = new EnumerateDevicesState(devices, callback, this);
+ return get_interface<PPB_AudioInput_Dev_0_2>()->EnumerateDevices(
+ pp_resource(), &enum_state_->devices_resource,
+ PP_MakeCompletionCallback(&AudioInput_Dev::OnEnumerateDevicesComplete,
+ enum_state_));
+}
+
+int32_t AudioInput_Dev::Open(const DeviceRef_Dev& device_ref,
+ const CompletionCallback& callback) {
+ if (has_interface<PPB_AudioInput_Dev_0_2>()) {
+ return get_interface<PPB_AudioInput_Dev_0_2>()->Open(
+ pp_resource(), device_ref.pp_resource(), config_.pp_resource(),
+ audio_input_callback_, user_data_, callback.pp_completion_callback());
+ }
+
+ if (has_interface<PPB_AudioInput_Dev_0_1>()) {
+ if (is_null())
+ return callback.MayForce(PP_ERROR_FAILED);
+
+ // If the v0.1 interface is being used and there is a valid resource handle,
+ // then the default device has been successfully opened during resource
+ // creation.
+ if (device_ref.is_null())
+ return callback.MayForce(PP_OK);
+
+ // The v0.1 interface doesn't support devices other than the default one.
+ return callback.MayForce(PP_ERROR_NOTSUPPORTED);
+ }
+
+ return callback.MayForce(PP_ERROR_NOINTERFACE);
+}
+
+int32_t AudioInput_Dev::Open(const DeviceRef_Dev& device_ref,
+ const AudioConfig& config,
+ PPB_AudioInput_Callback audio_input_callback,
+ void* user_data,
+ const CompletionCallback& callback) {
+ if (has_interface<PPB_AudioInput_Dev_0_2>()) {
+ return get_interface<PPB_AudioInput_Dev_0_2>()->Open(
+ pp_resource(), device_ref.pp_resource(), config.pp_resource(),
+ audio_input_callback, user_data, callback.pp_completion_callback());
+ }
+
+ return callback.MayForce(PP_ERROR_NOINTERFACE);
}
bool AudioInput_Dev::StartCapture() {
- return has_interface<PPB_AudioInput_Dev>() &&
- get_interface<PPB_AudioInput_Dev>()->StartCapture(pp_resource());
+ if (has_interface<PPB_AudioInput_Dev_0_2>()) {
+ return PP_ToBool(get_interface<PPB_AudioInput_Dev_0_2>()->StartCapture(
+ pp_resource()));
+ }
+
+ if (has_interface<PPB_AudioInput_Dev_0_1>()) {
+ return PP_ToBool(get_interface<PPB_AudioInput_Dev_0_1>()->StartCapture(
+ pp_resource()));
+ }
+
+ return false;
}
bool AudioInput_Dev::StopCapture() {
- return has_interface<PPB_AudioInput_Dev>() &&
- get_interface<PPB_AudioInput_Dev>()->StopCapture(pp_resource());
+ if (has_interface<PPB_AudioInput_Dev_0_2>()) {
+ return PP_ToBool(get_interface<PPB_AudioInput_Dev_0_2>()->StopCapture(
+ pp_resource()));
+ }
+
+ if (has_interface<PPB_AudioInput_Dev_0_1>()) {
+ return PP_ToBool(get_interface<PPB_AudioInput_Dev_0_1>()->StopCapture(
+ pp_resource()));
+ }
+
+ return false;
+}
+
+void AudioInput_Dev::Close() {
+ if (has_interface<PPB_AudioInput_Dev_0_2>())
+ get_interface<PPB_AudioInput_Dev_0_2>()->Close(pp_resource());
+}
+
+void AudioInput_Dev::AbortEnumerateDevices() {
+ if (enum_state_) {
+ enum_state_->devices = NULL;
+ Module::Get()->core()->CallOnMainThread(0, enum_state_->callback,
+ PP_ERROR_ABORTED);
+ enum_state_->audio_input = NULL;
+ enum_state_ = NULL;
+ }
+}
+
+// static
+void AudioInput_Dev::OnEnumerateDevicesComplete(void* user_data,
+ int32_t result) {
+ EnumerateDevicesState* enum_state =
+ static_cast<EnumerateDevicesState*>(user_data);
+
+ bool need_to_callback = !!enum_state->audio_input;
+
+ if (result == PP_OK) {
+ // It will take care of releasing the reference.
+ ResourceArray_Dev resources(pp::PASS_REF,
+ enum_state->devices_resource);
+
+ if (need_to_callback) {
+ enum_state->devices->clear();
+ for (uint32_t index = 0; index < resources.size(); ++index) {
+ DeviceRef_Dev device(resources[index]);
+ enum_state->devices->push_back(device);
+ }
+ }
+ }
+
+ if (need_to_callback) {
+ enum_state->audio_input->enum_state_ = NULL;
+ enum_state->callback.Run(result);
+ }
+
+ delete enum_state;
}
} // namespace pp
diff --git a/ppapi/cpp/dev/audio_input_dev.h b/ppapi/cpp/dev/audio_input_dev.h
index 2761437..2bcccc3 100644
--- a/ppapi/cpp/dev/audio_input_dev.h
+++ b/ppapi/cpp/dev/audio_input_dev.h
@@ -1,28 +1,49 @@
-// 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.
#ifndef PPAPI_CPP_DEV_AUDIO_INPUT_DEV_H_
#define PPAPI_CPP_DEV_AUDIO_INPUT_DEV_H_
+#include <vector>
+
#include "ppapi/c/dev/ppb_audio_input_dev.h"
#include "ppapi/cpp/audio_config.h"
#include "ppapi/cpp/resource.h"
namespace pp {
+class CompletionCallback;
+class DeviceRef_Dev;
class InstanceHandle;
class AudioInput_Dev : public Resource {
public:
/// An empty constructor for an AudioInput resource.
- AudioInput_Dev() {}
+ AudioInput_Dev();
+ /// This constructor tries to create an audio input resource using the v0.2
+ /// interface, and falls back on the v0.1 interface if that is not available.
+ /// Please use the 2-parameter Open() if you used this constructor.
+ ///
+ /// Note: This constructor is deprecated. Unless your code has to deal with
+ /// browsers that only support the v0.1 interface, please use the 1-parameter
+ /// constructor instead.
AudioInput_Dev(const InstanceHandle& instance,
const AudioConfig& config,
PPB_AudioInput_Callback callback,
void* user_data);
+ /// This constructor uses the v0.2 interface to create an audio input
+ /// resource. Please use the 5-parameter Open() if you used this constructor.
+ explicit AudioInput_Dev(const InstanceHandle& instance);
+
+ AudioInput_Dev(const AudioInput_Dev& other);
+
+ virtual ~AudioInput_Dev();
+
+ AudioInput_Dev& operator=(const AudioInput_Dev& other);
+
/// Static function for determining whether the browser supports the required
/// AudioInput interface.
///
@@ -42,11 +63,52 @@ class AudioInput_Dev : public Resource {
/// struct.
const AudioConfig& config() const { return config_; }
+ /// |devices| must stay alive until either this AudioInput_Dev object goes
+ /// away or |callback| is run, if this method returns PP_OK_COMPLETIONPENDING.
+ int32_t EnumerateDevices(std::vector<DeviceRef_Dev>* devices,
+ const CompletionCallback& callback);
+
+ /// If |device_ref| is null (i.e., is_null() returns true), the default device
+ /// will be used.
+ /// In order to maintain backward compatibility, this method doesn't have
+ /// input parameters config, audio_input_callback and user_data. Instead, it
+ /// uses those values stored when the 4-parameter constructor was called.
+ ///
+ /// Note: This method is deprecated. Unless your code has to deal with
+ /// browsers that only support the v0.1 interface, please use the other
+ /// Open().
+ int32_t Open(const DeviceRef_Dev& device_ref,
+ const CompletionCallback& callback);
+
+ int32_t Open(const DeviceRef_Dev& device_ref,
+ const AudioConfig& config,
+ PPB_AudioInput_Callback audio_input_callback,
+ void* user_data,
+ const CompletionCallback& callback);
+
bool StartCapture();
bool StopCapture();
+ void Close();
private:
+ struct EnumerateDevicesState;
+
+ void AbortEnumerateDevices();
+
+ // |user_data| is an EnumerateDevicesState object. It is this method's
+ // responsibility to delete it.
+ static void OnEnumerateDevicesComplete(void* user_data, int32_t result);
+
AudioConfig config_;
+
+ // It is set in EnumerateDevices(), and cleared in AbortEnumerateDevices() or
+ // OnEnumerateDevicesComplete(). The object will be deleted by
+ // OnEnumerateDevicesComplete().
+ EnumerateDevicesState* enum_state_;
+
+ // Used to store the arguments of Open() for the v0.2 interface.
+ PPB_AudioInput_Callback audio_input_callback_;
+ void* user_data_;
};
} // namespace pp
generated by cgit v1.1 at 2025-03-28 05:43:25 +0000