summaryrefslogtreecommitdiff
path: root/chromium/services/audio
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/services/audio')
-rw-r--r--chromium/services/audio/BUILD.gn1
-rw-r--r--chromium/services/audio/audio_sandbox_hook_linux.cc1
-rw-r--r--chromium/services/audio/group_coordinator.h2
-rw-r--r--chromium/services/audio/input_stream_unittest.cc8
-rw-r--r--chromium/services/audio/input_sync_writer.cc1
-rw-r--r--chromium/services/audio/input_sync_writer.h1
-rw-r--r--chromium/services/audio/output_controller.cc10
-rw-r--r--chromium/services/audio/output_stream_unittest.cc8
-rw-r--r--chromium/services/audio/public/cpp/device_factory.cc9
-rw-r--r--chromium/services/audio/public/cpp/device_factory.h6
-rw-r--r--chromium/services/audio/snooper_node_unittest.cc1
-rw-r--r--chromium/services/audio/sync_reader.cc1
12 files changed, 27 insertions, 22 deletions
diff --git a/chromium/services/audio/BUILD.gn b/chromium/services/audio/BUILD.gn
index a2e3952a651..dd4911729ab 100644
--- a/chromium/services/audio/BUILD.gn
+++ b/chromium/services/audio/BUILD.gn
@@ -157,7 +157,6 @@ source_set("tests") {
":audio",
"//base/test:test_support",
"//media:test_support",
- "//mojo/core/embedder",
"//services/audio/public/cpp",
"//services/audio/public/cpp:test_support",
"//services/audio/public/mojom",
diff --git a/chromium/services/audio/audio_sandbox_hook_linux.cc b/chromium/services/audio/audio_sandbox_hook_linux.cc
index 8220b54f7a8..dad4537c4c6 100644
--- a/chromium/services/audio/audio_sandbox_hook_linux.cc
+++ b/chromium/services/audio/audio_sandbox_hook_linux.cc
@@ -12,6 +12,7 @@
#include "base/environment.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/logging.h"
#include "base/path_service.h"
#include "base/strings/string_piece.h"
#include "base/strings/stringprintf.h"
diff --git a/chromium/services/audio/group_coordinator.h b/chromium/services/audio/group_coordinator.h
index 3f8ce11ba2b..a47f5019979 100644
--- a/chromium/services/audio/group_coordinator.h
+++ b/chromium/services/audio/group_coordinator.h
@@ -10,7 +10,7 @@
#include <vector>
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/macros.h"
#include "base/sequence_checker.h"
#include "base/stl_util.h"
diff --git a/chromium/services/audio/input_stream_unittest.cc b/chromium/services/audio/input_stream_unittest.cc
index 8662875f5e8..6f080d8c359 100644
--- a/chromium/services/audio/input_stream_unittest.cc
+++ b/chromium/services/audio/input_stream_unittest.cc
@@ -9,16 +9,17 @@
#include <utility>
#include "base/bind.h"
+#include "base/bind_helpers.h"
#include "base/memory/read_only_shared_memory_region.h"
#include "base/test/task_environment.h"
#include "media/audio/audio_io.h"
#include "media/audio/mock_audio_manager.h"
#include "media/audio/test_audio_thread.h"
-#include "mojo/core/embedder/embedder.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
+#include "mojo/public/cpp/system/functions.h"
#include "services/audio/stream_factory.h"
#include "services/audio/test/mock_log.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -128,14 +129,13 @@ class AudioServiceInputStreamTest : public testing::Test {
~AudioServiceInputStreamTest() override { audio_manager_.Shutdown(); }
void SetUp() override {
- mojo::core::SetDefaultProcessErrorCallback(
+ mojo::SetDefaultProcessErrorHandler(
base::BindRepeating(&AudioServiceInputStreamTest::BadMessageCallback,
base::Unretained(this)));
}
void TearDown() override {
- mojo::core::SetDefaultProcessErrorCallback(
- mojo::core::ProcessErrorCallback());
+ mojo::SetDefaultProcessErrorHandler(base::NullCallback());
}
mojo::PendingRemote<media::mojom::AudioInputStream> CreateStream(
diff --git a/chromium/services/audio/input_sync_writer.cc b/chromium/services/audio/input_sync_writer.cc
index 250c1802f63..8d122b77462 100644
--- a/chromium/services/audio/input_sync_writer.cc
+++ b/chromium/services/audio/input_sync_writer.cc
@@ -8,6 +8,7 @@
#include <utility>
#include "base/format_macros.h"
+#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/stringprintf.h"
#include "base/trace_event/trace_event.h"
diff --git a/chromium/services/audio/input_sync_writer.h b/chromium/services/audio/input_sync_writer.h
index 1345702c3f4..b5e88e0882a 100644
--- a/chromium/services/audio/input_sync_writer.h
+++ b/chromium/services/audio/input_sync_writer.h
@@ -12,7 +12,6 @@
#include <string>
#include <vector>
-#include "base/containers/circular_deque.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "base/memory/read_only_shared_memory_region.h"
diff --git a/chromium/services/audio/output_controller.cc b/chromium/services/audio/output_controller.cc
index c154a0ebb97..3a84f463900 100644
--- a/chromium/services/audio/output_controller.cc
+++ b/chromium/services/audio/output_controller.cc
@@ -14,6 +14,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/compiler_specific.h"
+#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/numerics/safe_conversions.h"
#include "base/stl_util.h"
@@ -150,7 +151,7 @@ OutputController::OutputController(media::AudioManager* audio_manager,
task_runner_(audio_manager->GetTaskRunner()),
construction_time_(base::TimeTicks::Now()),
output_device_id_(output_device_id),
- stream_(NULL),
+ stream_(nullptr),
disable_local_output_(false),
volume_(1.0),
state_(kEmpty),
@@ -183,7 +184,6 @@ bool OutputController::CreateStream() {
void OutputController::RecreateStreamWithTimingUMA(
OutputController::RecreateReason reason) {
- SCOPED_UMA_HISTOGRAM_TIMER("Media.AudioOutputController.CreateTime");
RecreateStream(reason);
}
@@ -300,7 +300,6 @@ void OutputController::RecreateStream(OutputController::RecreateReason reason) {
void OutputController::Play() {
DCHECK(task_runner_->BelongsToCurrentThread());
- SCOPED_UMA_HISTOGRAM_TIMER("Media.AudioOutputController.PlayTime");
TRACE_EVENT0("audio", "OutputController::Play");
SendLogMessage("%s([state=%s])", __func__, StateToString(state_));
@@ -347,7 +346,6 @@ void OutputController::StopStream() {
void OutputController::Pause() {
DCHECK(task_runner_->BelongsToCurrentThread());
- SCOPED_UMA_HISTOGRAM_TIMER("Media.AudioOutputController.PauseTime");
TRACE_EVENT0("audio", "OutputController::Pause");
SendLogMessage("%s([state=%s])", __func__, StateToString(state_));
@@ -384,7 +382,6 @@ void OutputController::Flush() {
void OutputController::Close() {
DCHECK(task_runner_->BelongsToCurrentThread());
TRACE_EVENT0("audio", "OutputController::Close");
- SCOPED_UMA_HISTOGRAM_TIMER("Media.AudioOutputController.CloseTime");
SendLogMessage("%s([state=%s])", __func__, StateToString(state_));
if (state_ != kClosed) {
@@ -530,7 +527,7 @@ void OutputController::StopCloseAndClearStream() {
stream_->Close();
stats_tracker_.reset();
- stream_ = NULL;
+ stream_ = nullptr;
}
state_ = kEmpty;
@@ -612,7 +609,6 @@ void OutputController::OnDeviceChange() {
if (disable_local_output_)
return; // No actions need to be taken while local output is disabled.
- SCOPED_UMA_HISTOGRAM_TIMER("Media.AudioOutputController.DeviceChangeTime");
SendLogMessage("%s([state=%s])", __func__, StateToString(state_));
// TODO(dalecurtis): Notify the renderer side that a device change has
diff --git a/chromium/services/audio/output_stream_unittest.cc b/chromium/services/audio/output_stream_unittest.cc
index 4385a693e0d..912fbddf9e5 100644
--- a/chromium/services/audio/output_stream_unittest.cc
+++ b/chromium/services/audio/output_stream_unittest.cc
@@ -7,15 +7,16 @@
#include <utility>
#include "base/bind.h"
+#include "base/bind_helpers.h"
#include "base/test/mock_callback.h"
#include "base/test/task_environment.h"
#include "base/unguessable_token.h"
#include "media/audio/audio_io.h"
#include "media/audio/mock_audio_manager.h"
#include "media/audio/test_audio_thread.h"
-#include "mojo/core/embedder/embedder.h"
#include "mojo/public/cpp/bindings/associated_receiver.h"
#include "mojo/public/cpp/bindings/receiver.h"
+#include "mojo/public/cpp/system/functions.h"
#include "services/audio/stream_factory.h"
#include "services/audio/test/mock_log.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -122,13 +123,12 @@ class TestEnvironment {
stream_factory_receiver_(
&stream_factory_,
remote_stream_factory_.BindNewPipeAndPassReceiver()) {
- mojo::core::SetDefaultProcessErrorCallback(bad_message_callback_.Get());
+ mojo::SetDefaultProcessErrorHandler(bad_message_callback_.Get());
}
~TestEnvironment() {
audio_manager_.Shutdown();
- mojo::core::SetDefaultProcessErrorCallback(
- mojo::core::ProcessErrorCallback());
+ mojo::SetDefaultProcessErrorHandler(base::NullCallback());
}
using MockDeleteCallback = base::MockCallback<OutputStream::DeleteCallback>;
diff --git a/chromium/services/audio/public/cpp/device_factory.cc b/chromium/services/audio/public/cpp/device_factory.cc
index 3ecbe054180..0271211f693 100644
--- a/chromium/services/audio/public/cpp/device_factory.cc
+++ b/chromium/services/audio/public/cpp/device_factory.cc
@@ -16,18 +16,21 @@ namespace audio {
scoped_refptr<media::AudioCapturerSource> CreateInputDevice(
mojo::PendingRemote<mojom::StreamFactory> stream_factory,
const std::string& device_id,
+ DeadStreamDetection detect_dead_stream,
mojo::PendingRemote<media::mojom::AudioLog> log) {
std::unique_ptr<media::AudioInputIPC> ipc = std::make_unique<InputIPC>(
std::move(stream_factory), device_id, std::move(log));
return base::MakeRefCounted<media::AudioInputDevice>(
- std::move(ipc), media::AudioInputDevice::Purpose::kUserInput);
+ std::move(ipc), media::AudioInputDevice::Purpose::kUserInput,
+ detect_dead_stream);
}
scoped_refptr<media::AudioCapturerSource> CreateInputDevice(
mojo::PendingRemote<mojom::StreamFactory> stream_factory,
- const std::string& device_id) {
+ const std::string& device_id,
+ DeadStreamDetection detect_dead_stream) {
return CreateInputDevice(std::move(stream_factory), device_id,
- mojo::NullRemote());
+ detect_dead_stream, mojo::NullRemote());
}
} // namespace audio
diff --git a/chromium/services/audio/public/cpp/device_factory.h b/chromium/services/audio/public/cpp/device_factory.h
index a079a470fbc..843fbc5e85e 100644
--- a/chromium/services/audio/public/cpp/device_factory.h
+++ b/chromium/services/audio/public/cpp/device_factory.h
@@ -14,13 +14,17 @@
namespace audio {
+using DeadStreamDetection = media::AudioInputDevice::DeadStreamDetection;
+
scoped_refptr<media::AudioCapturerSource> CreateInputDevice(
mojo::PendingRemote<mojom::StreamFactory> stream_factory,
- const std::string& device_id);
+ const std::string& device_id,
+ DeadStreamDetection detect_dead_stream);
scoped_refptr<media::AudioCapturerSource> CreateInputDevice(
mojo::PendingRemote<mojom::StreamFactory> stream_factory,
const std::string& device_id,
+ DeadStreamDetection detect_dead_stream,
mojo::PendingRemote<media::mojom::AudioLog>);
} // namespace audio
diff --git a/chromium/services/audio/snooper_node_unittest.cc b/chromium/services/audio/snooper_node_unittest.cc
index 07f5f0164ed..63ac9c0aba9 100644
--- a/chromium/services/audio/snooper_node_unittest.cc
+++ b/chromium/services/audio/snooper_node_unittest.cc
@@ -11,6 +11,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
+#include "base/logging.h"
#include "base/memory/scoped_refptr.h"
#include "base/optional.h"
#include "base/strings/string_piece.h"
diff --git a/chromium/services/audio/sync_reader.cc b/chromium/services/audio/sync_reader.cc
index 17889fb4b83..fbd4b1dc4ab 100644
--- a/chromium/services/audio/sync_reader.cc
+++ b/chromium/services/audio/sync_reader.cc
@@ -11,6 +11,7 @@
#include "base/command_line.h"
#include "base/format_macros.h"
+#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/stringprintf.h"
View Lorry Controller Status