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

Commit 7e241b35 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by android-build-merger
Browse files

audio: Cleanup VTS tests am: 13b99b4c am: 740cb65b 

am: 598db708

Change-Id: I0ec9112a79bd66c506228c8b7bc56931c0847536
parents 640ed277 598db708

audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h

+2 −20
Original line number Diff line number Diff line
@@ -717,12 +717,6 @@ INSTANTIATE_TEST_CASE_P( 
                ::testing::ValuesIn(ConfigHelper::getRequiredSupportCaptureAudioConfig()),

                ::testing::Values(AudioInputFlag::NONE)),

        &DeviceConfigParameterToString);

INSTANTIATE_TEST_CASE_P(

        SupportedInputBufferSize, RequiredInputBufferSizeTest,

        ::testing::Combine(::testing::ValuesIn(getDeviceParameters()),

                           ::testing::ValuesIn(ConfigHelper::getSupportedCaptureAudioConfig()),

                           ::testing::Values(AudioInputFlag::NONE)),

        &DeviceConfigParameterToString);

INSTANTIATE_TEST_CASE_P(

        RecommendedCaptureAudioConfigSupport, OptionalInputBufferSizeTest,

        ::testing::Combine(
@@ -930,12 +924,6 @@ INSTANTIATE_TEST_CASE_P( 
                ::testing::ValuesIn(ConfigHelper::getRequiredSupportPlaybackAudioConfig()),

                ::testing::Values(AudioOutputFlag::NONE)),

        &DeviceConfigParameterToString);

INSTANTIATE_TEST_CASE_P(

        SupportedOutputStreamConfig, OutputStreamTest,

        ::testing::Combine(::testing::ValuesIn(getDeviceParameters()),

                           ::testing::ValuesIn(ConfigHelper::getSupportedPlaybackAudioConfig()),

                           ::testing::Values(AudioOutputFlag::NONE)),

        &DeviceConfigParameterToString);

INSTANTIATE_TEST_CASE_P(

        RecommendedOutputStreamConfigSupport, OutputStreamTest,

        ::testing::Combine(
@@ -946,7 +934,7 @@ INSTANTIATE_TEST_CASE_P( 
#elif MAJOR_VERSION >= 6

// For V6 and above test according to the audio policy manager configuration.

// This is more correct as CDD is written from the apps perspective.

// Audio system provides necessary format conversions for the missing configurations.

// Audio system provides necessary format conversions for missing configurations.

INSTANTIATE_TEST_CASE_P(DeclaredOutputStreamConfigSupport, OutputStreamTest,

                        ::testing::ValuesIn(getOutputDeviceConfigParameters()),

                        &DeviceConfigParameterToString);
@@ -991,12 +979,6 @@ INSTANTIATE_TEST_CASE_P( 
                ::testing::ValuesIn(ConfigHelper::getRequiredSupportCaptureAudioConfig()),

                ::testing::Values(AudioInputFlag::NONE)),

        &DeviceConfigParameterToString);

INSTANTIATE_TEST_CASE_P(

        SupportedInputStreamConfig, InputStreamTest,

        ::testing::Combine(::testing::ValuesIn(getDeviceParameters()),

                           ::testing::ValuesIn(ConfigHelper::getSupportedCaptureAudioConfig()),

                           ::testing::Values(AudioInputFlag::NONE)),

        &DeviceConfigParameterToString);

INSTANTIATE_TEST_CASE_P(

        RecommendedInputStreamConfigSupport, InputStreamTest,

        ::testing::Combine(
@@ -1007,7 +989,7 @@ INSTANTIATE_TEST_CASE_P( 
#elif MAJOR_VERSION >= 6

// For V6 and above test according to the audio policy manager configuration.

// This is more correct as CDD is written from the apps perspective.

// Audio system provides necessary format conversions for the missing configurations.

// Audio system provides necessary format conversions for missing configurations.

INSTANTIATE_TEST_CASE_P(DeclaredInputStreamConfigSupport, InputStreamTest,

                        ::testing::ValuesIn(getInputDeviceConfigParameters()),

                        &DeviceConfigParameterToString);

audio/core/all-versions/vts/functional/ConfigHelper.h

+0 −11
Original line number Diff line number Diff line
@@ -57,12 +57,6 @@ struct ConfigHelper { 
                                  {24000, 48000}, {AudioFormat::PCM_16_BIT});

    }



    static const vector<AudioConfig> getSupportedPlaybackAudioConfig() {

        // TODO: retrieve audio config supported by the platform

        // as declared in the policy configuration

        return {};

    }



    static const vector<AudioConfig> getRequiredSupportCaptureAudioConfig() {

        if (!primaryHasMic()) return {};

        return combineAudioConfig({AudioChannelMask::IN_MONO}, {8000, 11025, 16000, 44100},
@@ -73,11 +67,6 @@ struct ConfigHelper { 
        return combineAudioConfig({AudioChannelMask::IN_STEREO}, {22050, 48000},

                                  {AudioFormat::PCM_16_BIT});

    }

    static const vector<AudioConfig> getSupportedCaptureAudioConfig() {

        // TODO: retrieve audio config supported by the platform

        // as declared in the policy configuration

        return {};

    }



    static vector<AudioConfig> combineAudioConfig(vector<audio_channel_mask_t> channelMasks,

                                                  vector<uint32_t> sampleRates,