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

Revert "audio: Set connectedProfiles for non-attached device ports."

Browse Source 
Revert submission 2770886-AidlAudioHalModuleConfig

Reason for revert: Breaks BluetoothInstrumentationTests on main downstream

Reverted changes: /q/submissionid:2770886-AidlAudioHalModuleConfig

Bug: 305291602
Change-Id: Id325171baeabd61d244e5f15c37f7d14402bd426
This commit is contained in:
Mikhail Naganov
2023-10-13 23:38:25 +00:00
parent 567d0de485
commit 006a136ea7
4 changed files with 2 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
audio/aidl/default/Configuration.cpp
View File

@@ -135,22 +135,6 @@ static AudioRoute createRoute(const std::vector<AudioPort>& sources, const Audio
return route;
}
std::vector<AudioProfile> getStandard16And24BitPcmAudioProfiles() {
auto createStdPcmAudioProfile = [](const PcmType& pcmType) {
return AudioProfile{
.format = AudioFormatDescription{.type = AudioFormatType::PCM, .pcm = pcmType},
.channelMasks = {AudioChannelLayout::make<AudioChannelLayout::layoutMask>(
AudioChannelLayout::LAYOUT_MONO),
AudioChannelLayout::make<AudioChannelLayout::layoutMask>(
AudioChannelLayout::LAYOUT_STEREO)},
.sampleRates = {8000, 11025, 16000, 32000, 44100, 48000}};
};
return {
createStdPcmAudioProfile(PcmType::INT_16_BIT),
createStdPcmAudioProfile(PcmType::INT_24_BIT),
};
}
// Primary (default) configuration:
//
// Device ports:

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

@@ -185,11 +185,6 @@ std::ostream& operator<<(std::ostream& os, Module::Type t) {
return os;
}
Module::Module(Type type, std::unique_ptr<Configuration>&& config)
: mType(type), mConfig(std::move(config)) {
populateConnectedProfiles();
}
void Module::cleanUpPatch(int32_t patchId) {
erase_all_values(mPatches, std::set<int32_t>{patchId});
}
@@ -325,22 +320,6 @@ ndk::ScopedAStatus Module::findPortIdForNewStream(int32_t in_portConfigId, Audio
return ndk::ScopedAStatus::ok();
}
void Module::populateConnectedProfiles() {
Configuration& config = getConfig();
for (const AudioPort& port : config.ports) {
if (port.ext.getTag() == AudioPortExt::device) {
if (auto devicePort = port.ext.get<AudioPortExt::device>();
!devicePort.device.type.connection.empty() && port.profiles.empty()) {
if (auto connIt = config.connectedProfiles.find(port.id);
connIt == config.connectedProfiles.end()) {
config.connectedProfiles.emplace(
port.id, internal::getStandard16And24BitPcmAudioProfiles());
}
}
}
}
}
template <typename C>
std::set<int32_t> Module::portIdsFromPortConfigIds(C portConfigIds) {
std::set<int32_t> result;

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

@@ -23,7 +23,5 @@
namespace aidl::android::hardware::audio::core::internal {
std::unique_ptr<Module::Configuration> getConfiguration(Module::Type moduleType);
std::vector<aidl::android::media::audio::common::AudioProfile>
getStandard16And24BitPcmAudioProfiles();
} // namespace aidl::android::hardware::audio::core::internal

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

@@ -60,7 +60,8 @@ class Module : public BnModule {
std::unique_ptr<Configuration>&& config);
static std::optional<Type> typeFromString(const std::string& type);
Module(Type type, std::unique_ptr<Configuration>&& config);
Module(Type type, std::unique_ptr<Configuration>&& config)
: mType(type), mConfig(std::move(config)) {}
protected:
// The vendor extension done via inheritance can override interface methods and augment
@@ -234,7 +235,6 @@ class Module : public BnModule {
const Streams& getStreams() const { return mStreams; }
Type getType() const { return mType; }
bool isMmapSupported();
void populateConnectedProfiles();
template <typename C>
std::set<int32_t> portIdsFromPortConfigIds(C portConfigIds);
void registerPatch(const AudioPatch& patch);