Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:23:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "audio: Allow Module subclasses to customize Configuration" into main am: 00a7a24e0a am: 9767286509 am: 4125bf3bcf

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2656082

Change-Id: Iaabd3ae8295594a59cb88f1c91503284c589c104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mikhail Naganov
2023-07-15 02:05:13 +00:00
committed by Automerger Merge Worker
parent c44a6c1b4d 4125bf3bcf
commit 12bbfe0526
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
audio/aidl/default/Module.cpp
View File

@@ -286,22 +286,28 @@ std::set<int32_t> Module::portIdsFromPortConfigIds(C portConfigIds) {
return result;
}
std::unique_ptr<internal::Configuration> Module::initializeConfig() {
std::unique_ptr<internal::Configuration> config;
switch (getType()) {
case Type::DEFAULT:
config = std::move(internal::getPrimaryConfiguration());
break;
case Type::R_SUBMIX:
config = std::move(internal::getRSubmixConfiguration());
break;
case Type::STUB:
config = std::move(internal::getStubConfiguration());
break;
case Type::USB:
config = std::move(internal::getUsbConfiguration());
break;
}
return config;
}
internal::Configuration& Module::getConfig() {
if (!mConfig) {
switch (mType) {
case Type::DEFAULT:
mConfig = std::move(internal::getPrimaryConfiguration());
break;
case Type::R_SUBMIX:
mConfig = std::move(internal::getRSubmixConfiguration());
break;
case Type::STUB:
mConfig = std::move(internal::getStubConfiguration());
break;
case Type::USB:
mConfig = std::move(internal::getUsbConfiguration());
break;
}
mConfig = std::move(initializeConfig());
}
return *mConfig;
}

2
audio/aidl/default/include/core-impl/Module.h
View File

@@ -182,6 +182,7 @@ class Module : public BnModule {
const ::aidl::android::media::audio::common::AudioPort& audioPort, bool connected);
virtual ndk::ScopedAStatus onMasterMuteChanged(bool mute);
virtual ndk::ScopedAStatus onMasterVolumeChanged(float volume);
virtual std::unique_ptr<internal::Configuration> initializeConfig();
// Utility and helper functions accessible to subclasses.
void cleanUpPatch(int32_t patchId);
@@ -202,6 +203,7 @@ class Module : public BnModule {
bool getMicMute() const { return mMicMute; }
const Patches& getPatches() const { return mPatches; }
const Streams& getStreams() const { return mStreams; }
Type getType() const { return mType; }
bool isMmapSupported();
template <typename C>
std::set<int32_t> portIdsFromPortConfigIds(C portConfigIds);