forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Host-side implementation of ARC audio bridge.
BUG=b:26933097 Review URL: https://codereview.chromium.org/1817093003 Cr-Commit-Position: refs/heads/master@{#383926}
- Loading branch information
chinyue
authored and
Commit bot
committed
Mar 30, 2016
1 parent
b0b70b1
commit beb9aec
Showing
11 changed files
with
177 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| include_rules = [ | ||
| "+chromeos/audio", | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| // 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::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) { | ||
| uint32_t switch_state = 0; | ||
| if (headphone_inserted) { | ||
| switch_state |= | ||
| (1 << static_cast<uint32_t>(AudioSwitch::SW_HEADPHONE_INSERT)); | ||
| } | ||
| if (microphone_inserted) { | ||
| switch_state |= | ||
| (1 << static_cast<uint32_t>(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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| // 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. | ||
|
|
||
| #ifndef COMPONENTS_ARC_AUDIO_ARC_AUDIO_BRIDGE_H_ | ||
| #define COMPONENTS_ARC_AUDIO_ARC_AUDIO_BRIDGE_H_ | ||
|
|
||
| #include <string> | ||
|
|
||
| #include "base/macros.h" | ||
| #include "chromeos/audio/cras_audio_handler.h" | ||
| #include "components/arc/arc_bridge_service.h" | ||
| #include "components/arc/arc_service.h" | ||
| #include "mojo/public/cpp/bindings/binding.h" | ||
|
|
||
| namespace arc { | ||
|
|
||
| class ArcAudioBridge : public ArcService, | ||
| public ArcBridgeService::Observer, | ||
| public chromeos::CrasAudioHandler::AudioObserver { | ||
| public: | ||
| explicit ArcAudioBridge(ArcBridgeService* bridge_service); | ||
| ~ArcAudioBridge() override; | ||
|
|
||
| private: | ||
| chromeos::CrasAudioHandler* cras_audio_handler_ = nullptr; | ||
|
|
||
| // chromeos::CrasAudioHandler::AudioObserver overrides. | ||
| void OnAudioNodesChanged() override; | ||
|
|
||
| void SendSwitchState(bool headphone_inserted, bool microphone_inserted); | ||
|
|
||
| DISALLOW_COPY_AND_ASSIGN(ArcAudioBridge); | ||
| }; | ||
|
|
||
| } // namespace arc | ||
|
|
||
| #endif // COMPONENTS_ARC_AUDIO_ARC_AUDIO_BRIDGE_H_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| // 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. | ||
|
|
||
| module arc; | ||
|
|
||
| // Use same switch values as kernel switch events. | ||
| [Extensible] | ||
| enum AudioSwitch { | ||
| SW_HEADPHONE_INSERT = 0x02, | ||
| SW_MICROPHONE_INSERT = 0x04 | ||
| }; | ||
|
|
||
| interface AudioInstance { | ||
| // Notify plug states of headphone, microphone, etc. Each switch state is | ||
| // represented by the corresponding bit, if the bit is set then the switch | ||
| // is plugged/inserted. | ||
| NotifySwitchState(uint32 state); | ||
| }; |