tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "audio: Set connectedProfiles for non-attached device ports." am: 006a136ea7 am: bfe40ea2b0 am: 238ac10089

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

Change-Id: I1e99456e32979b79f4d0b8a0b1ba6e0cdf3edfd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mikhail Naganov 2023-10-14 00:28:45 +00:00 committed by Automerger Merge Worker
commit 21da9979f0
4 changed files with 2 additions and 41 deletions
Show stats 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);