Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff656cdb authored by Lynn Yeh's avatar Lynn Yeh Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cherrypicker-L14200030003427558:N90600030054625545" into 24D1-dev 

* changes:
  audio: Use more bursts in audio I/O VTS tests
  audio: Fix AudioPatchTest/AudioModulePatch#UpdateInvalidPatchId VTS test
  audio: Skip stream I/O test for "echo reference" input device
  audio: Update 'PauseSync' scenario in AudioStreamIoOutTest
  audio: Fix IStreamIn.getActiveMicrophones test
  audio: Use allow list for device connection types in TryConnectMissingDevice
  audio: Fix some VTS issues on real devices
parents e2218d7b 940c84b4

audio/aidl/common/include/Utils.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -177,6 +177,12 @@ constexpr U makeBitPositionFlagMask(std::initializer_list<E> flags) { 
    return result;

    return result;

}

}





template <typename E, typename U = std::underlying_type_t<E>,

          typename = std::enable_if_t<is_bit_position_enum<E>::value>>

constexpr bool isAnyBitPositionFlagSet(U mask, std::initializer_list<E> flags) {

    return (mask & makeBitPositionFlagMask<E>(flags)) != 0;

}



constexpr int32_t frameCountFromDurationUs(long durationUs, int32_t sampleRateHz) {

constexpr int32_t frameCountFromDurationUs(long durationUs, int32_t sampleRateHz) {

    return (static_cast<long long>(durationUs) * sampleRateHz) / 1000000LL;

    return (static_cast<long long>(durationUs) * sampleRateHz) / 1000000LL;

}

}

audio/aidl/vts/ModuleConfig.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -551,6 +551,11 @@ std::vector<AudioPortConfig> ModuleConfig::generateAudioDevicePortConfigs( 
    return result;

    return result;

}

}





std::optional<AudioPort> ModuleConfig::getPort(int32_t portId) {

    auto portsIt = findById(mPorts, portId);

    return portsIt != mPorts.end() ? std::optional<AudioPort>(*portsIt) : std::nullopt;

}



ndk::ScopedAStatus ModuleConfig::onExternalDeviceConnected(IModule* module, const AudioPort& port) {

ndk::ScopedAStatus ModuleConfig::onExternalDeviceConnected(IModule* module, const AudioPort& port) {

    RETURN_STATUS_IF_ERROR(module->getAudioPorts(&mPorts));

    RETURN_STATUS_IF_ERROR(module->getAudioPorts(&mPorts));

    RETURN_STATUS_IF_ERROR(module->getAudioRoutes(&mRoutes));

    RETURN_STATUS_IF_ERROR(module->getAudioRoutes(&mRoutes));

audio/aidl/vts/ModuleConfig.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -166,6 +166,8 @@ class ModuleConfig { 
        return *config.begin();

        return *config.begin();

    }

    }





    std::optional<aidl::android::media::audio::common::AudioPort> getPort(int32_t portId);



    ndk::ScopedAStatus onExternalDeviceConnected(

    ndk::ScopedAStatus onExternalDeviceConnected(

            aidl::android::hardware::audio::core::IModule* module,

            aidl::android::hardware::audio::core::IModule* module,

            const aidl::android::media::audio::common::AudioPort& port);

            const aidl::android::media::audio::common::AudioPort& port);

audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp

+261 −145

File changed.

Preview size limit exceeded, changes collapsed.