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

Commit c9691a7b authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio: add new flags for spatialization behavior" into sc-v2-dev

parents d9125699 ac08f91f

media/libaudioclient/AidlConversion.cpp

+8 −0
Original line number Diff line number Diff line
@@ -1361,6 +1361,10 @@ aidl2legacy_AudioFlag_audio_flags_mask_t(media::AudioFlag aidl) { 
            return AUDIO_FLAG_NO_SYSTEM_CAPTURE;

        case media::AudioFlag::CAPTURE_PRIVATE:

            return AUDIO_FLAG_CAPTURE_PRIVATE;

        case media::AudioFlag::CONTENT_SPATIALIZED:

            return AUDIO_FLAG_CONTENT_SPATIALIZED;

        case media::AudioFlag::NEVER_SPATIALIZE:

            return AUDIO_FLAG_NEVER_SPATIALIZE;

    }

    return unexpected(BAD_VALUE);

}
@@ -1398,6 +1402,10 @@ legacy2aidl_audio_flags_mask_t_AudioFlag(audio_flags_mask_t legacy) { 
            return media::AudioFlag::NO_SYSTEM_CAPTURE;

        case AUDIO_FLAG_CAPTURE_PRIVATE:

            return media::AudioFlag::CAPTURE_PRIVATE;

        case AUDIO_FLAG_CONTENT_SPATIALIZED:

            return media::AudioFlag::CONTENT_SPATIALIZED;

        case AUDIO_FLAG_NEVER_SPATIALIZE:

            return media::AudioFlag::NEVER_SPATIALIZE;

    }

    return unexpected(BAD_VALUE);

}

media/libaudioclient/aidl/android/media/AudioFlag.aidl

+2 −0
Original line number Diff line number Diff line
@@ -34,4 +34,6 @@ enum AudioFlag { 
    MUTE_HAPTIC = 11,

    NO_SYSTEM_CAPTURE = 12,

    CAPTURE_PRIVATE = 13,

    CONTENT_SPATIALIZED = 14,

    NEVER_SPATIALIZE = 15,

}

media/libmediahelper/TypeConverter.cpp

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ const AudioFlagConverter::Table AudioFlagConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_FLAG_MUTE_HAPTIC),

    MAKE_STRING_FROM_ENUM(AUDIO_FLAG_NO_SYSTEM_CAPTURE),

    MAKE_STRING_FROM_ENUM(AUDIO_FLAG_CAPTURE_PRIVATE),

    MAKE_STRING_FROM_ENUM(AUDIO_FLAG_CONTENT_SPATIALIZED),

    MAKE_STRING_FROM_ENUM(AUDIO_FLAG_NEVER_SPATIALIZE),

    TERMINATOR

};

services/audiopolicy/fuzzer/audiopolicy_fuzzer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -163,7 +163,9 @@ std::vector<audio_flags_mask_t> kAudioFlagMasks = { 
    AUDIO_FLAG_BYPASS_MUTE,    AUDIO_FLAG_LOW_LATENCY,

    AUDIO_FLAG_DEEP_BUFFER,    AUDIO_FLAG_NO_MEDIA_PROJECTION,

    AUDIO_FLAG_MUTE_HAPTIC,    AUDIO_FLAG_NO_SYSTEM_CAPTURE,

    AUDIO_FLAG_CAPTURE_PRIVATE};

    AUDIO_FLAG_CAPTURE_PRIVATE, AUDIO_FLAG_CONTENT_SPATIALIZED,

    AUDIO_FLAG_NEVER_SPATIALIZE,

    };



std::vector<audio_policy_dev_state_t> kAudioPolicyDeviceStates = {

    AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE,