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

Commit 9442388c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add conversion for the new values in AudioLatencyMode" am: 4647385a... 

Merge "Add conversion for the new values in AudioLatencyMode" am: 4647385a am: 4e98933e am: d89c48ec am: eafed035

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2473544



Change-Id: Ibf3d256ef8d89da49e84653f8f7ed9f6c083d005
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 86b3b569 eafed035

media/audioaidlconversion/AidlConversionCppNdk.cpp

+8 −0
Original line number Diff line number Diff line
@@ -2724,6 +2724,10 @@ aidl2legacy_AudioLatencyMode_audio_latency_mode_t(AudioLatencyMode aidl) { 
            return AUDIO_LATENCY_MODE_FREE;

        case AudioLatencyMode::LOW:

            return AUDIO_LATENCY_MODE_LOW;

        case AudioLatencyMode::DYNAMIC_SPATIAL_AUDIO_SOFTWARE:

            return AUDIO_LATENCY_MODE_DYNAMIC_SPATIAL_AUDIO_SOFTWARE;

        case AudioLatencyMode::DYNAMIC_SPATIAL_AUDIO_HARDWARE:

            return AUDIO_LATENCY_MODE_DYNAMIC_SPATIAL_AUDIO_HARDWARE;

    }

    return unexpected(BAD_VALUE);

}
@@ -2734,6 +2738,10 @@ legacy2aidl_audio_latency_mode_t_AudioLatencyMode(audio_latency_mode_t legacy) { 
            return AudioLatencyMode::FREE;

        case AUDIO_LATENCY_MODE_LOW:

            return AudioLatencyMode::LOW;

        case AUDIO_LATENCY_MODE_DYNAMIC_SPATIAL_AUDIO_SOFTWARE:

            return AudioLatencyMode::DYNAMIC_SPATIAL_AUDIO_SOFTWARE;

        case AUDIO_LATENCY_MODE_DYNAMIC_SPATIAL_AUDIO_HARDWARE:

            return AudioLatencyMode::DYNAMIC_SPATIAL_AUDIO_HARDWARE;

    }

    return unexpected(BAD_VALUE);

}