Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(782)

Unified Diff: components/arc/audio/arc_audio_bridge.cc

Issue 1817093003: Host-side implementation of ARC audio bridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed AudioHost interface, added Extensible to AudioSwitch enum, etc. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/arc/audio/arc_audio_bridge.h ('k') | components/arc/common/arc_bridge.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/arc/audio/arc_audio_bridge.cc
diff --git a/components/arc/audio/arc_audio_bridge.cc b/components/arc/audio/arc_audio_bridge.cc
new file mode 100644
index 0000000000000000000000000000000000000000..18c02e31c8fcead4d42179ce54f2d40cab109fea
--- /dev/null
+++ b/components/arc/audio/arc_audio_bridge.cc
@@ -0,0 +1,70 @@
+// Copyright 2016 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 "components/arc/audio/arc_audio_bridge.h"
+
+#include "base/logging.h"
+#include "chromeos/audio/audio_device.h"
+
+namespace arc {
+
+ArcAudioBridge::ArcAudioBridge(ArcBridgeService* bridge_service)
+ : ArcService(bridge_service) {
+ arc_bridge_service()->AddObserver(this);
+ if (chromeos::CrasAudioHandler::IsInitialized()) {
+ cras_audio_handler_ = chromeos::CrasAudioHandler::Get();
+ cras_audio_handler_->AddAudioObserver(this);
+ }
+}
+
+ArcAudioBridge::~ArcAudioBridge() {
+ arc_bridge_service()->RemoveObserver(this);
+ if (cras_audio_handler_ && chromeos::CrasAudioHandler::IsInitialized()) {
+ cras_audio_handler_->RemoveAudioObserver(this);
+ }
+}
+
+void ArcAudioBridge::OnAudioInstanceReady() {
Luis Héctor Chávez 2016/03/25 16:08:23 This method does not actually do anything useful n
chinyue 2016/03/28 08:23:17 Done.
+ AudioInstance* audio_instance = arc_bridge_service()->audio_instance();
+ if (!audio_instance) {
+ LOG(ERROR) << "OnAudioInstanceReady called, but no audio instance found";
+ return;
+ }
+}
+
+void ArcAudioBridge::OnAudioNodesChanged() {
+ uint64_t output_id = cras_audio_handler_->GetPrimaryActiveOutputNode();
+ const chromeos::AudioDevice* output_device =
+ cras_audio_handler_->GetDeviceFromId(output_id);
+ bool headphone_inserted =
+ (output_device &&
+ output_device->type == chromeos::AudioDeviceType::AUDIO_TYPE_HEADPHONE);
+
+ uint64_t input_id = cras_audio_handler_->GetPrimaryActiveInputNode();
+ const chromeos::AudioDevice* input_device =
+ cras_audio_handler_->GetDeviceFromId(input_id);
+ bool microphone_inserted =
+ (input_device &&
+ input_device->type == chromeos::AudioDeviceType::AUDIO_TYPE_MIC);
+
+ VLOG(1) << "HEADPHONE " << headphone_inserted
+ << " MICROPHONE " << microphone_inserted;
+ SendSwitchState(headphone_inserted, microphone_inserted);
+}
+
+void ArcAudioBridge::SendSwitchState(bool headphone_inserted,
+ bool microphone_inserted) {
+ int switch_state = 0;
Luis Héctor Chávez 2016/03/25 16:08:23 nit: Use uint32_t for consistency.
chinyue 2016/03/28 08:23:17 Done.
+ if (headphone_inserted)
+ switch_state |= (1 << (int)AudioSwitch::SW_HEADPHONE_INSERT);
Luis Héctor Chávez 2016/03/25 16:08:23 nit: static_cast<uint32_t>(...) or uint32_t{...};
chinyue 2016/03/28 08:23:17 Done.
+ if (microphone_inserted)
+ switch_state |= (1 << (int)AudioSwitch::SW_MICROPHONE_INSERT);
+
+ VLOG(1) << "Send switch state " << switch_state;
+ AudioInstance* audio_instance = arc_bridge_service()->audio_instance();
+ if (audio_instance)
+ audio_instance->NotifySwitchState(switch_state);
+}
+
+} // namespace arc
« no previous file with comments | « components/arc/audio/arc_audio_bridge.h ('k') | components/arc/common/arc_bridge.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698