diff --git a/audio/aidl/default/Configuration.cpp b/audio/aidl/default/Configuration.cpp index d09552b3c0..cf5f066c7c 100644 --- a/audio/aidl/default/Configuration.cpp +++ b/audio/aidl/default/Configuration.cpp @@ -135,22 +135,6 @@ static AudioRoute createRoute(const std::vector& sources, const Audio return route; } -std::vector getStandard16And24BitPcmAudioProfiles() { - auto createStdPcmAudioProfile = [](const PcmType& pcmType) { - return AudioProfile{ - .format = AudioFormatDescription{.type = AudioFormatType::PCM, .pcm = pcmType}, - .channelMasks = {AudioChannelLayout::make( - AudioChannelLayout::LAYOUT_MONO), - AudioChannelLayout::make( - 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: diff --git a/audio/aidl/default/Module.cpp b/audio/aidl/default/Module.cpp index 10450099e1..cad239f161 100644 --- a/audio/aidl/default/Module.cpp +++ b/audio/aidl/default/Module.cpp @@ -185,11 +185,6 @@ std::ostream& operator<<(std::ostream& os, Module::Type t) { return os; } -Module::Module(Type type, std::unique_ptr&& config) - : mType(type), mConfig(std::move(config)) { - populateConnectedProfiles(); -} - void Module::cleanUpPatch(int32_t patchId) { erase_all_values(mPatches, std::set{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(); - !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 std::set Module::portIdsFromPortConfigIds(C portConfigIds) { std::set result; diff --git a/audio/aidl/default/include/core-impl/Configuration.h b/audio/aidl/default/include/core-impl/Configuration.h index a56c8c9f98..aa7b9fff97 100644 --- a/audio/aidl/default/include/core-impl/Configuration.h +++ b/audio/aidl/default/include/core-impl/Configuration.h @@ -23,7 +23,5 @@ namespace aidl::android::hardware::audio::core::internal { std::unique_ptr getConfiguration(Module::Type moduleType); -std::vector -getStandard16And24BitPcmAudioProfiles(); } // namespace aidl::android::hardware::audio::core::internal diff --git a/audio/aidl/default/include/core-impl/Module.h b/audio/aidl/default/include/core-impl/Module.h index 718c07d973..bc5c5781db 100644 --- a/audio/aidl/default/include/core-impl/Module.h +++ b/audio/aidl/default/include/core-impl/Module.h @@ -60,7 +60,8 @@ class Module : public BnModule { std::unique_ptr&& config); static std::optional typeFromString(const std::string& type); - Module(Type type, std::unique_ptr&& config); + Module(Type type, std::unique_ptr&& 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 std::set portIdsFromPortConfigIds(C portConfigIds); void registerPatch(const AudioPatch& patch);