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

Commit 4e98933e 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 

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



Change-Id: Iea9e573857ad79fe0e39780e9b031851fbc209c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a530578 4647385a

media/audioaidlconversion/AidlConversionCppNdk.cpp

+8 −0
Original line number Diff line number Diff line
@@ -2708,6 +2708,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);

}
@@ -2718,6 +2722,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);

}