Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2020 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 17 | #include <algorithm> |
| 18 | #include <unordered_map> |
| 19 | #include <utility> |
| 20 | #include <vector> |
| 21 | |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 22 | #define LOG_TAG "AidlConversion" |
| 23 | //#define LOG_NDEBUG 0 |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 24 | #include <utils/Log.h> |
| 25 | |
| 26 | #include "media/AidlConversion.h" |
| 27 | |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 28 | #include <media/ShmemCompat.h> |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 29 | #include <media/stagefright/foundation/MediaDefs.h> |
Ytai Ben-Tsvi | 49298c5 | 2020-10-15 10:56:48 -0700 | [diff] [blame] | 30 | |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 31 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
| 32 | // Utilities |
| 33 | |
| 34 | namespace android { |
| 35 | |
| 36 | using base::unexpected; |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 37 | using media::audio::common::AudioChannelLayout; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 38 | using media::audio::common::AudioConfig; |
| 39 | using media::audio::common::AudioConfigBase; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 40 | using media::audio::common::AudioContentType; |
Mikhail Naganov | 932cb96 | 2021-09-16 01:05:27 +0000 | [diff] [blame] | 41 | using media::audio::common::AudioDevice; |
| 42 | using media::audio::common::AudioDeviceAddress; |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 43 | using media::audio::common::AudioDeviceDescription; |
| 44 | using media::audio::common::AudioDeviceType; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 45 | using media::audio::common::AudioEncapsulationMetadataType; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 46 | using media::audio::common::AudioEncapsulationMode; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 47 | using media::audio::common::AudioEncapsulationType; |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 48 | using media::audio::common::AudioFormatDescription; |
| 49 | using media::audio::common::AudioFormatType; |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 50 | using media::audio::common::AudioGain; |
| 51 | using media::audio::common::AudioGainConfig; |
| 52 | using media::audio::common::AudioGainMode; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 53 | using media::audio::common::AudioInputFlags; |
| 54 | using media::audio::common::AudioIoFlags; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 55 | using media::audio::common::AudioMode; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 56 | using media::audio::common::AudioOffloadInfo; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 57 | using media::audio::common::AudioOutputFlags; |
| 58 | using media::audio::common::AudioPortDeviceExt; |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 59 | using media::audio::common::AudioPortExt; |
| 60 | using media::audio::common::AudioPortMixExt; |
| 61 | using media::audio::common::AudioPortMixExtUseCase; |
Mikhail Naganov | 89818ba | 2021-09-21 20:37:13 +0000 | [diff] [blame] | 62 | using media::audio::common::AudioProfile; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 63 | using media::audio::common::AudioSource; |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 64 | using media::audio::common::AudioStandard; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 65 | using media::audio::common::AudioStreamType; |
| 66 | using media::audio::common::AudioUsage; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 67 | using media::audio::common::AudioUuid; |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 68 | using media::audio::common::ExtraAudioDescriptor; |
| 69 | using media::audio::common::Int; |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 70 | using media::audio::common::PcmType; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 71 | |
| 72 | namespace { |
| 73 | |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 74 | enum class Direction { |
| 75 | INPUT, OUTPUT |
| 76 | }; |
| 77 | |
| 78 | ConversionResult<Direction> direction(media::AudioPortRole role, media::AudioPortType type) { |
| 79 | switch (type) { |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 80 | case media::AudioPortType::NONE: |
| 81 | case media::AudioPortType::SESSION: |
| 82 | break; // must be listed -Werror,-Wswitch |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 83 | case media::AudioPortType::DEVICE: |
| 84 | switch (role) { |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 85 | case media::AudioPortRole::NONE: |
| 86 | break; // must be listed -Werror,-Wswitch |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 87 | case media::AudioPortRole::SOURCE: |
| 88 | return Direction::INPUT; |
| 89 | case media::AudioPortRole::SINK: |
| 90 | return Direction::OUTPUT; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 91 | } |
| 92 | break; |
| 93 | case media::AudioPortType::MIX: |
| 94 | switch (role) { |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 95 | case media::AudioPortRole::NONE: |
| 96 | break; // must be listed -Werror,-Wswitch |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 97 | case media::AudioPortRole::SOURCE: |
| 98 | return Direction::OUTPUT; |
| 99 | case media::AudioPortRole::SINK: |
| 100 | return Direction::INPUT; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 101 | } |
| 102 | break; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 103 | } |
| 104 | return unexpected(BAD_VALUE); |
| 105 | } |
| 106 | |
| 107 | ConversionResult<Direction> direction(audio_port_role_t role, audio_port_type_t type) { |
| 108 | switch (type) { |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 109 | case AUDIO_PORT_TYPE_NONE: |
| 110 | case AUDIO_PORT_TYPE_SESSION: |
| 111 | break; // must be listed -Werror,-Wswitch |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 112 | case AUDIO_PORT_TYPE_DEVICE: |
| 113 | switch (role) { |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 114 | case AUDIO_PORT_ROLE_NONE: |
| 115 | break; // must be listed -Werror,-Wswitch |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 116 | case AUDIO_PORT_ROLE_SOURCE: |
| 117 | return Direction::INPUT; |
| 118 | case AUDIO_PORT_ROLE_SINK: |
| 119 | return Direction::OUTPUT; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 120 | } |
| 121 | break; |
| 122 | case AUDIO_PORT_TYPE_MIX: |
| 123 | switch (role) { |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 124 | case AUDIO_PORT_ROLE_NONE: |
| 125 | break; // must be listed -Werror,-Wswitch |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 126 | case AUDIO_PORT_ROLE_SOURCE: |
| 127 | return Direction::OUTPUT; |
| 128 | case AUDIO_PORT_ROLE_SINK: |
| 129 | return Direction::INPUT; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 130 | } |
| 131 | break; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 132 | } |
| 133 | return unexpected(BAD_VALUE); |
| 134 | } |
| 135 | |
| 136 | } // namespace |
| 137 | |
| 138 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
| 139 | // Converters |
| 140 | |
Ytai Ben-Tsvi | 49298c5 | 2020-10-15 10:56:48 -0700 | [diff] [blame] | 141 | status_t aidl2legacy_string(std::string_view aidl, char* dest, size_t maxSize) { |
| 142 | if (aidl.size() > maxSize - 1) { |
| 143 | return BAD_VALUE; |
| 144 | } |
| 145 | aidl.copy(dest, aidl.size()); |
| 146 | dest[aidl.size()] = '\0'; |
| 147 | return OK; |
| 148 | } |
| 149 | |
| 150 | ConversionResult<std::string> legacy2aidl_string(const char* legacy, size_t maxSize) { |
| 151 | if (legacy == nullptr) { |
| 152 | return unexpected(BAD_VALUE); |
| 153 | } |
| 154 | if (strnlen(legacy, maxSize) == maxSize) { |
| 155 | // No null-terminator. |
| 156 | return unexpected(BAD_VALUE); |
| 157 | } |
| 158 | return std::string(legacy); |
| 159 | } |
| 160 | |
| 161 | ConversionResult<audio_module_handle_t> aidl2legacy_int32_t_audio_module_handle_t(int32_t aidl) { |
| 162 | return convertReinterpret<audio_module_handle_t>(aidl); |
| 163 | } |
| 164 | |
| 165 | ConversionResult<int32_t> legacy2aidl_audio_module_handle_t_int32_t(audio_module_handle_t legacy) { |
| 166 | return convertReinterpret<int32_t>(legacy); |
| 167 | } |
| 168 | |
| 169 | ConversionResult<audio_io_handle_t> aidl2legacy_int32_t_audio_io_handle_t(int32_t aidl) { |
| 170 | return convertReinterpret<audio_io_handle_t>(aidl); |
| 171 | } |
| 172 | |
| 173 | ConversionResult<int32_t> legacy2aidl_audio_io_handle_t_int32_t(audio_io_handle_t legacy) { |
| 174 | return convertReinterpret<int32_t>(legacy); |
| 175 | } |
| 176 | |
| 177 | ConversionResult<audio_port_handle_t> aidl2legacy_int32_t_audio_port_handle_t(int32_t aidl) { |
| 178 | return convertReinterpret<audio_port_handle_t>(aidl); |
| 179 | } |
| 180 | |
| 181 | ConversionResult<int32_t> legacy2aidl_audio_port_handle_t_int32_t(audio_port_handle_t legacy) { |
| 182 | return convertReinterpret<int32_t>(legacy); |
| 183 | } |
| 184 | |
| 185 | ConversionResult<audio_patch_handle_t> aidl2legacy_int32_t_audio_patch_handle_t(int32_t aidl) { |
| 186 | return convertReinterpret<audio_patch_handle_t>(aidl); |
| 187 | } |
| 188 | |
| 189 | ConversionResult<int32_t> legacy2aidl_audio_patch_handle_t_int32_t(audio_patch_handle_t legacy) { |
| 190 | return convertReinterpret<int32_t>(legacy); |
| 191 | } |
| 192 | |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 193 | ConversionResult<audio_unique_id_t> aidl2legacy_int32_t_audio_unique_id_t(int32_t aidl) { |
| 194 | return convertReinterpret<audio_unique_id_t>(aidl); |
| 195 | } |
| 196 | |
| 197 | ConversionResult<int32_t> legacy2aidl_audio_unique_id_t_int32_t(audio_unique_id_t legacy) { |
| 198 | return convertReinterpret<int32_t>(legacy); |
| 199 | } |
| 200 | |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 201 | ConversionResult<audio_hw_sync_t> aidl2legacy_int32_t_audio_hw_sync_t(int32_t aidl) { |
| 202 | return convertReinterpret<audio_hw_sync_t>(aidl); |
| 203 | } |
| 204 | |
| 205 | ConversionResult<int32_t> legacy2aidl_audio_hw_sync_t_int32_t(audio_hw_sync_t legacy) { |
| 206 | return convertReinterpret<int32_t>(legacy); |
| 207 | } |
| 208 | |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 209 | ConversionResult<pid_t> aidl2legacy_int32_t_pid_t(int32_t aidl) { |
| 210 | return convertReinterpret<pid_t>(aidl); |
| 211 | } |
| 212 | |
| 213 | ConversionResult<int32_t> legacy2aidl_pid_t_int32_t(pid_t legacy) { |
| 214 | return convertReinterpret<int32_t>(legacy); |
| 215 | } |
| 216 | |
| 217 | ConversionResult<uid_t> aidl2legacy_int32_t_uid_t(int32_t aidl) { |
| 218 | return convertReinterpret<uid_t>(aidl); |
| 219 | } |
| 220 | |
| 221 | ConversionResult<int32_t> legacy2aidl_uid_t_int32_t(uid_t legacy) { |
| 222 | return convertReinterpret<int32_t>(legacy); |
| 223 | } |
| 224 | |
| 225 | ConversionResult<String16> aidl2legacy_string_view_String16(std::string_view aidl) { |
| 226 | return String16(aidl.data(), aidl.size()); |
| 227 | } |
| 228 | |
| 229 | ConversionResult<std::string> legacy2aidl_String16_string(const String16& legacy) { |
| 230 | return std::string(String8(legacy).c_str()); |
| 231 | } |
| 232 | |
Philip P. Moltmann | bda4575 | 2020-07-17 16:41:18 -0700 | [diff] [blame] | 233 | // TODO b/182392769: create an optional -> optional util |
| 234 | ConversionResult<std::optional<String16>> |
| 235 | aidl2legacy_optional_string_view_optional_String16(std::optional<std::string_view> aidl) { |
| 236 | if (!aidl.has_value()) { |
| 237 | return std::nullopt; |
| 238 | } |
| 239 | ConversionResult<String16> conversion = |
| 240 | VALUE_OR_RETURN(aidl2legacy_string_view_String16(aidl.value())); |
| 241 | return conversion.value(); |
| 242 | } |
| 243 | |
| 244 | ConversionResult<std::optional<std::string_view>> |
| 245 | legacy2aidl_optional_String16_optional_string(std::optional<String16> legacy) { |
| 246 | if (!legacy.has_value()) { |
| 247 | return std::nullopt; |
| 248 | } |
| 249 | ConversionResult<std::string> conversion = |
| 250 | VALUE_OR_RETURN(legacy2aidl_String16_string(legacy.value())); |
| 251 | return conversion.value(); |
| 252 | } |
| 253 | |
Ytai Ben-Tsvi | ce18294 | 2020-11-04 14:48:01 -0800 | [diff] [blame] | 254 | ConversionResult<String8> aidl2legacy_string_view_String8(std::string_view aidl) { |
| 255 | return String8(aidl.data(), aidl.size()); |
| 256 | } |
| 257 | |
| 258 | ConversionResult<std::string> legacy2aidl_String8_string(const String8& legacy) { |
| 259 | return std::string(legacy.c_str()); |
| 260 | } |
| 261 | |
Mikhail Naganov | 88536df | 2021-07-26 17:30:29 -0700 | [diff] [blame] | 262 | ConversionResult<audio_io_config_event_t> aidl2legacy_AudioIoConfigEvent_audio_io_config_event_t( |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 263 | media::AudioIoConfigEvent aidl) { |
| 264 | switch (aidl) { |
| 265 | case media::AudioIoConfigEvent::OUTPUT_REGISTERED: |
| 266 | return AUDIO_OUTPUT_REGISTERED; |
| 267 | case media::AudioIoConfigEvent::OUTPUT_OPENED: |
| 268 | return AUDIO_OUTPUT_OPENED; |
| 269 | case media::AudioIoConfigEvent::OUTPUT_CLOSED: |
| 270 | return AUDIO_OUTPUT_CLOSED; |
| 271 | case media::AudioIoConfigEvent::OUTPUT_CONFIG_CHANGED: |
| 272 | return AUDIO_OUTPUT_CONFIG_CHANGED; |
| 273 | case media::AudioIoConfigEvent::INPUT_REGISTERED: |
| 274 | return AUDIO_INPUT_REGISTERED; |
| 275 | case media::AudioIoConfigEvent::INPUT_OPENED: |
| 276 | return AUDIO_INPUT_OPENED; |
| 277 | case media::AudioIoConfigEvent::INPUT_CLOSED: |
| 278 | return AUDIO_INPUT_CLOSED; |
| 279 | case media::AudioIoConfigEvent::INPUT_CONFIG_CHANGED: |
| 280 | return AUDIO_INPUT_CONFIG_CHANGED; |
| 281 | case media::AudioIoConfigEvent::CLIENT_STARTED: |
| 282 | return AUDIO_CLIENT_STARTED; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 283 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 284 | return unexpected(BAD_VALUE); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 285 | } |
| 286 | |
Mikhail Naganov | 88536df | 2021-07-26 17:30:29 -0700 | [diff] [blame] | 287 | ConversionResult<media::AudioIoConfigEvent> legacy2aidl_audio_io_config_event_t_AudioIoConfigEvent( |
| 288 | audio_io_config_event_t legacy) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 289 | switch (legacy) { |
| 290 | case AUDIO_OUTPUT_REGISTERED: |
| 291 | return media::AudioIoConfigEvent::OUTPUT_REGISTERED; |
| 292 | case AUDIO_OUTPUT_OPENED: |
| 293 | return media::AudioIoConfigEvent::OUTPUT_OPENED; |
| 294 | case AUDIO_OUTPUT_CLOSED: |
| 295 | return media::AudioIoConfigEvent::OUTPUT_CLOSED; |
| 296 | case AUDIO_OUTPUT_CONFIG_CHANGED: |
| 297 | return media::AudioIoConfigEvent::OUTPUT_CONFIG_CHANGED; |
| 298 | case AUDIO_INPUT_REGISTERED: |
| 299 | return media::AudioIoConfigEvent::INPUT_REGISTERED; |
| 300 | case AUDIO_INPUT_OPENED: |
| 301 | return media::AudioIoConfigEvent::INPUT_OPENED; |
| 302 | case AUDIO_INPUT_CLOSED: |
| 303 | return media::AudioIoConfigEvent::INPUT_CLOSED; |
| 304 | case AUDIO_INPUT_CONFIG_CHANGED: |
| 305 | return media::AudioIoConfigEvent::INPUT_CONFIG_CHANGED; |
| 306 | case AUDIO_CLIENT_STARTED: |
| 307 | return media::AudioIoConfigEvent::CLIENT_STARTED; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 308 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 309 | return unexpected(BAD_VALUE); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 310 | } |
| 311 | |
| 312 | ConversionResult<audio_port_role_t> aidl2legacy_AudioPortRole_audio_port_role_t( |
| 313 | media::AudioPortRole aidl) { |
| 314 | switch (aidl) { |
| 315 | case media::AudioPortRole::NONE: |
| 316 | return AUDIO_PORT_ROLE_NONE; |
| 317 | case media::AudioPortRole::SOURCE: |
| 318 | return AUDIO_PORT_ROLE_SOURCE; |
| 319 | case media::AudioPortRole::SINK: |
| 320 | return AUDIO_PORT_ROLE_SINK; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 321 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 322 | return unexpected(BAD_VALUE); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 323 | } |
| 324 | |
| 325 | ConversionResult<media::AudioPortRole> legacy2aidl_audio_port_role_t_AudioPortRole( |
| 326 | audio_port_role_t legacy) { |
| 327 | switch (legacy) { |
| 328 | case AUDIO_PORT_ROLE_NONE: |
| 329 | return media::AudioPortRole::NONE; |
| 330 | case AUDIO_PORT_ROLE_SOURCE: |
| 331 | return media::AudioPortRole::SOURCE; |
| 332 | case AUDIO_PORT_ROLE_SINK: |
| 333 | return media::AudioPortRole::SINK; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 334 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 335 | return unexpected(BAD_VALUE); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 336 | } |
| 337 | |
| 338 | ConversionResult<audio_port_type_t> aidl2legacy_AudioPortType_audio_port_type_t( |
| 339 | media::AudioPortType aidl) { |
| 340 | switch (aidl) { |
| 341 | case media::AudioPortType::NONE: |
| 342 | return AUDIO_PORT_TYPE_NONE; |
| 343 | case media::AudioPortType::DEVICE: |
| 344 | return AUDIO_PORT_TYPE_DEVICE; |
| 345 | case media::AudioPortType::MIX: |
| 346 | return AUDIO_PORT_TYPE_MIX; |
| 347 | case media::AudioPortType::SESSION: |
| 348 | return AUDIO_PORT_TYPE_SESSION; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 349 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 350 | return unexpected(BAD_VALUE); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 351 | } |
| 352 | |
| 353 | ConversionResult<media::AudioPortType> legacy2aidl_audio_port_type_t_AudioPortType( |
| 354 | audio_port_type_t legacy) { |
| 355 | switch (legacy) { |
| 356 | case AUDIO_PORT_TYPE_NONE: |
| 357 | return media::AudioPortType::NONE; |
| 358 | case AUDIO_PORT_TYPE_DEVICE: |
| 359 | return media::AudioPortType::DEVICE; |
| 360 | case AUDIO_PORT_TYPE_MIX: |
| 361 | return media::AudioPortType::MIX; |
| 362 | case AUDIO_PORT_TYPE_SESSION: |
| 363 | return media::AudioPortType::SESSION; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 364 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 365 | return unexpected(BAD_VALUE); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 366 | } |
| 367 | |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 368 | namespace { |
| 369 | |
| 370 | namespace detail { |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 371 | using AudioChannelPair = std::pair<audio_channel_mask_t, AudioChannelLayout>; |
Mikhail Naganov | cf2fa81 | 2021-06-25 09:03:37 -0700 | [diff] [blame] | 372 | using AudioChannelPairs = std::vector<AudioChannelPair>; |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 373 | using AudioDevicePair = std::pair<audio_devices_t, AudioDeviceDescription>; |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 374 | using AudioDevicePairs = std::vector<AudioDevicePair>; |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 375 | using AudioFormatPair = std::pair<audio_format_t, AudioFormatDescription>; |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 376 | using AudioFormatPairs = std::vector<AudioFormatPair>; |
| 377 | } |
| 378 | |
Mikhail Naganov | cf2fa81 | 2021-06-25 09:03:37 -0700 | [diff] [blame] | 379 | const detail::AudioChannelPairs& getInAudioChannelPairs() { |
| 380 | static const detail::AudioChannelPairs pairs = { |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 381 | #define DEFINE_INPUT_LAYOUT(n) \ |
| 382 | { \ |
| 383 | AUDIO_CHANNEL_IN_##n, \ |
| 384 | AudioChannelLayout::make<AudioChannelLayout::Tag::layoutMask>( \ |
| 385 | AudioChannelLayout::LAYOUT_##n) \ |
Mikhail Naganov | cf2fa81 | 2021-06-25 09:03:37 -0700 | [diff] [blame] | 386 | } |
| 387 | |
| 388 | DEFINE_INPUT_LAYOUT(MONO), |
| 389 | DEFINE_INPUT_LAYOUT(STEREO), |
| 390 | DEFINE_INPUT_LAYOUT(FRONT_BACK), |
| 391 | // AUDIO_CHANNEL_IN_6 not supported |
| 392 | DEFINE_INPUT_LAYOUT(2POINT0POINT2), |
| 393 | DEFINE_INPUT_LAYOUT(2POINT1POINT2), |
| 394 | DEFINE_INPUT_LAYOUT(3POINT0POINT2), |
| 395 | DEFINE_INPUT_LAYOUT(3POINT1POINT2), |
Mikhail Naganov | 2d4b14d | 2021-07-13 15:36:31 -0700 | [diff] [blame] | 396 | DEFINE_INPUT_LAYOUT(5POINT1) |
Mikhail Naganov | cf2fa81 | 2021-06-25 09:03:37 -0700 | [diff] [blame] | 397 | #undef DEFINE_INPUT_LAYOUT |
| 398 | }; |
| 399 | return pairs; |
| 400 | } |
| 401 | |
| 402 | const detail::AudioChannelPairs& getOutAudioChannelPairs() { |
| 403 | static const detail::AudioChannelPairs pairs = { |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 404 | #define DEFINE_OUTPUT_LAYOUT(n) \ |
| 405 | { \ |
| 406 | AUDIO_CHANNEL_OUT_##n, \ |
| 407 | AudioChannelLayout::make<AudioChannelLayout::Tag::layoutMask>( \ |
| 408 | AudioChannelLayout::LAYOUT_##n) \ |
Mikhail Naganov | cf2fa81 | 2021-06-25 09:03:37 -0700 | [diff] [blame] | 409 | } |
| 410 | |
| 411 | DEFINE_OUTPUT_LAYOUT(MONO), |
| 412 | DEFINE_OUTPUT_LAYOUT(STEREO), |
| 413 | DEFINE_OUTPUT_LAYOUT(2POINT1), |
| 414 | DEFINE_OUTPUT_LAYOUT(TRI), |
| 415 | DEFINE_OUTPUT_LAYOUT(TRI_BACK), |
| 416 | DEFINE_OUTPUT_LAYOUT(3POINT1), |
| 417 | DEFINE_OUTPUT_LAYOUT(2POINT0POINT2), |
| 418 | DEFINE_OUTPUT_LAYOUT(2POINT1POINT2), |
| 419 | DEFINE_OUTPUT_LAYOUT(3POINT0POINT2), |
| 420 | DEFINE_OUTPUT_LAYOUT(3POINT1POINT2), |
| 421 | DEFINE_OUTPUT_LAYOUT(QUAD), |
| 422 | DEFINE_OUTPUT_LAYOUT(QUAD_SIDE), |
| 423 | DEFINE_OUTPUT_LAYOUT(SURROUND), |
| 424 | DEFINE_OUTPUT_LAYOUT(PENTA), |
| 425 | DEFINE_OUTPUT_LAYOUT(5POINT1), |
| 426 | DEFINE_OUTPUT_LAYOUT(5POINT1_SIDE), |
| 427 | DEFINE_OUTPUT_LAYOUT(5POINT1POINT2), |
| 428 | DEFINE_OUTPUT_LAYOUT(5POINT1POINT4), |
| 429 | DEFINE_OUTPUT_LAYOUT(6POINT1), |
| 430 | DEFINE_OUTPUT_LAYOUT(7POINT1), |
| 431 | DEFINE_OUTPUT_LAYOUT(7POINT1POINT2), |
| 432 | DEFINE_OUTPUT_LAYOUT(7POINT1POINT4), |
| 433 | DEFINE_OUTPUT_LAYOUT(13POINT_360RA), |
| 434 | DEFINE_OUTPUT_LAYOUT(22POINT2), |
| 435 | DEFINE_OUTPUT_LAYOUT(MONO_HAPTIC_A), |
| 436 | DEFINE_OUTPUT_LAYOUT(STEREO_HAPTIC_A), |
| 437 | DEFINE_OUTPUT_LAYOUT(HAPTIC_AB), |
| 438 | DEFINE_OUTPUT_LAYOUT(MONO_HAPTIC_AB), |
| 439 | DEFINE_OUTPUT_LAYOUT(STEREO_HAPTIC_AB) |
| 440 | #undef DEFINE_OUTPUT_LAYOUT |
| 441 | }; |
| 442 | return pairs; |
| 443 | } |
| 444 | |
Mikhail Naganov | 2d4b14d | 2021-07-13 15:36:31 -0700 | [diff] [blame] | 445 | const detail::AudioChannelPairs& getVoiceAudioChannelPairs() { |
| 446 | static const detail::AudioChannelPairs pairs = { |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 447 | #define DEFINE_VOICE_LAYOUT(n) \ |
| 448 | { \ |
| 449 | AUDIO_CHANNEL_IN_VOICE_##n, \ |
| 450 | AudioChannelLayout::make<AudioChannelLayout::Tag::voiceMask>( \ |
| 451 | AudioChannelLayout::VOICE_##n) \ |
Mikhail Naganov | 2d4b14d | 2021-07-13 15:36:31 -0700 | [diff] [blame] | 452 | } |
| 453 | DEFINE_VOICE_LAYOUT(UPLINK_MONO), |
| 454 | DEFINE_VOICE_LAYOUT(DNLINK_MONO), |
| 455 | DEFINE_VOICE_LAYOUT(CALL_MONO) |
| 456 | #undef DEFINE_VOICE_LAYOUT |
| 457 | }; |
| 458 | return pairs; |
| 459 | } |
| 460 | |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 461 | AudioDeviceDescription make_AudioDeviceDescription(AudioDeviceType type, |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 462 | const std::string& connection = "") { |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 463 | AudioDeviceDescription result; |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 464 | result.type = type; |
| 465 | result.connection = connection; |
| 466 | return result; |
| 467 | } |
| 468 | |
| 469 | void append_AudioDeviceDescription(detail::AudioDevicePairs& pairs, |
| 470 | audio_devices_t inputType, audio_devices_t outputType, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 471 | AudioDeviceType inType, AudioDeviceType outType, |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 472 | const std::string& connection = "") { |
| 473 | pairs.push_back(std::make_pair(inputType, make_AudioDeviceDescription(inType, connection))); |
| 474 | pairs.push_back(std::make_pair(outputType, make_AudioDeviceDescription(outType, connection))); |
| 475 | } |
| 476 | |
| 477 | const detail::AudioDevicePairs& getAudioDevicePairs() { |
| 478 | static const detail::AudioDevicePairs pairs = []() { |
| 479 | detail::AudioDevicePairs pairs = {{ |
| 480 | { |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 481 | AUDIO_DEVICE_NONE, AudioDeviceDescription{} |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 482 | }, |
| 483 | { |
| 484 | AUDIO_DEVICE_OUT_EARPIECE, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 485 | AudioDeviceType::OUT_SPEAKER_EARPIECE) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 486 | }, |
| 487 | { |
| 488 | AUDIO_DEVICE_OUT_SPEAKER, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 489 | AudioDeviceType::OUT_SPEAKER) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 490 | }, |
| 491 | { |
| 492 | AUDIO_DEVICE_OUT_WIRED_HEADPHONE, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 493 | AudioDeviceType::OUT_HEADPHONE, |
| 494 | AudioDeviceDescription::CONNECTION_ANALOG()) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 495 | }, |
| 496 | { |
| 497 | AUDIO_DEVICE_OUT_BLUETOOTH_SCO, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 498 | AudioDeviceType::OUT_DEVICE, |
| 499 | AudioDeviceDescription::CONNECTION_BT_SCO()) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 500 | }, |
| 501 | { |
| 502 | AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 503 | AudioDeviceType::OUT_CARKIT, |
| 504 | AudioDeviceDescription::CONNECTION_BT_SCO()) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 505 | }, |
| 506 | { |
| 507 | AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 508 | AudioDeviceType::OUT_HEADPHONE, |
| 509 | AudioDeviceDescription::CONNECTION_BT_A2DP()) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 510 | }, |
| 511 | { |
| 512 | AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 513 | AudioDeviceType::OUT_SPEAKER, |
| 514 | AudioDeviceDescription::CONNECTION_BT_A2DP()) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 515 | }, |
| 516 | { |
| 517 | AUDIO_DEVICE_OUT_TELEPHONY_TX, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 518 | AudioDeviceType::OUT_TELEPHONY_TX) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 519 | }, |
| 520 | { |
| 521 | AUDIO_DEVICE_OUT_AUX_LINE, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 522 | AudioDeviceType::OUT_LINE_AUX) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 523 | }, |
| 524 | { |
| 525 | AUDIO_DEVICE_OUT_SPEAKER_SAFE, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 526 | AudioDeviceType::OUT_SPEAKER_SAFE) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 527 | }, |
| 528 | { |
| 529 | AUDIO_DEVICE_OUT_HEARING_AID, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 530 | AudioDeviceType::OUT_HEARING_AID, |
| 531 | AudioDeviceDescription::CONNECTION_WIRELESS()) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 532 | }, |
| 533 | { |
| 534 | AUDIO_DEVICE_OUT_ECHO_CANCELLER, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 535 | AudioDeviceType::OUT_ECHO_CANCELLER) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 536 | }, |
| 537 | { |
| 538 | AUDIO_DEVICE_OUT_BLE_SPEAKER, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 539 | AudioDeviceType::OUT_SPEAKER, |
| 540 | AudioDeviceDescription::CONNECTION_BT_LE()) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 541 | }, |
| 542 | // AUDIO_DEVICE_IN_AMBIENT and IN_COMMUNICATION are removed since they were deprecated. |
| 543 | { |
| 544 | AUDIO_DEVICE_IN_BUILTIN_MIC, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 545 | AudioDeviceType::IN_MICROPHONE) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 546 | }, |
| 547 | { |
| 548 | AUDIO_DEVICE_IN_BACK_MIC, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 549 | AudioDeviceType::IN_MICROPHONE_BACK) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 550 | }, |
| 551 | { |
| 552 | AUDIO_DEVICE_IN_TELEPHONY_RX, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 553 | AudioDeviceType::IN_TELEPHONY_RX) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 554 | }, |
| 555 | { |
| 556 | AUDIO_DEVICE_IN_TV_TUNER, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 557 | AudioDeviceType::IN_TV_TUNER) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 558 | }, |
| 559 | { |
| 560 | AUDIO_DEVICE_IN_LOOPBACK, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 561 | AudioDeviceType::IN_LOOPBACK) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 562 | }, |
| 563 | { |
| 564 | AUDIO_DEVICE_IN_BLUETOOTH_BLE, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 565 | AudioDeviceType::IN_DEVICE, |
| 566 | AudioDeviceDescription::CONNECTION_BT_LE()) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 567 | }, |
| 568 | { |
| 569 | AUDIO_DEVICE_IN_ECHO_REFERENCE, make_AudioDeviceDescription( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 570 | AudioDeviceType::IN_ECHO_REFERENCE) |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 571 | } |
| 572 | }}; |
| 573 | append_AudioDeviceDescription(pairs, |
| 574 | AUDIO_DEVICE_IN_DEFAULT, AUDIO_DEVICE_OUT_DEFAULT, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 575 | AudioDeviceType::IN_DEFAULT, AudioDeviceType::OUT_DEFAULT); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 576 | append_AudioDeviceDescription(pairs, |
| 577 | AUDIO_DEVICE_IN_WIRED_HEADSET, AUDIO_DEVICE_OUT_WIRED_HEADSET, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 578 | AudioDeviceType::IN_HEADSET, AudioDeviceType::OUT_HEADSET, |
| 579 | AudioDeviceDescription::CONNECTION_ANALOG()); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 580 | append_AudioDeviceDescription(pairs, |
| 581 | AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET, AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 582 | AudioDeviceType::IN_HEADSET, AudioDeviceType::OUT_HEADSET, |
| 583 | AudioDeviceDescription::CONNECTION_BT_SCO()); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 584 | append_AudioDeviceDescription(pairs, |
| 585 | AUDIO_DEVICE_IN_HDMI, AUDIO_DEVICE_OUT_HDMI, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 586 | AudioDeviceType::IN_DEVICE, AudioDeviceType::OUT_DEVICE, |
| 587 | AudioDeviceDescription::CONNECTION_HDMI()); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 588 | append_AudioDeviceDescription(pairs, |
| 589 | AUDIO_DEVICE_IN_REMOTE_SUBMIX, AUDIO_DEVICE_OUT_REMOTE_SUBMIX, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 590 | AudioDeviceType::IN_SUBMIX, AudioDeviceType::OUT_SUBMIX); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 591 | append_AudioDeviceDescription(pairs, |
| 592 | AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET, AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET, |
Mikhail Naganov | d3bb86e | 2021-09-20 12:10:14 -0700 | [diff] [blame] | 593 | AudioDeviceType::IN_DOCK, AudioDeviceType::OUT_DOCK, |
| 594 | AudioDeviceDescription::CONNECTION_ANALOG()); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 595 | append_AudioDeviceDescription(pairs, |
| 596 | AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET, AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET, |
Mikhail Naganov | d3bb86e | 2021-09-20 12:10:14 -0700 | [diff] [blame] | 597 | AudioDeviceType::IN_DOCK, AudioDeviceType::OUT_DOCK, |
| 598 | AudioDeviceDescription::CONNECTION_USB()); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 599 | append_AudioDeviceDescription(pairs, |
| 600 | AUDIO_DEVICE_IN_USB_ACCESSORY, AUDIO_DEVICE_OUT_USB_ACCESSORY, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 601 | AudioDeviceType::IN_ACCESSORY, AudioDeviceType::OUT_ACCESSORY, |
| 602 | AudioDeviceDescription::CONNECTION_USB()); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 603 | append_AudioDeviceDescription(pairs, |
| 604 | AUDIO_DEVICE_IN_USB_DEVICE, AUDIO_DEVICE_OUT_USB_DEVICE, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 605 | AudioDeviceType::IN_DEVICE, AudioDeviceType::OUT_DEVICE, |
| 606 | AudioDeviceDescription::CONNECTION_USB()); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 607 | append_AudioDeviceDescription(pairs, |
| 608 | AUDIO_DEVICE_IN_FM_TUNER, AUDIO_DEVICE_OUT_FM, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 609 | AudioDeviceType::IN_FM_TUNER, AudioDeviceType::OUT_FM); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 610 | append_AudioDeviceDescription(pairs, |
| 611 | AUDIO_DEVICE_IN_LINE, AUDIO_DEVICE_OUT_LINE, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 612 | AudioDeviceType::IN_DEVICE, AudioDeviceType::OUT_DEVICE, |
| 613 | AudioDeviceDescription::CONNECTION_ANALOG()); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 614 | append_AudioDeviceDescription(pairs, |
| 615 | AUDIO_DEVICE_IN_SPDIF, AUDIO_DEVICE_OUT_SPDIF, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 616 | AudioDeviceType::IN_DEVICE, AudioDeviceType::OUT_DEVICE, |
| 617 | AudioDeviceDescription::CONNECTION_SPDIF()); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 618 | append_AudioDeviceDescription(pairs, |
| 619 | AUDIO_DEVICE_IN_BLUETOOTH_A2DP, AUDIO_DEVICE_OUT_BLUETOOTH_A2DP, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 620 | AudioDeviceType::IN_DEVICE, AudioDeviceType::OUT_DEVICE, |
| 621 | AudioDeviceDescription::CONNECTION_BT_A2DP()); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 622 | append_AudioDeviceDescription(pairs, |
| 623 | AUDIO_DEVICE_IN_IP, AUDIO_DEVICE_OUT_IP, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 624 | AudioDeviceType::IN_DEVICE, AudioDeviceType::OUT_DEVICE, |
| 625 | AudioDeviceDescription::CONNECTION_IP_V4()); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 626 | append_AudioDeviceDescription(pairs, |
| 627 | AUDIO_DEVICE_IN_BUS, AUDIO_DEVICE_OUT_BUS, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 628 | AudioDeviceType::IN_DEVICE, AudioDeviceType::OUT_DEVICE, |
| 629 | AudioDeviceDescription::CONNECTION_BUS()); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 630 | append_AudioDeviceDescription(pairs, |
| 631 | AUDIO_DEVICE_IN_PROXY, AUDIO_DEVICE_OUT_PROXY, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 632 | AudioDeviceType::IN_AFE_PROXY, AudioDeviceType::OUT_AFE_PROXY); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 633 | append_AudioDeviceDescription(pairs, |
| 634 | AUDIO_DEVICE_IN_USB_HEADSET, AUDIO_DEVICE_OUT_USB_HEADSET, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 635 | AudioDeviceType::IN_HEADSET, AudioDeviceType::OUT_HEADSET, |
| 636 | AudioDeviceDescription::CONNECTION_USB()); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 637 | append_AudioDeviceDescription(pairs, |
| 638 | AUDIO_DEVICE_IN_HDMI_ARC, AUDIO_DEVICE_OUT_HDMI_ARC, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 639 | AudioDeviceType::IN_DEVICE, AudioDeviceType::OUT_DEVICE, |
| 640 | AudioDeviceDescription::CONNECTION_HDMI_ARC()); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 641 | append_AudioDeviceDescription(pairs, |
| 642 | AUDIO_DEVICE_IN_HDMI_EARC, AUDIO_DEVICE_OUT_HDMI_EARC, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 643 | AudioDeviceType::IN_DEVICE, AudioDeviceType::OUT_DEVICE, |
| 644 | AudioDeviceDescription::CONNECTION_HDMI_EARC()); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 645 | append_AudioDeviceDescription(pairs, |
| 646 | AUDIO_DEVICE_IN_BLE_HEADSET, AUDIO_DEVICE_OUT_BLE_HEADSET, |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 647 | AudioDeviceType::IN_HEADSET, AudioDeviceType::OUT_HEADSET, |
| 648 | AudioDeviceDescription::CONNECTION_BT_LE()); |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 649 | return pairs; |
| 650 | }(); |
| 651 | return pairs; |
| 652 | } |
| 653 | |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 654 | AudioFormatDescription make_AudioFormatDescription(AudioFormatType type) { |
| 655 | AudioFormatDescription result; |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 656 | result.type = type; |
| 657 | return result; |
| 658 | } |
| 659 | |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 660 | AudioFormatDescription make_AudioFormatDescription(PcmType pcm) { |
| 661 | auto result = make_AudioFormatDescription(AudioFormatType::PCM); |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 662 | result.pcm = pcm; |
| 663 | return result; |
| 664 | } |
| 665 | |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 666 | AudioFormatDescription make_AudioFormatDescription(const std::string& encoding) { |
| 667 | AudioFormatDescription result; |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 668 | result.encoding = encoding; |
| 669 | return result; |
| 670 | } |
| 671 | |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 672 | AudioFormatDescription make_AudioFormatDescription(PcmType transport, |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 673 | const std::string& encoding) { |
| 674 | auto result = make_AudioFormatDescription(encoding); |
| 675 | result.pcm = transport; |
| 676 | return result; |
| 677 | } |
| 678 | |
| 679 | const detail::AudioFormatPairs& getAudioFormatPairs() { |
| 680 | static const detail::AudioFormatPairs pairs = {{ |
| 681 | { |
| 682 | AUDIO_FORMAT_INVALID, |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 683 | make_AudioFormatDescription(AudioFormatType::SYS_RESERVED_INVALID) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 684 | }, |
| 685 | { |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 686 | AUDIO_FORMAT_DEFAULT, AudioFormatDescription{} |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 687 | }, |
| 688 | { |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 689 | AUDIO_FORMAT_PCM_16_BIT, make_AudioFormatDescription(PcmType::INT_16_BIT) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 690 | }, |
| 691 | { |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 692 | AUDIO_FORMAT_PCM_8_BIT, make_AudioFormatDescription(PcmType::UINT_8_BIT) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 693 | }, |
| 694 | { |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 695 | AUDIO_FORMAT_PCM_32_BIT, make_AudioFormatDescription(PcmType::INT_32_BIT) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 696 | }, |
| 697 | { |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 698 | AUDIO_FORMAT_PCM_8_24_BIT, make_AudioFormatDescription(PcmType::FIXED_Q_8_24) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 699 | }, |
| 700 | { |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 701 | AUDIO_FORMAT_PCM_FLOAT, make_AudioFormatDescription(PcmType::FLOAT_32_BIT) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 702 | }, |
| 703 | { |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 704 | AUDIO_FORMAT_PCM_24_BIT_PACKED, make_AudioFormatDescription(PcmType::INT_24_BIT) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 705 | }, |
| 706 | { |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 707 | AUDIO_FORMAT_MP3, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_MPEG) |
| 708 | }, |
| 709 | { |
| 710 | AUDIO_FORMAT_AMR_NB, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AMR_NB) |
| 711 | }, |
| 712 | { |
| 713 | AUDIO_FORMAT_AMR_WB, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AMR_WB) |
| 714 | }, |
| 715 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 716 | AUDIO_FORMAT_AAC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_MP4) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 717 | }, |
| 718 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 719 | AUDIO_FORMAT_AAC_MAIN, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_MAIN) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 720 | }, |
| 721 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 722 | AUDIO_FORMAT_AAC_LC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_LC) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 723 | }, |
| 724 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 725 | AUDIO_FORMAT_AAC_SSR, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_SSR) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 726 | }, |
| 727 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 728 | AUDIO_FORMAT_AAC_LTP, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_LTP) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 729 | }, |
| 730 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 731 | AUDIO_FORMAT_AAC_HE_V1, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_HE_V1) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 732 | }, |
| 733 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 734 | AUDIO_FORMAT_AAC_SCALABLE, |
| 735 | make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_SCALABLE) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 736 | }, |
| 737 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 738 | AUDIO_FORMAT_AAC_ERLC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ERLC) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 739 | }, |
| 740 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 741 | AUDIO_FORMAT_AAC_LD, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_LD) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 742 | }, |
| 743 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 744 | AUDIO_FORMAT_AAC_HE_V2, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_HE_V2) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 745 | }, |
| 746 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 747 | AUDIO_FORMAT_AAC_ELD, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ELD) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 748 | }, |
| 749 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 750 | AUDIO_FORMAT_AAC_XHE, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_XHE) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 751 | }, |
| 752 | // AUDIO_FORMAT_HE_AAC_V1 and HE_AAC_V2 are removed since they were deprecated long time |
| 753 | // ago. |
| 754 | { |
| 755 | AUDIO_FORMAT_VORBIS, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_VORBIS) |
| 756 | }, |
| 757 | { |
| 758 | AUDIO_FORMAT_OPUS, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_OPUS) |
| 759 | }, |
| 760 | { |
| 761 | AUDIO_FORMAT_AC3, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AC3) |
| 762 | }, |
| 763 | { |
| 764 | AUDIO_FORMAT_E_AC3, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_EAC3) |
| 765 | }, |
| 766 | { |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 767 | AUDIO_FORMAT_E_AC3_JOC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_EAC3_JOC) |
| 768 | }, |
| 769 | { |
| 770 | AUDIO_FORMAT_DTS, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DTS) |
| 771 | }, |
| 772 | { |
| 773 | AUDIO_FORMAT_DTS_HD, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DTS_HD) |
| 774 | }, |
| 775 | // In the future, we would like to represent encapsulated bitstreams as |
| 776 | // nested AudioFormatDescriptions. The legacy 'AUDIO_FORMAT_IEC61937' type doesn't |
| 777 | // specify the format of the encapsulated bitstream. |
| 778 | { |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 779 | AUDIO_FORMAT_IEC61937, |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 780 | make_AudioFormatDescription(PcmType::INT_16_BIT, MEDIA_MIMETYPE_AUDIO_IEC61937) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 781 | }, |
| 782 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 783 | AUDIO_FORMAT_DOLBY_TRUEHD, |
| 784 | make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DOLBY_TRUEHD) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 785 | }, |
| 786 | { |
| 787 | AUDIO_FORMAT_EVRC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_EVRC) |
| 788 | }, |
| 789 | { |
| 790 | AUDIO_FORMAT_EVRCB, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_EVRCB) |
| 791 | }, |
| 792 | { |
| 793 | AUDIO_FORMAT_EVRCWB, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_EVRCWB) |
| 794 | }, |
| 795 | { |
| 796 | AUDIO_FORMAT_EVRCNW, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_EVRCNW) |
| 797 | }, |
| 798 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 799 | AUDIO_FORMAT_AAC_ADIF, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADIF) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 800 | }, |
| 801 | { |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 802 | AUDIO_FORMAT_WMA, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_WMA) |
| 803 | }, |
| 804 | { |
| 805 | // Note: not in the IANA registry. |
| 806 | AUDIO_FORMAT_WMA_PRO, make_AudioFormatDescription("audio/x-ms-wma.pro") |
| 807 | }, |
| 808 | { |
| 809 | AUDIO_FORMAT_AMR_WB_PLUS, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AMR_WB_PLUS) |
| 810 | }, |
| 811 | { |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 812 | AUDIO_FORMAT_MP2, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_II) |
| 813 | }, |
| 814 | { |
| 815 | AUDIO_FORMAT_QCELP, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_QCELP) |
| 816 | }, |
| 817 | { |
| 818 | // Note: not in the IANA registry. |
| 819 | AUDIO_FORMAT_DSD, make_AudioFormatDescription("audio/vnd.sony.dsd") |
| 820 | }, |
| 821 | { |
| 822 | AUDIO_FORMAT_FLAC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_FLAC) |
| 823 | }, |
| 824 | { |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 825 | AUDIO_FORMAT_ALAC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_ALAC) |
| 826 | }, |
| 827 | { |
| 828 | // Note: not in the IANA registry. |
| 829 | AUDIO_FORMAT_APE, make_AudioFormatDescription("audio/x-ape") |
| 830 | }, |
| 831 | { |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 832 | AUDIO_FORMAT_AAC_ADTS, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS) |
| 833 | }, |
| 834 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 835 | AUDIO_FORMAT_AAC_ADTS_MAIN, |
| 836 | make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_MAIN) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 837 | }, |
| 838 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 839 | AUDIO_FORMAT_AAC_ADTS_LC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_LC) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 840 | }, |
| 841 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 842 | AUDIO_FORMAT_AAC_ADTS_SSR, |
| 843 | make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_SSR) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 844 | }, |
| 845 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 846 | AUDIO_FORMAT_AAC_ADTS_LTP, |
| 847 | make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_LTP) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 848 | }, |
| 849 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 850 | AUDIO_FORMAT_AAC_ADTS_HE_V1, |
| 851 | make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_HE_V1) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 852 | }, |
| 853 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 854 | AUDIO_FORMAT_AAC_ADTS_SCALABLE, |
| 855 | make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_SCALABLE) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 856 | }, |
| 857 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 858 | AUDIO_FORMAT_AAC_ADTS_ERLC, |
| 859 | make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_ERLC) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 860 | }, |
| 861 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 862 | AUDIO_FORMAT_AAC_ADTS_LD, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_LD) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 863 | }, |
| 864 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 865 | AUDIO_FORMAT_AAC_ADTS_HE_V2, |
| 866 | make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_HE_V2) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 867 | }, |
| 868 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 869 | AUDIO_FORMAT_AAC_ADTS_ELD, |
| 870 | make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_ELD) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 871 | }, |
| 872 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 873 | AUDIO_FORMAT_AAC_ADTS_XHE, |
| 874 | make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_XHE) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 875 | }, |
| 876 | { |
| 877 | // Note: not in the IANA registry. "vnd.octel.sbc" is not BT SBC. |
| 878 | AUDIO_FORMAT_SBC, make_AudioFormatDescription("audio/x-sbc") |
| 879 | }, |
| 880 | { |
| 881 | AUDIO_FORMAT_APTX, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_APTX) |
| 882 | }, |
| 883 | { |
| 884 | // Note: not in the IANA registry. |
| 885 | AUDIO_FORMAT_APTX_HD, make_AudioFormatDescription("audio/vnd.qcom.aptx.hd") |
| 886 | }, |
| 887 | { |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 888 | AUDIO_FORMAT_AC4, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AC4) |
| 889 | }, |
| 890 | { |
| 891 | // Note: not in the IANA registry. |
| 892 | AUDIO_FORMAT_LDAC, make_AudioFormatDescription("audio/vnd.sony.ldac") |
| 893 | }, |
| 894 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 895 | AUDIO_FORMAT_MAT, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DOLBY_MAT) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 896 | }, |
| 897 | { |
| 898 | // Note: not in the IANA registry. |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 899 | AUDIO_FORMAT_MAT_1_0, |
| 900 | make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DOLBY_MAT + std::string(".1.0")) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 901 | }, |
| 902 | { |
| 903 | // Note: not in the IANA registry. |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 904 | AUDIO_FORMAT_MAT_2_0, |
| 905 | make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DOLBY_MAT + std::string(".2.0")) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 906 | }, |
| 907 | { |
| 908 | // Note: not in the IANA registry. |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 909 | AUDIO_FORMAT_MAT_2_1, |
| 910 | make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DOLBY_MAT + std::string(".2.1")) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 911 | }, |
| 912 | { |
| 913 | AUDIO_FORMAT_AAC_LATM, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC) |
| 914 | }, |
| 915 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 916 | AUDIO_FORMAT_AAC_LATM_LC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_LATM_LC) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 917 | }, |
| 918 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 919 | AUDIO_FORMAT_AAC_LATM_HE_V1, |
| 920 | make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_LATM_HE_V1) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 921 | }, |
| 922 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 923 | AUDIO_FORMAT_AAC_LATM_HE_V2, |
| 924 | make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_LATM_HE_V2) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 925 | }, |
| 926 | { |
| 927 | // Note: not in the IANA registry. |
| 928 | AUDIO_FORMAT_CELT, make_AudioFormatDescription("audio/x-celt") |
| 929 | }, |
| 930 | { |
| 931 | // Note: not in the IANA registry. |
| 932 | AUDIO_FORMAT_APTX_ADAPTIVE, make_AudioFormatDescription("audio/vnd.qcom.aptx.adaptive") |
| 933 | }, |
| 934 | { |
| 935 | // Note: not in the IANA registry. |
| 936 | AUDIO_FORMAT_LHDC, make_AudioFormatDescription("audio/vnd.savitech.lhdc") |
| 937 | }, |
| 938 | { |
| 939 | // Note: not in the IANA registry. |
| 940 | AUDIO_FORMAT_LHDC_LL, make_AudioFormatDescription("audio/vnd.savitech.lhdc.ll") |
| 941 | }, |
| 942 | { |
| 943 | // Note: not in the IANA registry. |
| 944 | AUDIO_FORMAT_APTX_TWSP, make_AudioFormatDescription("audio/vnd.qcom.aptx.twsp") |
| 945 | }, |
| 946 | { |
| 947 | // Note: not in the IANA registry. |
| 948 | AUDIO_FORMAT_LC3, make_AudioFormatDescription("audio/x-lc3") |
| 949 | }, |
| 950 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 951 | AUDIO_FORMAT_MPEGH, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_MPEGH_MHM1) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 952 | }, |
| 953 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 954 | AUDIO_FORMAT_MPEGH_BL_L3, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_MPEGH_BL_L3) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 955 | }, |
| 956 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 957 | AUDIO_FORMAT_MPEGH_BL_L4, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_MPEGH_BL_L4) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 958 | }, |
| 959 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 960 | AUDIO_FORMAT_MPEGH_LC_L3, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_MPEGH_LC_L3) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 961 | }, |
| 962 | { |
Mikhail Naganov | 9ec08d0 | 2021-08-06 17:28:33 -0700 | [diff] [blame] | 963 | AUDIO_FORMAT_MPEGH_LC_L4, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_MPEGH_LC_L4) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 964 | }, |
| 965 | { |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 966 | AUDIO_FORMAT_IEC60958, |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 967 | make_AudioFormatDescription(PcmType::INT_24_BIT, MEDIA_MIMETYPE_AUDIO_IEC60958) |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 968 | }, |
| 969 | { |
| 970 | AUDIO_FORMAT_DTS_UHD, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DTS_UHD) |
| 971 | }, |
| 972 | { |
| 973 | AUDIO_FORMAT_DRA, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DRA) |
| 974 | }, |
| 975 | }}; |
| 976 | return pairs; |
| 977 | } |
| 978 | |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 979 | template<typename S, typename T> |
| 980 | std::unordered_map<S, T> make_DirectMap(const std::vector<std::pair<S, T>>& v) { |
| 981 | std::unordered_map<S, T> result(v.begin(), v.end()); |
| 982 | LOG_ALWAYS_FATAL_IF(result.size() != v.size(), "Duplicate key elements detected"); |
| 983 | return result; |
| 984 | } |
| 985 | |
| 986 | template<typename S, typename T> |
Mikhail Naganov | 2d4b14d | 2021-07-13 15:36:31 -0700 | [diff] [blame] | 987 | std::unordered_map<S, T> make_DirectMap( |
| 988 | const std::vector<std::pair<S, T>>& v1, const std::vector<std::pair<S, T>>& v2) { |
| 989 | std::unordered_map<S, T> result(v1.begin(), v1.end()); |
| 990 | LOG_ALWAYS_FATAL_IF(result.size() != v1.size(), "Duplicate key elements detected in v1"); |
| 991 | result.insert(v2.begin(), v2.end()); |
| 992 | LOG_ALWAYS_FATAL_IF(result.size() != v1.size() + v2.size(), |
| 993 | "Duplicate key elements detected in v1+v2"); |
| 994 | return result; |
| 995 | } |
| 996 | |
| 997 | template<typename S, typename T> |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 998 | std::unordered_map<T, S> make_ReverseMap(const std::vector<std::pair<S, T>>& v) { |
| 999 | std::unordered_map<T, S> result; |
| 1000 | std::transform(v.begin(), v.end(), std::inserter(result, result.begin()), |
| 1001 | [](const std::pair<S, T>& p) { |
| 1002 | return std::make_pair(p.second, p.first); |
| 1003 | }); |
| 1004 | LOG_ALWAYS_FATAL_IF(result.size() != v.size(), "Duplicate key elements detected"); |
| 1005 | return result; |
| 1006 | } |
| 1007 | |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 1008 | } // namespace |
| 1009 | |
Mikhail Naganov | cf2fa81 | 2021-06-25 09:03:37 -0700 | [diff] [blame] | 1010 | ConversionResult<audio_channel_mask_t> aidl2legacy_AudioChannelLayout_audio_channel_mask_t( |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 1011 | const AudioChannelLayout& aidl, bool isInput) { |
| 1012 | using ReverseMap = std::unordered_map<AudioChannelLayout, audio_channel_mask_t>; |
| 1013 | using Tag = AudioChannelLayout::Tag; |
Mikhail Naganov | cf2fa81 | 2021-06-25 09:03:37 -0700 | [diff] [blame] | 1014 | static const ReverseMap mIn = make_ReverseMap(getInAudioChannelPairs()); |
| 1015 | static const ReverseMap mOut = make_ReverseMap(getOutAudioChannelPairs()); |
Mikhail Naganov | 2d4b14d | 2021-07-13 15:36:31 -0700 | [diff] [blame] | 1016 | static const ReverseMap mVoice = make_ReverseMap(getVoiceAudioChannelPairs()); |
Mikhail Naganov | cf2fa81 | 2021-06-25 09:03:37 -0700 | [diff] [blame] | 1017 | |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 1018 | auto convert = [](const AudioChannelLayout& aidl, const ReverseMap& m, |
Mikhail Naganov | cf2fa81 | 2021-06-25 09:03:37 -0700 | [diff] [blame] | 1019 | const char* func, const char* type) -> ConversionResult<audio_channel_mask_t> { |
| 1020 | if (auto it = m.find(aidl); it != m.end()) { |
| 1021 | return it->second; |
| 1022 | } else { |
| 1023 | ALOGE("%s: no legacy %s audio_channel_mask_t found for %s", func, type, |
| 1024 | aidl.toString().c_str()); |
| 1025 | return unexpected(BAD_VALUE); |
| 1026 | } |
| 1027 | }; |
| 1028 | |
| 1029 | switch (aidl.getTag()) { |
| 1030 | case Tag::none: |
| 1031 | return AUDIO_CHANNEL_NONE; |
| 1032 | case Tag::invalid: |
| 1033 | return AUDIO_CHANNEL_INVALID; |
Mikhail Naganov | 8102000 | 2021-08-03 14:16:15 -0700 | [diff] [blame] | 1034 | case Tag::indexMask: { |
| 1035 | // Index masks do not have pre-defined values. |
| 1036 | const int bits = aidl.get<Tag::indexMask>(); |
| 1037 | if (__builtin_popcount(bits) != 0 && |
| 1038 | __builtin_popcount(bits) <= AUDIO_CHANNEL_COUNT_MAX) { |
| 1039 | return audio_channel_mask_from_representation_and_bits( |
| 1040 | AUDIO_CHANNEL_REPRESENTATION_INDEX, bits); |
| 1041 | } else { |
| 1042 | ALOGE("%s: invalid indexMask value 0x%x in %s", |
| 1043 | __func__, bits, aidl.toString().c_str()); |
| 1044 | return unexpected(BAD_VALUE); |
| 1045 | } |
| 1046 | } |
Mikhail Naganov | cf2fa81 | 2021-06-25 09:03:37 -0700 | [diff] [blame] | 1047 | case Tag::layoutMask: |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 1048 | return convert(aidl, isInput ? mIn : mOut, __func__, isInput ? "input" : "output"); |
Mikhail Naganov | 2d4b14d | 2021-07-13 15:36:31 -0700 | [diff] [blame] | 1049 | case Tag::voiceMask: |
| 1050 | return convert(aidl, mVoice, __func__, "voice"); |
Mikhail Naganov | cf2fa81 | 2021-06-25 09:03:37 -0700 | [diff] [blame] | 1051 | } |
| 1052 | ALOGE("%s: unexpected tag value %d", __func__, aidl.getTag()); |
| 1053 | return unexpected(BAD_VALUE); |
| 1054 | } |
| 1055 | |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 1056 | ConversionResult<AudioChannelLayout> legacy2aidl_audio_channel_mask_t_AudioChannelLayout( |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 1057 | audio_channel_mask_t legacy, bool isInput) { |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 1058 | using DirectMap = std::unordered_map<audio_channel_mask_t, AudioChannelLayout>; |
| 1059 | using Tag = AudioChannelLayout::Tag; |
Mikhail Naganov | 2d4b14d | 2021-07-13 15:36:31 -0700 | [diff] [blame] | 1060 | static const DirectMap mInAndVoice = make_DirectMap( |
| 1061 | getInAudioChannelPairs(), getVoiceAudioChannelPairs()); |
Mikhail Naganov | cf2fa81 | 2021-06-25 09:03:37 -0700 | [diff] [blame] | 1062 | static const DirectMap mOut = make_DirectMap(getOutAudioChannelPairs()); |
| 1063 | |
| 1064 | auto convert = [](const audio_channel_mask_t legacy, const DirectMap& m, |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 1065 | const char* func, const char* type) -> ConversionResult<AudioChannelLayout> { |
Mikhail Naganov | cf2fa81 | 2021-06-25 09:03:37 -0700 | [diff] [blame] | 1066 | if (auto it = m.find(legacy); it != m.end()) { |
| 1067 | return it->second; |
| 1068 | } else { |
| 1069 | ALOGE("%s: no AudioChannelLayout found for legacy %s audio_channel_mask_t value 0x%x", |
| 1070 | func, type, legacy); |
| 1071 | return unexpected(BAD_VALUE); |
| 1072 | } |
| 1073 | }; |
| 1074 | |
| 1075 | if (legacy == AUDIO_CHANNEL_NONE) { |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 1076 | return AudioChannelLayout{}; |
Mikhail Naganov | cf2fa81 | 2021-06-25 09:03:37 -0700 | [diff] [blame] | 1077 | } else if (legacy == AUDIO_CHANNEL_INVALID) { |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 1078 | return AudioChannelLayout::make<Tag::invalid>(0); |
Mikhail Naganov | cf2fa81 | 2021-06-25 09:03:37 -0700 | [diff] [blame] | 1079 | } |
| 1080 | |
| 1081 | const audio_channel_representation_t repr = audio_channel_mask_get_representation(legacy); |
| 1082 | if (repr == AUDIO_CHANNEL_REPRESENTATION_INDEX) { |
Mikhail Naganov | 8102000 | 2021-08-03 14:16:15 -0700 | [diff] [blame] | 1083 | if (audio_channel_mask_is_valid(legacy)) { |
| 1084 | const int indexMask = VALUE_OR_RETURN( |
| 1085 | convertIntegral<int>(audio_channel_mask_get_bits(legacy))); |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 1086 | return AudioChannelLayout::make<Tag::indexMask>(indexMask); |
Mikhail Naganov | 8102000 | 2021-08-03 14:16:15 -0700 | [diff] [blame] | 1087 | } else { |
| 1088 | ALOGE("%s: legacy audio_channel_mask_t value 0x%x is invalid", __func__, legacy); |
| 1089 | return unexpected(BAD_VALUE); |
| 1090 | } |
Mikhail Naganov | cf2fa81 | 2021-06-25 09:03:37 -0700 | [diff] [blame] | 1091 | } else if (repr == AUDIO_CHANNEL_REPRESENTATION_POSITION) { |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 1092 | return convert(legacy, isInput ? mInAndVoice : mOut, __func__, |
| 1093 | isInput ? "input / voice" : "output"); |
Mikhail Naganov | cf2fa81 | 2021-06-25 09:03:37 -0700 | [diff] [blame] | 1094 | } |
| 1095 | |
| 1096 | ALOGE("%s: unknown representation %d in audio_channel_mask_t value 0x%x", |
| 1097 | __func__, repr, legacy); |
| 1098 | return unexpected(BAD_VALUE); |
| 1099 | } |
| 1100 | |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 1101 | ConversionResult<audio_devices_t> aidl2legacy_AudioDeviceDescription_audio_devices_t( |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 1102 | const AudioDeviceDescription& aidl) { |
| 1103 | static const std::unordered_map<AudioDeviceDescription, audio_devices_t> m = |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 1104 | make_ReverseMap(getAudioDevicePairs()); |
| 1105 | if (auto it = m.find(aidl); it != m.end()) { |
| 1106 | return it->second; |
| 1107 | } else { |
| 1108 | ALOGE("%s: no legacy audio_devices_t found for %s", __func__, aidl.toString().c_str()); |
| 1109 | return unexpected(BAD_VALUE); |
| 1110 | } |
| 1111 | } |
| 1112 | |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 1113 | ConversionResult<AudioDeviceDescription> legacy2aidl_audio_devices_t_AudioDeviceDescription( |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 1114 | audio_devices_t legacy) { |
Mikhail Naganov | f4a7536 | 2021-09-16 00:02:54 +0000 | [diff] [blame] | 1115 | static const std::unordered_map<audio_devices_t, AudioDeviceDescription> m = |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 1116 | make_DirectMap(getAudioDevicePairs()); |
| 1117 | if (auto it = m.find(legacy); it != m.end()) { |
| 1118 | return it->second; |
| 1119 | } else { |
| 1120 | ALOGE("%s: no AudioDeviceDescription found for legacy audio_devices_t value 0x%x", |
| 1121 | __func__, legacy); |
| 1122 | return unexpected(BAD_VALUE); |
| 1123 | } |
| 1124 | } |
| 1125 | |
Mikhail Naganov | 932cb96 | 2021-09-16 01:05:27 +0000 | [diff] [blame] | 1126 | status_t aidl2legacy_AudioDevice_audio_device( |
| 1127 | const AudioDevice& aidl, |
| 1128 | audio_devices_t* legacyType, char* legacyAddress) { |
| 1129 | *legacyType = VALUE_OR_RETURN_STATUS( |
| 1130 | aidl2legacy_AudioDeviceDescription_audio_devices_t(aidl.type)); |
| 1131 | return aidl2legacy_string( |
| 1132 | aidl.address.get<AudioDeviceAddress::id>(), |
| 1133 | legacyAddress, AUDIO_DEVICE_MAX_ADDRESS_LEN); |
| 1134 | } |
| 1135 | |
| 1136 | status_t aidl2legacy_AudioDevice_audio_device( |
| 1137 | const AudioDevice& aidl, |
| 1138 | audio_devices_t* legacyType, String8* legacyAddress) { |
| 1139 | *legacyType = VALUE_OR_RETURN_STATUS( |
| 1140 | aidl2legacy_AudioDeviceDescription_audio_devices_t(aidl.type)); |
| 1141 | *legacyAddress = VALUE_OR_RETURN_STATUS(aidl2legacy_string_view_String8( |
| 1142 | aidl.address.get<AudioDeviceAddress::id>())); |
| 1143 | return OK; |
| 1144 | } |
| 1145 | |
| 1146 | status_t aidl2legacy_AudioDevice_audio_device( |
| 1147 | const AudioDevice& aidl, |
| 1148 | audio_devices_t* legacyType, std::string* legacyAddress) { |
| 1149 | *legacyType = VALUE_OR_RETURN_STATUS( |
| 1150 | aidl2legacy_AudioDeviceDescription_audio_devices_t(aidl.type)); |
| 1151 | *legacyAddress = aidl.address.get<AudioDeviceAddress::id>(); |
| 1152 | return OK; |
| 1153 | } |
| 1154 | |
| 1155 | ConversionResult<AudioDevice> legacy2aidl_audio_device_AudioDevice( |
| 1156 | audio_devices_t legacyType, const char* legacyAddress) { |
| 1157 | AudioDevice aidl; |
| 1158 | aidl.type = VALUE_OR_RETURN( |
| 1159 | legacy2aidl_audio_devices_t_AudioDeviceDescription(legacyType)); |
| 1160 | const std::string aidl_id = VALUE_OR_RETURN( |
| 1161 | legacy2aidl_string(legacyAddress, AUDIO_DEVICE_MAX_ADDRESS_LEN)); |
| 1162 | aidl.address = AudioDeviceAddress::make<AudioDeviceAddress::id>(aidl_id); |
| 1163 | return aidl; |
| 1164 | } |
| 1165 | |
| 1166 | ConversionResult<AudioDevice> |
| 1167 | legacy2aidl_audio_device_AudioDevice( |
| 1168 | audio_devices_t legacyType, const String8& legacyAddress) { |
| 1169 | AudioDevice aidl; |
| 1170 | aidl.type = VALUE_OR_RETURN( |
| 1171 | legacy2aidl_audio_devices_t_AudioDeviceDescription(legacyType)); |
| 1172 | const std::string aidl_id = VALUE_OR_RETURN( |
| 1173 | legacy2aidl_String8_string(legacyAddress)); |
| 1174 | aidl.address = AudioDeviceAddress::make<AudioDeviceAddress::id>(aidl_id); |
| 1175 | return aidl; |
| 1176 | } |
| 1177 | |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 1178 | ConversionResult<audio_format_t> aidl2legacy_AudioFormatDescription_audio_format_t( |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 1179 | const AudioFormatDescription& aidl) { |
| 1180 | static const std::unordered_map<AudioFormatDescription, audio_format_t> m = |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 1181 | make_ReverseMap(getAudioFormatPairs()); |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 1182 | if (auto it = m.find(aidl); it != m.end()) { |
| 1183 | return it->second; |
| 1184 | } else { |
| 1185 | ALOGE("%s: no legacy audio_format_t found for %s", __func__, aidl.toString().c_str()); |
| 1186 | return unexpected(BAD_VALUE); |
| 1187 | } |
| 1188 | } |
| 1189 | |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 1190 | ConversionResult<AudioFormatDescription> legacy2aidl_audio_format_t_AudioFormatDescription( |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 1191 | audio_format_t legacy) { |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 1192 | static const std::unordered_map<audio_format_t, AudioFormatDescription> m = |
Mikhail Naganov | 09a7381 | 2021-06-17 18:00:55 -0700 | [diff] [blame] | 1193 | make_DirectMap(getAudioFormatPairs()); |
Mikhail Naganov | e128b8e | 2021-06-04 17:31:03 -0700 | [diff] [blame] | 1194 | if (auto it = m.find(legacy); it != m.end()) { |
| 1195 | return it->second; |
| 1196 | } else { |
| 1197 | ALOGE("%s: no AudioFormatDescription found for legacy audio_format_t value 0x%x", |
| 1198 | __func__, legacy); |
| 1199 | return unexpected(BAD_VALUE); |
| 1200 | } |
| 1201 | } |
| 1202 | |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 1203 | ConversionResult<audio_gain_mode_t> aidl2legacy_AudioGainMode_audio_gain_mode_t( |
| 1204 | AudioGainMode aidl) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1205 | switch (aidl) { |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 1206 | case AudioGainMode::JOINT: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1207 | return AUDIO_GAIN_MODE_JOINT; |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 1208 | case AudioGainMode::CHANNELS: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1209 | return AUDIO_GAIN_MODE_CHANNELS; |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 1210 | case AudioGainMode::RAMP: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1211 | return AUDIO_GAIN_MODE_RAMP; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1212 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1213 | return unexpected(BAD_VALUE); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1214 | } |
| 1215 | |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 1216 | ConversionResult<AudioGainMode> legacy2aidl_audio_gain_mode_t_AudioGainMode( |
| 1217 | audio_gain_mode_t legacy) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1218 | switch (legacy) { |
| 1219 | case AUDIO_GAIN_MODE_JOINT: |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 1220 | return AudioGainMode::JOINT; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1221 | case AUDIO_GAIN_MODE_CHANNELS: |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 1222 | return AudioGainMode::CHANNELS; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1223 | case AUDIO_GAIN_MODE_RAMP: |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 1224 | return AudioGainMode::RAMP; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1225 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1226 | return unexpected(BAD_VALUE); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1227 | } |
| 1228 | |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 1229 | ConversionResult<audio_gain_mode_t> aidl2legacy_int32_t_audio_gain_mode_t_mask(int32_t aidl) { |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 1230 | return convertBitmask<audio_gain_mode_t, int32_t, audio_gain_mode_t, AudioGainMode>( |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 1231 | aidl, aidl2legacy_AudioGainMode_audio_gain_mode_t, |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1232 | // AudioGainMode is index-based. |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 1233 | indexToEnum_index<AudioGainMode>, |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1234 | // AUDIO_GAIN_MODE_* constants are mask-based. |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 1235 | enumToMask_bitmask<audio_gain_mode_t, audio_gain_mode_t>); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1236 | } |
| 1237 | |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 1238 | ConversionResult<int32_t> legacy2aidl_audio_gain_mode_t_int32_t_mask(audio_gain_mode_t legacy) { |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 1239 | return convertBitmask<int32_t, audio_gain_mode_t, AudioGainMode, audio_gain_mode_t>( |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 1240 | legacy, legacy2aidl_audio_gain_mode_t_AudioGainMode, |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1241 | // AUDIO_GAIN_MODE_* constants are mask-based. |
Ytai Ben-Tsvi | 08c7d9e | 2020-12-16 14:32:56 -0800 | [diff] [blame] | 1242 | indexToEnum_bitmask<audio_gain_mode_t>, |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1243 | // AudioGainMode is index-based. |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 1244 | enumToMask_index<int32_t, AudioGainMode>); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1245 | } |
| 1246 | |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1247 | ConversionResult<audio_gain_config> aidl2legacy_AudioGainConfig_audio_gain_config( |
Mikhail Naganov | 9255d4d | 2021-09-23 18:39:38 +0000 | [diff] [blame] | 1248 | const AudioGainConfig& aidl, bool isInput) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1249 | audio_gain_config legacy; |
| 1250 | legacy.index = VALUE_OR_RETURN(convertIntegral<int>(aidl.index)); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 1251 | legacy.mode = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_gain_mode_t_mask(aidl.mode)); |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 1252 | legacy.channel_mask = VALUE_OR_RETURN( |
| 1253 | aidl2legacy_AudioChannelLayout_audio_channel_mask_t(aidl.channelMask, isInput)); |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 1254 | const bool isJoint = bitmaskIsSet(aidl.mode, AudioGainMode::JOINT); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1255 | size_t numValues = isJoint ? 1 |
| 1256 | : isInput ? audio_channel_count_from_in_mask(legacy.channel_mask) |
| 1257 | : audio_channel_count_from_out_mask(legacy.channel_mask); |
| 1258 | if (aidl.values.size() != numValues || aidl.values.size() > std::size(legacy.values)) { |
| 1259 | return unexpected(BAD_VALUE); |
| 1260 | } |
| 1261 | for (size_t i = 0; i < numValues; ++i) { |
| 1262 | legacy.values[i] = VALUE_OR_RETURN(convertIntegral<int>(aidl.values[i])); |
| 1263 | } |
| 1264 | legacy.ramp_duration_ms = VALUE_OR_RETURN(convertIntegral<unsigned int>(aidl.rampDurationMs)); |
| 1265 | return legacy; |
| 1266 | } |
| 1267 | |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 1268 | ConversionResult<AudioGainConfig> legacy2aidl_audio_gain_config_AudioGainConfig( |
Mikhail Naganov | 9255d4d | 2021-09-23 18:39:38 +0000 | [diff] [blame] | 1269 | const audio_gain_config& legacy, bool isInput) { |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 1270 | AudioGainConfig aidl; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1271 | aidl.index = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.index)); |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 1272 | aidl.mode = VALUE_OR_RETURN(legacy2aidl_audio_gain_mode_t_int32_t_mask(legacy.mode)); |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 1273 | aidl.channelMask = VALUE_OR_RETURN( |
| 1274 | legacy2aidl_audio_channel_mask_t_AudioChannelLayout(legacy.channel_mask, isInput)); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1275 | const bool isJoint = (legacy.mode & AUDIO_GAIN_MODE_JOINT) != 0; |
| 1276 | size_t numValues = isJoint ? 1 |
| 1277 | : isInput ? audio_channel_count_from_in_mask(legacy.channel_mask) |
| 1278 | : audio_channel_count_from_out_mask(legacy.channel_mask); |
| 1279 | aidl.values.resize(numValues); |
| 1280 | for (size_t i = 0; i < numValues; ++i) { |
| 1281 | aidl.values[i] = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.values[i])); |
| 1282 | } |
| 1283 | aidl.rampDurationMs = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.ramp_duration_ms)); |
| 1284 | return aidl; |
| 1285 | } |
| 1286 | |
| 1287 | ConversionResult<audio_input_flags_t> aidl2legacy_AudioInputFlags_audio_input_flags_t( |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1288 | AudioInputFlags aidl) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1289 | switch (aidl) { |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1290 | case AudioInputFlags::FAST: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1291 | return AUDIO_INPUT_FLAG_FAST; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1292 | case AudioInputFlags::HW_HOTWORD: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1293 | return AUDIO_INPUT_FLAG_HW_HOTWORD; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1294 | case AudioInputFlags::RAW: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1295 | return AUDIO_INPUT_FLAG_RAW; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1296 | case AudioInputFlags::SYNC: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1297 | return AUDIO_INPUT_FLAG_SYNC; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1298 | case AudioInputFlags::MMAP_NOIRQ: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1299 | return AUDIO_INPUT_FLAG_MMAP_NOIRQ; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1300 | case AudioInputFlags::VOIP_TX: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1301 | return AUDIO_INPUT_FLAG_VOIP_TX; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1302 | case AudioInputFlags::HW_AV_SYNC: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1303 | return AUDIO_INPUT_FLAG_HW_AV_SYNC; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1304 | case AudioInputFlags::DIRECT: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1305 | return AUDIO_INPUT_FLAG_DIRECT; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1306 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1307 | return unexpected(BAD_VALUE); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1308 | } |
| 1309 | |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1310 | ConversionResult<AudioInputFlags> legacy2aidl_audio_input_flags_t_AudioInputFlags( |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1311 | audio_input_flags_t legacy) { |
| 1312 | switch (legacy) { |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1313 | case AUDIO_INPUT_FLAG_NONE: |
| 1314 | break; // shouldn't get here. must be listed -Werror,-Wswitch |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1315 | case AUDIO_INPUT_FLAG_FAST: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1316 | return AudioInputFlags::FAST; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1317 | case AUDIO_INPUT_FLAG_HW_HOTWORD: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1318 | return AudioInputFlags::HW_HOTWORD; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1319 | case AUDIO_INPUT_FLAG_RAW: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1320 | return AudioInputFlags::RAW; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1321 | case AUDIO_INPUT_FLAG_SYNC: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1322 | return AudioInputFlags::SYNC; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1323 | case AUDIO_INPUT_FLAG_MMAP_NOIRQ: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1324 | return AudioInputFlags::MMAP_NOIRQ; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1325 | case AUDIO_INPUT_FLAG_VOIP_TX: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1326 | return AudioInputFlags::VOIP_TX; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1327 | case AUDIO_INPUT_FLAG_HW_AV_SYNC: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1328 | return AudioInputFlags::HW_AV_SYNC; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1329 | case AUDIO_INPUT_FLAG_DIRECT: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1330 | return AudioInputFlags::DIRECT; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1331 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1332 | return unexpected(BAD_VALUE); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1333 | } |
| 1334 | |
| 1335 | ConversionResult<audio_output_flags_t> aidl2legacy_AudioOutputFlags_audio_output_flags_t( |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1336 | AudioOutputFlags aidl) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1337 | switch (aidl) { |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1338 | case AudioOutputFlags::DIRECT: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1339 | return AUDIO_OUTPUT_FLAG_DIRECT; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1340 | case AudioOutputFlags::PRIMARY: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1341 | return AUDIO_OUTPUT_FLAG_PRIMARY; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1342 | case AudioOutputFlags::FAST: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1343 | return AUDIO_OUTPUT_FLAG_FAST; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1344 | case AudioOutputFlags::DEEP_BUFFER: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1345 | return AUDIO_OUTPUT_FLAG_DEEP_BUFFER; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1346 | case AudioOutputFlags::COMPRESS_OFFLOAD: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1347 | return AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1348 | case AudioOutputFlags::NON_BLOCKING: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1349 | return AUDIO_OUTPUT_FLAG_NON_BLOCKING; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1350 | case AudioOutputFlags::HW_AV_SYNC: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1351 | return AUDIO_OUTPUT_FLAG_HW_AV_SYNC; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1352 | case AudioOutputFlags::TTS: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1353 | return AUDIO_OUTPUT_FLAG_TTS; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1354 | case AudioOutputFlags::RAW: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1355 | return AUDIO_OUTPUT_FLAG_RAW; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1356 | case AudioOutputFlags::SYNC: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1357 | return AUDIO_OUTPUT_FLAG_SYNC; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1358 | case AudioOutputFlags::IEC958_NONAUDIO: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1359 | return AUDIO_OUTPUT_FLAG_IEC958_NONAUDIO; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1360 | case AudioOutputFlags::DIRECT_PCM: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1361 | return AUDIO_OUTPUT_FLAG_DIRECT_PCM; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1362 | case AudioOutputFlags::MMAP_NOIRQ: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1363 | return AUDIO_OUTPUT_FLAG_MMAP_NOIRQ; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1364 | case AudioOutputFlags::VOIP_RX: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1365 | return AUDIO_OUTPUT_FLAG_VOIP_RX; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1366 | case AudioOutputFlags::INCALL_MUSIC: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1367 | return AUDIO_OUTPUT_FLAG_INCALL_MUSIC; |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1368 | case AudioOutputFlags::GAPLESS_OFFLOAD: |
Eric Laurent | 90fe31c | 2020-11-26 20:06:35 +0100 | [diff] [blame] | 1369 | return AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1370 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1371 | return unexpected(BAD_VALUE); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1372 | } |
| 1373 | |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1374 | ConversionResult<AudioOutputFlags> legacy2aidl_audio_output_flags_t_AudioOutputFlags( |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1375 | audio_output_flags_t legacy) { |
| 1376 | switch (legacy) { |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1377 | case AUDIO_OUTPUT_FLAG_NONE: |
| 1378 | break; // shouldn't get here. must be listed -Werror,-Wswitch |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1379 | case AUDIO_OUTPUT_FLAG_DIRECT: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1380 | return AudioOutputFlags::DIRECT; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1381 | case AUDIO_OUTPUT_FLAG_PRIMARY: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1382 | return AudioOutputFlags::PRIMARY; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1383 | case AUDIO_OUTPUT_FLAG_FAST: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1384 | return AudioOutputFlags::FAST; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1385 | case AUDIO_OUTPUT_FLAG_DEEP_BUFFER: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1386 | return AudioOutputFlags::DEEP_BUFFER; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1387 | case AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1388 | return AudioOutputFlags::COMPRESS_OFFLOAD; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1389 | case AUDIO_OUTPUT_FLAG_NON_BLOCKING: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1390 | return AudioOutputFlags::NON_BLOCKING; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1391 | case AUDIO_OUTPUT_FLAG_HW_AV_SYNC: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1392 | return AudioOutputFlags::HW_AV_SYNC; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1393 | case AUDIO_OUTPUT_FLAG_TTS: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1394 | return AudioOutputFlags::TTS; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1395 | case AUDIO_OUTPUT_FLAG_RAW: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1396 | return AudioOutputFlags::RAW; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1397 | case AUDIO_OUTPUT_FLAG_SYNC: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1398 | return AudioOutputFlags::SYNC; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1399 | case AUDIO_OUTPUT_FLAG_IEC958_NONAUDIO: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1400 | return AudioOutputFlags::IEC958_NONAUDIO; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1401 | case AUDIO_OUTPUT_FLAG_DIRECT_PCM: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1402 | return AudioOutputFlags::DIRECT_PCM; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1403 | case AUDIO_OUTPUT_FLAG_MMAP_NOIRQ: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1404 | return AudioOutputFlags::MMAP_NOIRQ; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1405 | case AUDIO_OUTPUT_FLAG_VOIP_RX: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1406 | return AudioOutputFlags::VOIP_RX; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1407 | case AUDIO_OUTPUT_FLAG_INCALL_MUSIC: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1408 | return AudioOutputFlags::INCALL_MUSIC; |
Eric Laurent | 90fe31c | 2020-11-26 20:06:35 +0100 | [diff] [blame] | 1409 | case AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD: |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1410 | return AudioOutputFlags::GAPLESS_OFFLOAD; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1411 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1412 | return unexpected(BAD_VALUE); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1413 | } |
| 1414 | |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 1415 | ConversionResult<audio_input_flags_t> aidl2legacy_int32_t_audio_input_flags_t_mask( |
| 1416 | int32_t aidl) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1417 | using LegacyMask = std::underlying_type_t<audio_input_flags_t>; |
| 1418 | |
| 1419 | LegacyMask converted = VALUE_OR_RETURN( |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1420 | (convertBitmask<LegacyMask, int32_t, audio_input_flags_t, AudioInputFlags>( |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1421 | aidl, aidl2legacy_AudioInputFlags_audio_input_flags_t, |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1422 | indexToEnum_index<AudioInputFlags>, |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1423 | enumToMask_bitmask<LegacyMask, audio_input_flags_t>))); |
| 1424 | return static_cast<audio_input_flags_t>(converted); |
| 1425 | } |
| 1426 | |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 1427 | ConversionResult<int32_t> legacy2aidl_audio_input_flags_t_int32_t_mask( |
| 1428 | audio_input_flags_t legacy) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1429 | using LegacyMask = std::underlying_type_t<audio_input_flags_t>; |
| 1430 | |
| 1431 | LegacyMask legacyMask = static_cast<LegacyMask>(legacy); |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1432 | return convertBitmask<int32_t, LegacyMask, AudioInputFlags, audio_input_flags_t>( |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1433 | legacyMask, legacy2aidl_audio_input_flags_t_AudioInputFlags, |
Ytai Ben-Tsvi | 08c7d9e | 2020-12-16 14:32:56 -0800 | [diff] [blame] | 1434 | indexToEnum_bitmask<audio_input_flags_t>, |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1435 | enumToMask_index<int32_t, AudioInputFlags>); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1436 | } |
| 1437 | |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 1438 | ConversionResult<audio_output_flags_t> aidl2legacy_int32_t_audio_output_flags_t_mask( |
| 1439 | int32_t aidl) { |
Ytai Ben-Tsvi | 49298c5 | 2020-10-15 10:56:48 -0700 | [diff] [blame] | 1440 | return convertBitmask<audio_output_flags_t, |
Ytai Ben-Tsvi | 08c7d9e | 2020-12-16 14:32:56 -0800 | [diff] [blame] | 1441 | int32_t, |
| 1442 | audio_output_flags_t, |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1443 | AudioOutputFlags>( |
Ytai Ben-Tsvi | 49298c5 | 2020-10-15 10:56:48 -0700 | [diff] [blame] | 1444 | aidl, aidl2legacy_AudioOutputFlags_audio_output_flags_t, |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1445 | indexToEnum_index<AudioOutputFlags>, |
Ytai Ben-Tsvi | 49298c5 | 2020-10-15 10:56:48 -0700 | [diff] [blame] | 1446 | enumToMask_bitmask<audio_output_flags_t, audio_output_flags_t>); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1447 | } |
| 1448 | |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 1449 | ConversionResult<int32_t> legacy2aidl_audio_output_flags_t_int32_t_mask( |
| 1450 | audio_output_flags_t legacy) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1451 | using LegacyMask = std::underlying_type_t<audio_output_flags_t>; |
| 1452 | |
| 1453 | LegacyMask legacyMask = static_cast<LegacyMask>(legacy); |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1454 | return convertBitmask<int32_t, LegacyMask, AudioOutputFlags, audio_output_flags_t>( |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1455 | legacyMask, legacy2aidl_audio_output_flags_t_AudioOutputFlags, |
Ytai Ben-Tsvi | 08c7d9e | 2020-12-16 14:32:56 -0800 | [diff] [blame] | 1456 | indexToEnum_bitmask<audio_output_flags_t>, |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1457 | enumToMask_index<int32_t, AudioOutputFlags>); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1458 | } |
| 1459 | |
| 1460 | ConversionResult<audio_io_flags> aidl2legacy_AudioIoFlags_audio_io_flags( |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1461 | const AudioIoFlags& aidl, media::AudioPortRole role, media::AudioPortType type) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1462 | audio_io_flags legacy; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1463 | Direction dir = VALUE_OR_RETURN(direction(role, type)); |
| 1464 | switch (dir) { |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 1465 | case Direction::INPUT: { |
| 1466 | legacy.input = VALUE_OR_RETURN( |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 1467 | aidl2legacy_int32_t_audio_input_flags_t_mask( |
| 1468 | VALUE_OR_RETURN(UNION_GET(aidl, input)))); |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 1469 | } |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1470 | break; |
| 1471 | |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 1472 | case Direction::OUTPUT: { |
| 1473 | legacy.output = VALUE_OR_RETURN( |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 1474 | aidl2legacy_int32_t_audio_output_flags_t_mask( |
| 1475 | VALUE_OR_RETURN(UNION_GET(aidl, output)))); |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 1476 | } |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1477 | break; |
| 1478 | } |
| 1479 | |
| 1480 | return legacy; |
| 1481 | } |
| 1482 | |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1483 | ConversionResult<AudioIoFlags> legacy2aidl_audio_io_flags_AudioIoFlags( |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1484 | const audio_io_flags& legacy, audio_port_role_t role, audio_port_type_t type) { |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1485 | AudioIoFlags aidl; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1486 | |
| 1487 | Direction dir = VALUE_OR_RETURN(direction(role, type)); |
| 1488 | switch (dir) { |
| 1489 | case Direction::INPUT: |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 1490 | UNION_SET(aidl, input, |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 1491 | VALUE_OR_RETURN(legacy2aidl_audio_input_flags_t_int32_t_mask( |
| 1492 | legacy.input))); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1493 | break; |
| 1494 | case Direction::OUTPUT: |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 1495 | UNION_SET(aidl, output, |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 1496 | VALUE_OR_RETURN(legacy2aidl_audio_output_flags_t_int32_t_mask( |
| 1497 | legacy.output))); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1498 | break; |
| 1499 | } |
| 1500 | return aidl; |
| 1501 | } |
| 1502 | |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 1503 | ConversionResult<audio_port_config_device_ext> |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1504 | aidl2legacy_AudioPortDeviceExt_audio_port_config_device_ext( |
| 1505 | const AudioPortDeviceExt& aidl, const media::AudioPortDeviceExtSys& aidlDeviceExt) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1506 | audio_port_config_device_ext legacy; |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1507 | legacy.hw_module = VALUE_OR_RETURN( |
| 1508 | aidl2legacy_int32_t_audio_module_handle_t(aidlDeviceExt.hwModule)); |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1509 | RETURN_IF_ERROR(aidl2legacy_AudioDevice_audio_device( |
| 1510 | aidl.device, &legacy.type, legacy.address)); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1511 | return legacy; |
| 1512 | } |
| 1513 | |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1514 | status_t legacy2aidl_audio_port_config_device_ext_AudioPortDeviceExt( |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1515 | const audio_port_config_device_ext& legacy, |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1516 | AudioPortDeviceExt* aidl, media::AudioPortDeviceExtSys* aidlDeviceExt) { |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1517 | aidlDeviceExt->hwModule = VALUE_OR_RETURN_STATUS( |
| 1518 | legacy2aidl_audio_module_handle_t_int32_t(legacy.hw_module)); |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1519 | aidl->device = VALUE_OR_RETURN_STATUS( |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1520 | legacy2aidl_audio_device_AudioDevice(legacy.type, legacy.address)); |
| 1521 | return OK; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1522 | } |
| 1523 | |
| 1524 | ConversionResult<audio_stream_type_t> aidl2legacy_AudioStreamType_audio_stream_type_t( |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1525 | AudioStreamType aidl) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1526 | switch (aidl) { |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1527 | case AudioStreamType::INVALID: |
| 1528 | break; // return error |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1529 | case AudioStreamType::SYS_RESERVED_DEFAULT: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1530 | return AUDIO_STREAM_DEFAULT; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1531 | case AudioStreamType::VOICE_CALL: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1532 | return AUDIO_STREAM_VOICE_CALL; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1533 | case AudioStreamType::SYSTEM: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1534 | return AUDIO_STREAM_SYSTEM; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1535 | case AudioStreamType::RING: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1536 | return AUDIO_STREAM_RING; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1537 | case AudioStreamType::MUSIC: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1538 | return AUDIO_STREAM_MUSIC; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1539 | case AudioStreamType::ALARM: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1540 | return AUDIO_STREAM_ALARM; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1541 | case AudioStreamType::NOTIFICATION: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1542 | return AUDIO_STREAM_NOTIFICATION; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1543 | case AudioStreamType::BLUETOOTH_SCO: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1544 | return AUDIO_STREAM_BLUETOOTH_SCO; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1545 | case AudioStreamType::ENFORCED_AUDIBLE: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1546 | return AUDIO_STREAM_ENFORCED_AUDIBLE; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1547 | case AudioStreamType::DTMF: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1548 | return AUDIO_STREAM_DTMF; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1549 | case AudioStreamType::TTS: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1550 | return AUDIO_STREAM_TTS; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1551 | case AudioStreamType::ACCESSIBILITY: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1552 | return AUDIO_STREAM_ACCESSIBILITY; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1553 | case AudioStreamType::ASSISTANT: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1554 | return AUDIO_STREAM_ASSISTANT; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1555 | case AudioStreamType::SYS_RESERVED_REROUTING: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1556 | return AUDIO_STREAM_REROUTING; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1557 | case AudioStreamType::SYS_RESERVED_PATCH: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1558 | return AUDIO_STREAM_PATCH; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1559 | case AudioStreamType::CALL_ASSISTANT: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1560 | return AUDIO_STREAM_CALL_ASSISTANT; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1561 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1562 | return unexpected(BAD_VALUE); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1563 | } |
| 1564 | |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1565 | ConversionResult<AudioStreamType> legacy2aidl_audio_stream_type_t_AudioStreamType( |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1566 | audio_stream_type_t legacy) { |
| 1567 | switch (legacy) { |
| 1568 | case AUDIO_STREAM_DEFAULT: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1569 | return AudioStreamType::SYS_RESERVED_DEFAULT; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1570 | case AUDIO_STREAM_VOICE_CALL: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1571 | return AudioStreamType::VOICE_CALL; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1572 | case AUDIO_STREAM_SYSTEM: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1573 | return AudioStreamType::SYSTEM; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1574 | case AUDIO_STREAM_RING: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1575 | return AudioStreamType::RING; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1576 | case AUDIO_STREAM_MUSIC: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1577 | return AudioStreamType::MUSIC; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1578 | case AUDIO_STREAM_ALARM: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1579 | return AudioStreamType::ALARM; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1580 | case AUDIO_STREAM_NOTIFICATION: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1581 | return AudioStreamType::NOTIFICATION; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1582 | case AUDIO_STREAM_BLUETOOTH_SCO: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1583 | return AudioStreamType::BLUETOOTH_SCO; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1584 | case AUDIO_STREAM_ENFORCED_AUDIBLE: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1585 | return AudioStreamType::ENFORCED_AUDIBLE; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1586 | case AUDIO_STREAM_DTMF: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1587 | return AudioStreamType::DTMF; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1588 | case AUDIO_STREAM_TTS: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1589 | return AudioStreamType::TTS; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1590 | case AUDIO_STREAM_ACCESSIBILITY: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1591 | return AudioStreamType::ACCESSIBILITY; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1592 | case AUDIO_STREAM_ASSISTANT: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1593 | return AudioStreamType::ASSISTANT; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1594 | case AUDIO_STREAM_REROUTING: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1595 | return AudioStreamType::SYS_RESERVED_REROUTING; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1596 | case AUDIO_STREAM_PATCH: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1597 | return AudioStreamType::SYS_RESERVED_PATCH; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1598 | case AUDIO_STREAM_CALL_ASSISTANT: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 1599 | return AudioStreamType::CALL_ASSISTANT; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1600 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1601 | return unexpected(BAD_VALUE); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1602 | } |
| 1603 | |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1604 | ConversionResult<audio_source_t> aidl2legacy_AudioSource_audio_source_t( |
| 1605 | AudioSource aidl) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1606 | switch (aidl) { |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1607 | case AudioSource::SYS_RESERVED_INVALID: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 1608 | return AUDIO_SOURCE_INVALID; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1609 | case AudioSource::DEFAULT: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1610 | return AUDIO_SOURCE_DEFAULT; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1611 | case AudioSource::MIC: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1612 | return AUDIO_SOURCE_MIC; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1613 | case AudioSource::VOICE_UPLINK: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1614 | return AUDIO_SOURCE_VOICE_UPLINK; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1615 | case AudioSource::VOICE_DOWNLINK: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1616 | return AUDIO_SOURCE_VOICE_DOWNLINK; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1617 | case AudioSource::VOICE_CALL: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1618 | return AUDIO_SOURCE_VOICE_CALL; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1619 | case AudioSource::CAMCORDER: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1620 | return AUDIO_SOURCE_CAMCORDER; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1621 | case AudioSource::VOICE_RECOGNITION: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1622 | return AUDIO_SOURCE_VOICE_RECOGNITION; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1623 | case AudioSource::VOICE_COMMUNICATION: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1624 | return AUDIO_SOURCE_VOICE_COMMUNICATION; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1625 | case AudioSource::REMOTE_SUBMIX: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1626 | return AUDIO_SOURCE_REMOTE_SUBMIX; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1627 | case AudioSource::UNPROCESSED: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1628 | return AUDIO_SOURCE_UNPROCESSED; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1629 | case AudioSource::VOICE_PERFORMANCE: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1630 | return AUDIO_SOURCE_VOICE_PERFORMANCE; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1631 | case AudioSource::ECHO_REFERENCE: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1632 | return AUDIO_SOURCE_ECHO_REFERENCE; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1633 | case AudioSource::FM_TUNER: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1634 | return AUDIO_SOURCE_FM_TUNER; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1635 | case AudioSource::HOTWORD: |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1636 | return AUDIO_SOURCE_HOTWORD; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1637 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1638 | return unexpected(BAD_VALUE); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1639 | } |
| 1640 | |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1641 | ConversionResult<AudioSource> legacy2aidl_audio_source_t_AudioSource( |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1642 | audio_source_t legacy) { |
| 1643 | switch (legacy) { |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 1644 | case AUDIO_SOURCE_INVALID: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1645 | return AudioSource::SYS_RESERVED_INVALID; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1646 | case AUDIO_SOURCE_DEFAULT: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1647 | return AudioSource::DEFAULT; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1648 | case AUDIO_SOURCE_MIC: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1649 | return AudioSource::MIC; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1650 | case AUDIO_SOURCE_VOICE_UPLINK: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1651 | return AudioSource::VOICE_UPLINK; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1652 | case AUDIO_SOURCE_VOICE_DOWNLINK: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1653 | return AudioSource::VOICE_DOWNLINK; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1654 | case AUDIO_SOURCE_VOICE_CALL: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1655 | return AudioSource::VOICE_CALL; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1656 | case AUDIO_SOURCE_CAMCORDER: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1657 | return AudioSource::CAMCORDER; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1658 | case AUDIO_SOURCE_VOICE_RECOGNITION: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1659 | return AudioSource::VOICE_RECOGNITION; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1660 | case AUDIO_SOURCE_VOICE_COMMUNICATION: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1661 | return AudioSource::VOICE_COMMUNICATION; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1662 | case AUDIO_SOURCE_REMOTE_SUBMIX: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1663 | return AudioSource::REMOTE_SUBMIX; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1664 | case AUDIO_SOURCE_UNPROCESSED: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1665 | return AudioSource::UNPROCESSED; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1666 | case AUDIO_SOURCE_VOICE_PERFORMANCE: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1667 | return AudioSource::VOICE_PERFORMANCE; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1668 | case AUDIO_SOURCE_ECHO_REFERENCE: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1669 | return AudioSource::ECHO_REFERENCE; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1670 | case AUDIO_SOURCE_FM_TUNER: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1671 | return AudioSource::FM_TUNER; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1672 | case AUDIO_SOURCE_HOTWORD: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1673 | return AudioSource::HOTWORD; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1674 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1675 | return unexpected(BAD_VALUE); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1676 | } |
| 1677 | |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 1678 | ConversionResult<audio_session_t> aidl2legacy_int32_t_audio_session_t(int32_t aidl) { |
| 1679 | return convertReinterpret<audio_session_t>(aidl); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1680 | } |
| 1681 | |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 1682 | ConversionResult<int32_t> legacy2aidl_audio_session_t_int32_t(audio_session_t legacy) { |
| 1683 | return convertReinterpret<int32_t>(legacy); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1684 | } |
| 1685 | |
| 1686 | // This type is unnamed in the original definition, thus we name it here. |
| 1687 | using audio_port_config_mix_ext_usecase = decltype(audio_port_config_mix_ext::usecase); |
| 1688 | |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1689 | ConversionResult<audio_port_config_mix_ext_usecase> aidl2legacy_AudioPortMixExtUseCase( |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1690 | const AudioPortMixExtUseCase& aidl, media::AudioPortRole role) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1691 | audio_port_config_mix_ext_usecase legacy; |
| 1692 | |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1693 | switch (role) { |
| 1694 | case media::AudioPortRole::NONE: |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 1695 | // Just verify that the union is empty. |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 1696 | VALUE_OR_RETURN(UNION_GET(aidl, unspecified)); |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1697 | return legacy; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1698 | |
| 1699 | case media::AudioPortRole::SOURCE: |
| 1700 | // This is not a bug. A SOURCE role corresponds to the stream field. |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 1701 | legacy.stream = VALUE_OR_RETURN(aidl2legacy_AudioStreamType_audio_stream_type_t( |
| 1702 | VALUE_OR_RETURN(UNION_GET(aidl, stream)))); |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1703 | return legacy; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1704 | |
| 1705 | case media::AudioPortRole::SINK: |
| 1706 | // This is not a bug. A SINK role corresponds to the source field. |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1707 | legacy.source = VALUE_OR_RETURN(aidl2legacy_AudioSource_audio_source_t( |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 1708 | VALUE_OR_RETURN(UNION_GET(aidl, source)))); |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1709 | return legacy; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1710 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1711 | LOG_ALWAYS_FATAL("Shouldn't get here"); // with -Werror,-Wswitch may compile-time fail |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1712 | } |
| 1713 | |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1714 | ConversionResult<AudioPortMixExtUseCase> legacy2aidl_AudioPortMixExtUseCase( |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1715 | const audio_port_config_mix_ext_usecase& legacy, audio_port_role_t role) { |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1716 | AudioPortMixExtUseCase aidl; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1717 | |
| 1718 | switch (role) { |
| 1719 | case AUDIO_PORT_ROLE_NONE: |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 1720 | UNION_SET(aidl, unspecified, false); |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1721 | return aidl; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1722 | case AUDIO_PORT_ROLE_SOURCE: |
| 1723 | // This is not a bug. A SOURCE role corresponds to the stream field. |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 1724 | UNION_SET(aidl, stream, VALUE_OR_RETURN( |
| 1725 | legacy2aidl_audio_stream_type_t_AudioStreamType(legacy.stream))); |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1726 | return aidl; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1727 | case AUDIO_PORT_ROLE_SINK: |
| 1728 | // This is not a bug. A SINK role corresponds to the source field. |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 1729 | UNION_SET(aidl, source, |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 1730 | VALUE_OR_RETURN(legacy2aidl_audio_source_t_AudioSource(legacy.source))); |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1731 | return aidl; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1732 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1733 | LOG_ALWAYS_FATAL("Shouldn't get here"); // with -Werror,-Wswitch may compile-time fail |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1734 | } |
| 1735 | |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1736 | ConversionResult<audio_port_config_mix_ext> aidl2legacy_AudioPortMixExt( |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1737 | const AudioPortMixExt& aidl, media::AudioPortRole role, |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1738 | const media::AudioPortMixExtSys& aidlMixExt) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1739 | audio_port_config_mix_ext legacy; |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1740 | legacy.hw_module = VALUE_OR_RETURN( |
| 1741 | aidl2legacy_int32_t_audio_module_handle_t(aidlMixExt.hwModule)); |
Ytai Ben-Tsvi | 49298c5 | 2020-10-15 10:56:48 -0700 | [diff] [blame] | 1742 | legacy.handle = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_io_handle_t(aidl.handle)); |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1743 | legacy.usecase = VALUE_OR_RETURN(aidl2legacy_AudioPortMixExtUseCase(aidl.usecase, role)); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1744 | return legacy; |
| 1745 | } |
| 1746 | |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1747 | status_t legacy2aidl_AudioPortMixExt( |
| 1748 | const audio_port_config_mix_ext& legacy, audio_port_role_t role, |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1749 | AudioPortMixExt* aidl, media::AudioPortMixExtSys* aidlMixExt) { |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1750 | aidlMixExt->hwModule = VALUE_OR_RETURN_STATUS( |
| 1751 | legacy2aidl_audio_module_handle_t_int32_t(legacy.hw_module)); |
| 1752 | aidl->handle = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_io_handle_t_int32_t(legacy.handle)); |
| 1753 | aidl->usecase = VALUE_OR_RETURN_STATUS( |
| 1754 | legacy2aidl_AudioPortMixExtUseCase(legacy.usecase, role)); |
| 1755 | return OK; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1756 | } |
| 1757 | |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 1758 | ConversionResult<audio_port_config_session_ext> |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1759 | aidl2legacy_int32_t_audio_port_config_session_ext(int32_t aidl) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1760 | audio_port_config_session_ext legacy; |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1761 | legacy.session = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_session_t(aidl)); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1762 | return legacy; |
| 1763 | } |
| 1764 | |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1765 | ConversionResult<int32_t> |
| 1766 | legacy2aidl_audio_port_config_session_ext_int32_t( |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1767 | const audio_port_config_session_ext& legacy) { |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1768 | return legacy2aidl_audio_session_t_int32_t(legacy.session); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1769 | } |
| 1770 | |
| 1771 | // This type is unnamed in the original definition, thus we name it here. |
| 1772 | using audio_port_config_ext = decltype(audio_port_config::ext); |
| 1773 | |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1774 | ConversionResult<audio_port_config_ext> aidl2legacy_AudioPortExt_audio_port_config_ext( |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1775 | const AudioPortExt& aidl, media::AudioPortType type, |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1776 | media::AudioPortRole role, const media::AudioPortExtSys& aidlSys) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1777 | audio_port_config_ext legacy; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1778 | switch (type) { |
| 1779 | case media::AudioPortType::NONE: |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 1780 | // Just verify that the union is empty. |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 1781 | VALUE_OR_RETURN(UNION_GET(aidl, unspecified)); |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1782 | return legacy; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1783 | case media::AudioPortType::DEVICE: |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 1784 | legacy.device = VALUE_OR_RETURN( |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1785 | aidl2legacy_AudioPortDeviceExt_audio_port_config_device_ext( |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1786 | VALUE_OR_RETURN(UNION_GET(aidl, device)), |
| 1787 | VALUE_OR_RETURN(UNION_GET(aidlSys, device)))); |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1788 | return legacy; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1789 | case media::AudioPortType::MIX: |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 1790 | legacy.mix = VALUE_OR_RETURN( |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1791 | aidl2legacy_AudioPortMixExt( |
| 1792 | VALUE_OR_RETURN(UNION_GET(aidl, mix)), role, |
| 1793 | VALUE_OR_RETURN(UNION_GET(aidlSys, mix)))); |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1794 | return legacy; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1795 | case media::AudioPortType::SESSION: |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 1796 | legacy.session = VALUE_OR_RETURN( |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1797 | aidl2legacy_int32_t_audio_port_config_session_ext( |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 1798 | VALUE_OR_RETURN(UNION_GET(aidl, session)))); |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1799 | return legacy; |
| 1800 | |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1801 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1802 | LOG_ALWAYS_FATAL("Shouldn't get here"); // with -Werror,-Wswitch may compile-time fail |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1803 | } |
| 1804 | |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1805 | status_t legacy2aidl_AudioPortExt( |
| 1806 | const audio_port_config_ext& legacy, audio_port_type_t type, audio_port_role_t role, |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1807 | AudioPortExt* aidl, media::AudioPortExtSys* aidlSys) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1808 | switch (type) { |
| 1809 | case AUDIO_PORT_TYPE_NONE: |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1810 | UNION_SET(*aidl, unspecified, false); |
| 1811 | UNION_SET(*aidlSys, unspecified, false); |
| 1812 | return OK; |
| 1813 | case AUDIO_PORT_TYPE_DEVICE: { |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1814 | AudioPortDeviceExt device; |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1815 | media::AudioPortDeviceExtSys deviceSys; |
| 1816 | RETURN_STATUS_IF_ERROR( |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1817 | legacy2aidl_audio_port_config_device_ext_AudioPortDeviceExt( |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1818 | legacy.device, &device, &deviceSys)); |
| 1819 | UNION_SET(*aidl, device, device); |
| 1820 | UNION_SET(*aidlSys, device, deviceSys); |
| 1821 | return OK; |
| 1822 | } |
| 1823 | case AUDIO_PORT_TYPE_MIX: { |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1824 | AudioPortMixExt mix; |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1825 | media::AudioPortMixExtSys mixSys; |
| 1826 | RETURN_STATUS_IF_ERROR(legacy2aidl_AudioPortMixExt(legacy.mix, role, &mix, &mixSys)); |
| 1827 | UNION_SET(*aidl, mix, mix); |
| 1828 | UNION_SET(*aidlSys, mix, mixSys); |
| 1829 | return OK; |
| 1830 | } |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1831 | case AUDIO_PORT_TYPE_SESSION: |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1832 | UNION_SET(*aidl, session, VALUE_OR_RETURN_STATUS( |
| 1833 | legacy2aidl_audio_port_config_session_ext_int32_t(legacy.session))); |
| 1834 | UNION_SET(*aidlSys, unspecified, false); |
| 1835 | return OK; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1836 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 1837 | LOG_ALWAYS_FATAL("Shouldn't get here"); // with -Werror,-Wswitch may compile-time fail |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1838 | } |
| 1839 | |
| 1840 | ConversionResult<audio_port_config> aidl2legacy_AudioPortConfig_audio_port_config( |
| 1841 | const media::AudioPortConfig& aidl) { |
Mikhail Naganov | 9255d4d | 2021-09-23 18:39:38 +0000 | [diff] [blame] | 1842 | audio_port_config legacy{}; |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1843 | legacy.id = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_port_handle_t(aidl.hal.id)); |
| 1844 | legacy.role = VALUE_OR_RETURN(aidl2legacy_AudioPortRole_audio_port_role_t(aidl.sys.role)); |
| 1845 | legacy.type = VALUE_OR_RETURN(aidl2legacy_AudioPortType_audio_port_type_t(aidl.sys.type)); |
| 1846 | const bool isInput = |
| 1847 | VALUE_OR_RETURN(direction(aidl.sys.role, aidl.sys.type)) == Direction::INPUT; |
| 1848 | if (aidl.hal.sampleRate.has_value()) { |
Mikhail Naganov | 9255d4d | 2021-09-23 18:39:38 +0000 | [diff] [blame] | 1849 | legacy.sample_rate = VALUE_OR_RETURN( |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1850 | convertIntegral<unsigned int>(aidl.hal.sampleRate.value().value)); |
Mikhail Naganov | 9255d4d | 2021-09-23 18:39:38 +0000 | [diff] [blame] | 1851 | legacy.config_mask |= AUDIO_PORT_CONFIG_SAMPLE_RATE; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1852 | } |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1853 | if (aidl.hal.channelMask.has_value()) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1854 | legacy.channel_mask = |
Mikhail Naganov | 2d8df4e | 2021-06-03 13:59:13 -0700 | [diff] [blame] | 1855 | VALUE_OR_RETURN( |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 1856 | aidl2legacy_AudioChannelLayout_audio_channel_mask_t( |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1857 | aidl.hal.channelMask.value(), isInput)); |
Mikhail Naganov | 9255d4d | 2021-09-23 18:39:38 +0000 | [diff] [blame] | 1858 | legacy.config_mask |= AUDIO_PORT_CONFIG_CHANNEL_MASK; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1859 | } |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1860 | if (aidl.hal.format.has_value()) { |
Mikhail Naganov | b60bd1b | 2021-07-15 17:31:43 -0700 | [diff] [blame] | 1861 | legacy.format = VALUE_OR_RETURN( |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1862 | aidl2legacy_AudioFormatDescription_audio_format_t(aidl.hal.format.value())); |
Mikhail Naganov | 9255d4d | 2021-09-23 18:39:38 +0000 | [diff] [blame] | 1863 | legacy.config_mask |= AUDIO_PORT_CONFIG_FORMAT; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1864 | } |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1865 | if (aidl.hal.gain.has_value()) { |
Mikhail Naganov | 9255d4d | 2021-09-23 18:39:38 +0000 | [diff] [blame] | 1866 | legacy.gain = VALUE_OR_RETURN(aidl2legacy_AudioGainConfig_audio_gain_config( |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1867 | aidl.hal.gain.value(), isInput)); |
Mikhail Naganov | 9255d4d | 2021-09-23 18:39:38 +0000 | [diff] [blame] | 1868 | legacy.config_mask |= AUDIO_PORT_CONFIG_GAIN; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1869 | } |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1870 | if (aidl.hal.flags.has_value()) { |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1871 | legacy.flags = VALUE_OR_RETURN( |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1872 | aidl2legacy_AudioIoFlags_audio_io_flags( |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1873 | aidl.hal.flags.value(), aidl.sys.role, aidl.sys.type)); |
Mikhail Naganov | 9255d4d | 2021-09-23 18:39:38 +0000 | [diff] [blame] | 1874 | legacy.config_mask |= AUDIO_PORT_CONFIG_FLAGS; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1875 | } |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1876 | legacy.ext = VALUE_OR_RETURN( |
| 1877 | aidl2legacy_AudioPortExt_audio_port_config_ext( |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1878 | aidl.hal.ext, aidl.sys.type, aidl.sys.role, aidl.sys.ext)); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1879 | return legacy; |
| 1880 | } |
| 1881 | |
| 1882 | ConversionResult<media::AudioPortConfig> legacy2aidl_audio_port_config_AudioPortConfig( |
| 1883 | const audio_port_config& legacy) { |
| 1884 | media::AudioPortConfig aidl; |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1885 | aidl.hal.id = VALUE_OR_RETURN(legacy2aidl_audio_port_handle_t_int32_t(legacy.id)); |
| 1886 | aidl.sys.role = VALUE_OR_RETURN(legacy2aidl_audio_port_role_t_AudioPortRole(legacy.role)); |
| 1887 | aidl.sys.type = VALUE_OR_RETURN(legacy2aidl_audio_port_type_t_AudioPortType(legacy.type)); |
Mikhail Naganov | 9255d4d | 2021-09-23 18:39:38 +0000 | [diff] [blame] | 1888 | const bool isInput = VALUE_OR_RETURN( |
| 1889 | direction(legacy.role, legacy.type)) == Direction::INPUT; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1890 | if (legacy.config_mask & AUDIO_PORT_CONFIG_SAMPLE_RATE) { |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1891 | Int aidl_sampleRate; |
Mikhail Naganov | 9255d4d | 2021-09-23 18:39:38 +0000 | [diff] [blame] | 1892 | aidl_sampleRate.value = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.sample_rate)); |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1893 | aidl.hal.sampleRate = aidl_sampleRate; |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1894 | } |
| 1895 | if (legacy.config_mask & AUDIO_PORT_CONFIG_CHANNEL_MASK) { |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1896 | aidl.hal.channelMask = VALUE_OR_RETURN( |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 1897 | legacy2aidl_audio_channel_mask_t_AudioChannelLayout(legacy.channel_mask, isInput)); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1898 | } |
| 1899 | if (legacy.config_mask & AUDIO_PORT_CONFIG_FORMAT) { |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1900 | aidl.hal.format = VALUE_OR_RETURN( |
Mikhail Naganov | b60bd1b | 2021-07-15 17:31:43 -0700 | [diff] [blame] | 1901 | legacy2aidl_audio_format_t_AudioFormatDescription(legacy.format)); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1902 | } |
| 1903 | if (legacy.config_mask & AUDIO_PORT_CONFIG_GAIN) { |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1904 | aidl.hal.gain = VALUE_OR_RETURN( |
Mikhail Naganov | 9255d4d | 2021-09-23 18:39:38 +0000 | [diff] [blame] | 1905 | legacy2aidl_audio_gain_config_AudioGainConfig(legacy.gain, isInput)); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1906 | } |
| 1907 | if (legacy.config_mask & AUDIO_PORT_CONFIG_FLAGS) { |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 1908 | aidl.hal.flags = VALUE_OR_RETURN( |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1909 | legacy2aidl_audio_io_flags_AudioIoFlags(legacy.flags, legacy.role, legacy.type)); |
| 1910 | } |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 1911 | RETURN_IF_ERROR(legacy2aidl_AudioPortExt(legacy.ext, legacy.type, legacy.role, |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 1912 | &aidl.hal.ext, &aidl.sys.ext)); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1913 | return aidl; |
| 1914 | } |
| 1915 | |
| 1916 | ConversionResult<struct audio_patch> aidl2legacy_AudioPatch_audio_patch( |
| 1917 | const media::AudioPatch& aidl) { |
| 1918 | struct audio_patch legacy; |
Ytai Ben-Tsvi | 49298c5 | 2020-10-15 10:56:48 -0700 | [diff] [blame] | 1919 | legacy.id = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_patch_handle_t(aidl.id)); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1920 | legacy.num_sinks = VALUE_OR_RETURN(convertIntegral<unsigned int>(aidl.sinks.size())); |
| 1921 | if (legacy.num_sinks > AUDIO_PATCH_PORTS_MAX) { |
| 1922 | return unexpected(BAD_VALUE); |
| 1923 | } |
| 1924 | for (size_t i = 0; i < legacy.num_sinks; ++i) { |
| 1925 | legacy.sinks[i] = |
| 1926 | VALUE_OR_RETURN(aidl2legacy_AudioPortConfig_audio_port_config(aidl.sinks[i])); |
| 1927 | } |
| 1928 | legacy.num_sources = VALUE_OR_RETURN(convertIntegral<unsigned int>(aidl.sources.size())); |
| 1929 | if (legacy.num_sources > AUDIO_PATCH_PORTS_MAX) { |
| 1930 | return unexpected(BAD_VALUE); |
| 1931 | } |
| 1932 | for (size_t i = 0; i < legacy.num_sources; ++i) { |
| 1933 | legacy.sources[i] = |
| 1934 | VALUE_OR_RETURN(aidl2legacy_AudioPortConfig_audio_port_config(aidl.sources[i])); |
| 1935 | } |
| 1936 | return legacy; |
| 1937 | } |
| 1938 | |
| 1939 | ConversionResult<media::AudioPatch> legacy2aidl_audio_patch_AudioPatch( |
| 1940 | const struct audio_patch& legacy) { |
| 1941 | media::AudioPatch aidl; |
Ytai Ben-Tsvi | 49298c5 | 2020-10-15 10:56:48 -0700 | [diff] [blame] | 1942 | aidl.id = VALUE_OR_RETURN(legacy2aidl_audio_patch_handle_t_int32_t(legacy.id)); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1943 | |
| 1944 | if (legacy.num_sinks > AUDIO_PATCH_PORTS_MAX) { |
| 1945 | return unexpected(BAD_VALUE); |
| 1946 | } |
| 1947 | for (unsigned int i = 0; i < legacy.num_sinks; ++i) { |
| 1948 | aidl.sinks.push_back( |
| 1949 | VALUE_OR_RETURN(legacy2aidl_audio_port_config_AudioPortConfig(legacy.sinks[i]))); |
| 1950 | } |
| 1951 | if (legacy.num_sources > AUDIO_PATCH_PORTS_MAX) { |
| 1952 | return unexpected(BAD_VALUE); |
| 1953 | } |
| 1954 | for (unsigned int i = 0; i < legacy.num_sources; ++i) { |
| 1955 | aidl.sources.push_back( |
| 1956 | VALUE_OR_RETURN(legacy2aidl_audio_port_config_AudioPortConfig(legacy.sources[i]))); |
| 1957 | } |
| 1958 | return aidl; |
| 1959 | } |
| 1960 | |
| 1961 | ConversionResult<sp<AudioIoDescriptor>> aidl2legacy_AudioIoDescriptor_AudioIoDescriptor( |
| 1962 | const media::AudioIoDescriptor& aidl) { |
Mikhail Naganov | 88536df | 2021-07-26 17:30:29 -0700 | [diff] [blame] | 1963 | const audio_io_handle_t io_handle = VALUE_OR_RETURN( |
| 1964 | aidl2legacy_int32_t_audio_io_handle_t(aidl.ioHandle)); |
| 1965 | const struct audio_patch patch = VALUE_OR_RETURN( |
| 1966 | aidl2legacy_AudioPatch_audio_patch(aidl.patch)); |
| 1967 | const bool isInput = aidl.isInput; |
| 1968 | const uint32_t sampling_rate = VALUE_OR_RETURN(convertIntegral<uint32_t>(aidl.samplingRate)); |
| 1969 | const audio_format_t format = VALUE_OR_RETURN( |
Mikhail Naganov | b60bd1b | 2021-07-15 17:31:43 -0700 | [diff] [blame] | 1970 | aidl2legacy_AudioFormatDescription_audio_format_t(aidl.format)); |
Mikhail Naganov | 88536df | 2021-07-26 17:30:29 -0700 | [diff] [blame] | 1971 | const audio_channel_mask_t channel_mask = VALUE_OR_RETURN( |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 1972 | aidl2legacy_AudioChannelLayout_audio_channel_mask_t(aidl.channelMask, isInput)); |
Mikhail Naganov | 88536df | 2021-07-26 17:30:29 -0700 | [diff] [blame] | 1973 | const size_t frame_count = VALUE_OR_RETURN(convertIntegral<size_t>(aidl.frameCount)); |
| 1974 | const size_t frame_count_hal = VALUE_OR_RETURN(convertIntegral<size_t>(aidl.frameCountHAL)); |
| 1975 | const uint32_t latency = VALUE_OR_RETURN(convertIntegral<uint32_t>(aidl.latency)); |
| 1976 | const audio_port_handle_t port_id = VALUE_OR_RETURN( |
| 1977 | aidl2legacy_int32_t_audio_port_handle_t(aidl.portId)); |
| 1978 | return sp<AudioIoDescriptor>::make(io_handle, patch, isInput, sampling_rate, format, |
| 1979 | channel_mask, frame_count, frame_count_hal, latency, port_id); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1980 | } |
| 1981 | |
| 1982 | ConversionResult<media::AudioIoDescriptor> legacy2aidl_AudioIoDescriptor_AudioIoDescriptor( |
| 1983 | const sp<AudioIoDescriptor>& legacy) { |
| 1984 | media::AudioIoDescriptor aidl; |
Mikhail Naganov | 88536df | 2021-07-26 17:30:29 -0700 | [diff] [blame] | 1985 | aidl.ioHandle = VALUE_OR_RETURN(legacy2aidl_audio_io_handle_t_int32_t(legacy->getIoHandle())); |
| 1986 | aidl.patch = VALUE_OR_RETURN(legacy2aidl_audio_patch_AudioPatch(legacy->getPatch())); |
| 1987 | aidl.isInput = legacy->getIsInput(); |
| 1988 | aidl.samplingRate = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy->getSamplingRate())); |
Mikhail Naganov | b60bd1b | 2021-07-15 17:31:43 -0700 | [diff] [blame] | 1989 | aidl.format = VALUE_OR_RETURN( |
Mikhail Naganov | 88536df | 2021-07-26 17:30:29 -0700 | [diff] [blame] | 1990 | legacy2aidl_audio_format_t_AudioFormatDescription(legacy->getFormat())); |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 1991 | aidl.channelMask = VALUE_OR_RETURN(legacy2aidl_audio_channel_mask_t_AudioChannelLayout( |
| 1992 | legacy->getChannelMask(), legacy->getIsInput())); |
Mikhail Naganov | 88536df | 2021-07-26 17:30:29 -0700 | [diff] [blame] | 1993 | aidl.frameCount = VALUE_OR_RETURN(convertIntegral<int64_t>(legacy->getFrameCount())); |
| 1994 | aidl.frameCountHAL = VALUE_OR_RETURN(convertIntegral<int64_t>(legacy->getFrameCountHAL())); |
| 1995 | aidl.latency = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy->getLatency())); |
| 1996 | aidl.portId = VALUE_OR_RETURN(legacy2aidl_audio_port_handle_t_int32_t(legacy->getPortId())); |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 1997 | return aidl; |
| 1998 | } |
| 1999 | |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 2000 | ConversionResult<AudioClient> aidl2legacy_AudioClient_AudioClient( |
| 2001 | const media::AudioClient& aidl) { |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2002 | AudioClient legacy; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2003 | legacy.clientTid = VALUE_OR_RETURN(aidl2legacy_int32_t_pid_t(aidl.clientTid)); |
Svet Ganov | 3e5f14f | 2021-05-13 22:51:08 +0000 | [diff] [blame] | 2004 | legacy.attributionSource = aidl.attributionSource; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2005 | return legacy; |
| 2006 | } |
| 2007 | |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 2008 | ConversionResult<media::AudioClient> legacy2aidl_AudioClient_AudioClient( |
| 2009 | const AudioClient& legacy) { |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2010 | media::AudioClient aidl; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2011 | aidl.clientTid = VALUE_OR_RETURN(legacy2aidl_pid_t_int32_t(legacy.clientTid)); |
Svet Ganov | 3e5f14f | 2021-05-13 22:51:08 +0000 | [diff] [blame] | 2012 | aidl.attributionSource = legacy.attributionSource; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2013 | return aidl; |
| 2014 | } |
| 2015 | |
| 2016 | ConversionResult<audio_content_type_t> |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2017 | aidl2legacy_AudioContentType_audio_content_type_t(AudioContentType aidl) { |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2018 | switch (aidl) { |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2019 | case AudioContentType::UNKNOWN: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2020 | return AUDIO_CONTENT_TYPE_UNKNOWN; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2021 | case AudioContentType::SPEECH: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2022 | return AUDIO_CONTENT_TYPE_SPEECH; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2023 | case AudioContentType::MUSIC: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2024 | return AUDIO_CONTENT_TYPE_MUSIC; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2025 | case AudioContentType::MOVIE: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2026 | return AUDIO_CONTENT_TYPE_MOVIE; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2027 | case AudioContentType::SONIFICATION: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2028 | return AUDIO_CONTENT_TYPE_SONIFICATION; |
| 2029 | } |
| 2030 | return unexpected(BAD_VALUE); |
| 2031 | } |
| 2032 | |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2033 | ConversionResult<AudioContentType> |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2034 | legacy2aidl_audio_content_type_t_AudioContentType(audio_content_type_t legacy) { |
| 2035 | switch (legacy) { |
| 2036 | case AUDIO_CONTENT_TYPE_UNKNOWN: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2037 | return AudioContentType::UNKNOWN; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2038 | case AUDIO_CONTENT_TYPE_SPEECH: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2039 | return AudioContentType::SPEECH; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2040 | case AUDIO_CONTENT_TYPE_MUSIC: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2041 | return AudioContentType::MUSIC; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2042 | case AUDIO_CONTENT_TYPE_MOVIE: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2043 | return AudioContentType::MOVIE; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2044 | case AUDIO_CONTENT_TYPE_SONIFICATION: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2045 | return AudioContentType::SONIFICATION; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2046 | } |
| 2047 | return unexpected(BAD_VALUE); |
| 2048 | } |
| 2049 | |
| 2050 | ConversionResult<audio_usage_t> |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2051 | aidl2legacy_AudioUsage_audio_usage_t(AudioUsage aidl) { |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2052 | switch (aidl) { |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2053 | case AudioUsage::INVALID: |
| 2054 | break; // return error |
| 2055 | case AudioUsage::UNKNOWN: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2056 | return AUDIO_USAGE_UNKNOWN; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2057 | case AudioUsage::MEDIA: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2058 | return AUDIO_USAGE_MEDIA; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2059 | case AudioUsage::VOICE_COMMUNICATION: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2060 | return AUDIO_USAGE_VOICE_COMMUNICATION; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2061 | case AudioUsage::VOICE_COMMUNICATION_SIGNALLING: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2062 | return AUDIO_USAGE_VOICE_COMMUNICATION_SIGNALLING; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2063 | case AudioUsage::ALARM: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2064 | return AUDIO_USAGE_ALARM; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2065 | case AudioUsage::NOTIFICATION: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2066 | return AUDIO_USAGE_NOTIFICATION; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2067 | case AudioUsage::NOTIFICATION_TELEPHONY_RINGTONE: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2068 | return AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2069 | case AudioUsage::SYS_RESERVED_NOTIFICATION_COMMUNICATION_REQUEST: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2070 | return AUDIO_USAGE_NOTIFICATION_COMMUNICATION_REQUEST; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2071 | case AudioUsage::SYS_RESERVED_NOTIFICATION_COMMUNICATION_INSTANT: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2072 | return AUDIO_USAGE_NOTIFICATION_COMMUNICATION_INSTANT; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2073 | case AudioUsage::SYS_RESERVED_NOTIFICATION_COMMUNICATION_DELAYED: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2074 | return AUDIO_USAGE_NOTIFICATION_COMMUNICATION_DELAYED; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2075 | case AudioUsage::NOTIFICATION_EVENT: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2076 | return AUDIO_USAGE_NOTIFICATION_EVENT; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2077 | case AudioUsage::ASSISTANCE_ACCESSIBILITY: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2078 | return AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2079 | case AudioUsage::ASSISTANCE_NAVIGATION_GUIDANCE: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2080 | return AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2081 | case AudioUsage::ASSISTANCE_SONIFICATION: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2082 | return AUDIO_USAGE_ASSISTANCE_SONIFICATION; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2083 | case AudioUsage::GAME: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2084 | return AUDIO_USAGE_GAME; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2085 | case AudioUsage::VIRTUAL_SOURCE: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2086 | return AUDIO_USAGE_VIRTUAL_SOURCE; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2087 | case AudioUsage::ASSISTANT: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2088 | return AUDIO_USAGE_ASSISTANT; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2089 | case AudioUsage::CALL_ASSISTANT: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2090 | return AUDIO_USAGE_CALL_ASSISTANT; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2091 | case AudioUsage::EMERGENCY: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2092 | return AUDIO_USAGE_EMERGENCY; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2093 | case AudioUsage::SAFETY: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2094 | return AUDIO_USAGE_SAFETY; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2095 | case AudioUsage::VEHICLE_STATUS: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2096 | return AUDIO_USAGE_VEHICLE_STATUS; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2097 | case AudioUsage::ANNOUNCEMENT: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2098 | return AUDIO_USAGE_ANNOUNCEMENT; |
| 2099 | } |
| 2100 | return unexpected(BAD_VALUE); |
| 2101 | } |
| 2102 | |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2103 | ConversionResult<AudioUsage> |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2104 | legacy2aidl_audio_usage_t_AudioUsage(audio_usage_t legacy) { |
| 2105 | switch (legacy) { |
| 2106 | case AUDIO_USAGE_UNKNOWN: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2107 | return AudioUsage::UNKNOWN; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2108 | case AUDIO_USAGE_MEDIA: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2109 | return AudioUsage::MEDIA; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2110 | case AUDIO_USAGE_VOICE_COMMUNICATION: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2111 | return AudioUsage::VOICE_COMMUNICATION; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2112 | case AUDIO_USAGE_VOICE_COMMUNICATION_SIGNALLING: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2113 | return AudioUsage::VOICE_COMMUNICATION_SIGNALLING; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2114 | case AUDIO_USAGE_ALARM: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2115 | return AudioUsage::ALARM; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2116 | case AUDIO_USAGE_NOTIFICATION: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2117 | return AudioUsage::NOTIFICATION; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2118 | case AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2119 | return AudioUsage::NOTIFICATION_TELEPHONY_RINGTONE; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2120 | case AUDIO_USAGE_NOTIFICATION_COMMUNICATION_REQUEST: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2121 | return AudioUsage::SYS_RESERVED_NOTIFICATION_COMMUNICATION_REQUEST; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2122 | case AUDIO_USAGE_NOTIFICATION_COMMUNICATION_INSTANT: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2123 | return AudioUsage::SYS_RESERVED_NOTIFICATION_COMMUNICATION_INSTANT; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2124 | case AUDIO_USAGE_NOTIFICATION_COMMUNICATION_DELAYED: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2125 | return AudioUsage::SYS_RESERVED_NOTIFICATION_COMMUNICATION_DELAYED; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2126 | case AUDIO_USAGE_NOTIFICATION_EVENT: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2127 | return AudioUsage::NOTIFICATION_EVENT; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2128 | case AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2129 | return AudioUsage::ASSISTANCE_ACCESSIBILITY; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2130 | case AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2131 | return AudioUsage::ASSISTANCE_NAVIGATION_GUIDANCE; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2132 | case AUDIO_USAGE_ASSISTANCE_SONIFICATION: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2133 | return AudioUsage::ASSISTANCE_SONIFICATION; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2134 | case AUDIO_USAGE_GAME: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2135 | return AudioUsage::GAME; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2136 | case AUDIO_USAGE_VIRTUAL_SOURCE: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2137 | return AudioUsage::VIRTUAL_SOURCE; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2138 | case AUDIO_USAGE_ASSISTANT: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2139 | return AudioUsage::ASSISTANT; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2140 | case AUDIO_USAGE_CALL_ASSISTANT: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2141 | return AudioUsage::CALL_ASSISTANT; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2142 | case AUDIO_USAGE_EMERGENCY: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2143 | return AudioUsage::EMERGENCY; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2144 | case AUDIO_USAGE_SAFETY: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2145 | return AudioUsage::SAFETY; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2146 | case AUDIO_USAGE_VEHICLE_STATUS: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2147 | return AudioUsage::VEHICLE_STATUS; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2148 | case AUDIO_USAGE_ANNOUNCEMENT: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2149 | return AudioUsage::ANNOUNCEMENT; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2150 | } |
| 2151 | return unexpected(BAD_VALUE); |
| 2152 | } |
| 2153 | |
| 2154 | ConversionResult<audio_flags_mask_t> |
| 2155 | aidl2legacy_AudioFlag_audio_flags_mask_t(media::AudioFlag aidl) { |
| 2156 | switch (aidl) { |
| 2157 | case media::AudioFlag::AUDIBILITY_ENFORCED: |
| 2158 | return AUDIO_FLAG_AUDIBILITY_ENFORCED; |
| 2159 | case media::AudioFlag::SECURE: |
| 2160 | return AUDIO_FLAG_SECURE; |
| 2161 | case media::AudioFlag::SCO: |
| 2162 | return AUDIO_FLAG_SCO; |
| 2163 | case media::AudioFlag::BEACON: |
| 2164 | return AUDIO_FLAG_BEACON; |
| 2165 | case media::AudioFlag::HW_AV_SYNC: |
| 2166 | return AUDIO_FLAG_HW_AV_SYNC; |
| 2167 | case media::AudioFlag::HW_HOTWORD: |
| 2168 | return AUDIO_FLAG_HW_HOTWORD; |
| 2169 | case media::AudioFlag::BYPASS_INTERRUPTION_POLICY: |
| 2170 | return AUDIO_FLAG_BYPASS_INTERRUPTION_POLICY; |
| 2171 | case media::AudioFlag::BYPASS_MUTE: |
| 2172 | return AUDIO_FLAG_BYPASS_MUTE; |
| 2173 | case media::AudioFlag::LOW_LATENCY: |
| 2174 | return AUDIO_FLAG_LOW_LATENCY; |
| 2175 | case media::AudioFlag::DEEP_BUFFER: |
| 2176 | return AUDIO_FLAG_DEEP_BUFFER; |
| 2177 | case media::AudioFlag::NO_MEDIA_PROJECTION: |
| 2178 | return AUDIO_FLAG_NO_MEDIA_PROJECTION; |
| 2179 | case media::AudioFlag::MUTE_HAPTIC: |
| 2180 | return AUDIO_FLAG_MUTE_HAPTIC; |
| 2181 | case media::AudioFlag::NO_SYSTEM_CAPTURE: |
| 2182 | return AUDIO_FLAG_NO_SYSTEM_CAPTURE; |
| 2183 | case media::AudioFlag::CAPTURE_PRIVATE: |
| 2184 | return AUDIO_FLAG_CAPTURE_PRIVATE; |
Eric Laurent | ac08f91 | 2021-08-25 15:01:05 +0200 | [diff] [blame] | 2185 | case media::AudioFlag::CONTENT_SPATIALIZED: |
| 2186 | return AUDIO_FLAG_CONTENT_SPATIALIZED; |
| 2187 | case media::AudioFlag::NEVER_SPATIALIZE: |
| 2188 | return AUDIO_FLAG_NEVER_SPATIALIZE; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2189 | } |
| 2190 | return unexpected(BAD_VALUE); |
| 2191 | } |
| 2192 | |
| 2193 | ConversionResult<media::AudioFlag> |
| 2194 | legacy2aidl_audio_flags_mask_t_AudioFlag(audio_flags_mask_t legacy) { |
| 2195 | switch (legacy) { |
| 2196 | case AUDIO_FLAG_NONE: |
| 2197 | return unexpected(BAD_VALUE); |
| 2198 | case AUDIO_FLAG_AUDIBILITY_ENFORCED: |
| 2199 | return media::AudioFlag::AUDIBILITY_ENFORCED; |
| 2200 | case AUDIO_FLAG_SECURE: |
| 2201 | return media::AudioFlag::SECURE; |
| 2202 | case AUDIO_FLAG_SCO: |
| 2203 | return media::AudioFlag::SCO; |
| 2204 | case AUDIO_FLAG_BEACON: |
| 2205 | return media::AudioFlag::BEACON; |
| 2206 | case AUDIO_FLAG_HW_AV_SYNC: |
| 2207 | return media::AudioFlag::HW_AV_SYNC; |
| 2208 | case AUDIO_FLAG_HW_HOTWORD: |
| 2209 | return media::AudioFlag::HW_HOTWORD; |
| 2210 | case AUDIO_FLAG_BYPASS_INTERRUPTION_POLICY: |
| 2211 | return media::AudioFlag::BYPASS_INTERRUPTION_POLICY; |
| 2212 | case AUDIO_FLAG_BYPASS_MUTE: |
| 2213 | return media::AudioFlag::BYPASS_MUTE; |
| 2214 | case AUDIO_FLAG_LOW_LATENCY: |
| 2215 | return media::AudioFlag::LOW_LATENCY; |
| 2216 | case AUDIO_FLAG_DEEP_BUFFER: |
| 2217 | return media::AudioFlag::DEEP_BUFFER; |
| 2218 | case AUDIO_FLAG_NO_MEDIA_PROJECTION: |
| 2219 | return media::AudioFlag::NO_MEDIA_PROJECTION; |
| 2220 | case AUDIO_FLAG_MUTE_HAPTIC: |
| 2221 | return media::AudioFlag::MUTE_HAPTIC; |
| 2222 | case AUDIO_FLAG_NO_SYSTEM_CAPTURE: |
| 2223 | return media::AudioFlag::NO_SYSTEM_CAPTURE; |
| 2224 | case AUDIO_FLAG_CAPTURE_PRIVATE: |
| 2225 | return media::AudioFlag::CAPTURE_PRIVATE; |
Eric Laurent | ac08f91 | 2021-08-25 15:01:05 +0200 | [diff] [blame] | 2226 | case AUDIO_FLAG_CONTENT_SPATIALIZED: |
| 2227 | return media::AudioFlag::CONTENT_SPATIALIZED; |
| 2228 | case AUDIO_FLAG_NEVER_SPATIALIZE: |
| 2229 | return media::AudioFlag::NEVER_SPATIALIZE; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2230 | } |
| 2231 | return unexpected(BAD_VALUE); |
| 2232 | } |
| 2233 | |
| 2234 | ConversionResult<audio_flags_mask_t> |
| 2235 | aidl2legacy_int32_t_audio_flags_mask_t_mask(int32_t aidl) { |
| 2236 | return convertBitmask<audio_flags_mask_t, int32_t, audio_flags_mask_t, media::AudioFlag>( |
Ytai Ben-Tsvi | 08c7d9e | 2020-12-16 14:32:56 -0800 | [diff] [blame] | 2237 | aidl, aidl2legacy_AudioFlag_audio_flags_mask_t, indexToEnum_index<media::AudioFlag>, |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2238 | enumToMask_bitmask<audio_flags_mask_t, audio_flags_mask_t>); |
| 2239 | } |
| 2240 | |
| 2241 | ConversionResult<int32_t> |
| 2242 | legacy2aidl_audio_flags_mask_t_int32_t_mask(audio_flags_mask_t legacy) { |
| 2243 | return convertBitmask<int32_t, audio_flags_mask_t, media::AudioFlag, audio_flags_mask_t>( |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 2244 | legacy, legacy2aidl_audio_flags_mask_t_AudioFlag, |
Ytai Ben-Tsvi | 08c7d9e | 2020-12-16 14:32:56 -0800 | [diff] [blame] | 2245 | indexToEnum_bitmask<audio_flags_mask_t>, |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2246 | enumToMask_index<int32_t, media::AudioFlag>); |
| 2247 | } |
| 2248 | |
| 2249 | ConversionResult<audio_attributes_t> |
| 2250 | aidl2legacy_AudioAttributesInternal_audio_attributes_t(const media::AudioAttributesInternal& aidl) { |
| 2251 | audio_attributes_t legacy; |
| 2252 | legacy.content_type = VALUE_OR_RETURN( |
| 2253 | aidl2legacy_AudioContentType_audio_content_type_t(aidl.contentType)); |
| 2254 | legacy.usage = VALUE_OR_RETURN(aidl2legacy_AudioUsage_audio_usage_t(aidl.usage)); |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2255 | legacy.source = VALUE_OR_RETURN(aidl2legacy_AudioSource_audio_source_t(aidl.source)); |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2256 | legacy.flags = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_flags_mask_t_mask(aidl.flags)); |
| 2257 | RETURN_IF_ERROR(aidl2legacy_string(aidl.tags, legacy.tags, sizeof(legacy.tags))); |
| 2258 | return legacy; |
| 2259 | } |
| 2260 | |
| 2261 | ConversionResult<media::AudioAttributesInternal> |
| 2262 | legacy2aidl_audio_attributes_t_AudioAttributesInternal(const audio_attributes_t& legacy) { |
| 2263 | media::AudioAttributesInternal aidl; |
| 2264 | aidl.contentType = VALUE_OR_RETURN( |
| 2265 | legacy2aidl_audio_content_type_t_AudioContentType(legacy.content_type)); |
| 2266 | aidl.usage = VALUE_OR_RETURN(legacy2aidl_audio_usage_t_AudioUsage(legacy.usage)); |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2267 | aidl.source = VALUE_OR_RETURN(legacy2aidl_audio_source_t_AudioSource(legacy.source)); |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2268 | aidl.flags = VALUE_OR_RETURN(legacy2aidl_audio_flags_mask_t_int32_t_mask(legacy.flags)); |
| 2269 | aidl.tags = VALUE_OR_RETURN(legacy2aidl_string(legacy.tags, sizeof(legacy.tags))); |
| 2270 | return aidl; |
| 2271 | } |
| 2272 | |
| 2273 | ConversionResult<audio_encapsulation_mode_t> |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2274 | aidl2legacy_AudioEncapsulationMode_audio_encapsulation_mode_t(AudioEncapsulationMode aidl) { |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2275 | switch (aidl) { |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2276 | case AudioEncapsulationMode::INVALID: |
| 2277 | break; // return error |
| 2278 | case AudioEncapsulationMode::NONE: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2279 | return AUDIO_ENCAPSULATION_MODE_NONE; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2280 | case AudioEncapsulationMode::ELEMENTARY_STREAM: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2281 | return AUDIO_ENCAPSULATION_MODE_ELEMENTARY_STREAM; |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2282 | case AudioEncapsulationMode::HANDLE: |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2283 | return AUDIO_ENCAPSULATION_MODE_HANDLE; |
| 2284 | } |
| 2285 | return unexpected(BAD_VALUE); |
| 2286 | } |
| 2287 | |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2288 | ConversionResult<AudioEncapsulationMode> |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2289 | legacy2aidl_audio_encapsulation_mode_t_AudioEncapsulationMode(audio_encapsulation_mode_t legacy) { |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2290 | switch (legacy) { |
| 2291 | case AUDIO_ENCAPSULATION_MODE_NONE: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2292 | return AudioEncapsulationMode::NONE; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2293 | case AUDIO_ENCAPSULATION_MODE_ELEMENTARY_STREAM: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2294 | return AudioEncapsulationMode::ELEMENTARY_STREAM; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2295 | case AUDIO_ENCAPSULATION_MODE_HANDLE: |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2296 | return AudioEncapsulationMode::HANDLE; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2297 | } |
| 2298 | return unexpected(BAD_VALUE); |
| 2299 | } |
| 2300 | |
| 2301 | ConversionResult<audio_offload_info_t> |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2302 | aidl2legacy_AudioOffloadInfo_audio_offload_info_t(const AudioOffloadInfo& aidl) { |
| 2303 | audio_offload_info_t legacy = AUDIO_INFO_INITIALIZER; |
| 2304 | audio_config_base_t base = VALUE_OR_RETURN( |
| 2305 | aidl2legacy_AudioConfigBase_audio_config_base_t(aidl.base, false /*isInput*/)); |
| 2306 | legacy.sample_rate = base.sample_rate; |
| 2307 | legacy.channel_mask = base.channel_mask; |
| 2308 | legacy.format = base.format; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2309 | legacy.stream_type = VALUE_OR_RETURN( |
| 2310 | aidl2legacy_AudioStreamType_audio_stream_type_t(aidl.streamType)); |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2311 | legacy.bit_rate = VALUE_OR_RETURN(convertIntegral<uint32_t>(aidl.bitRatePerSecond)); |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2312 | legacy.duration_us = VALUE_OR_RETURN(convertIntegral<int64_t>(aidl.durationUs)); |
| 2313 | legacy.has_video = aidl.hasVideo; |
| 2314 | legacy.is_streaming = aidl.isStreaming; |
| 2315 | legacy.bit_width = VALUE_OR_RETURN(convertIntegral<uint32_t>(aidl.bitWidth)); |
| 2316 | legacy.offload_buffer_size = VALUE_OR_RETURN(convertIntegral<uint32_t>(aidl.offloadBufferSize)); |
| 2317 | legacy.usage = VALUE_OR_RETURN(aidl2legacy_AudioUsage_audio_usage_t(aidl.usage)); |
| 2318 | legacy.encapsulation_mode = VALUE_OR_RETURN( |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2319 | aidl2legacy_AudioEncapsulationMode_audio_encapsulation_mode_t(aidl.encapsulationMode)); |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2320 | legacy.content_id = VALUE_OR_RETURN(convertReinterpret<int32_t>(aidl.contentId)); |
| 2321 | legacy.sync_id = VALUE_OR_RETURN(convertReinterpret<int32_t>(aidl.syncId)); |
| 2322 | return legacy; |
| 2323 | } |
| 2324 | |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2325 | ConversionResult<AudioOffloadInfo> |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2326 | legacy2aidl_audio_offload_info_t_AudioOffloadInfo(const audio_offload_info_t& legacy) { |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2327 | AudioOffloadInfo aidl; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2328 | // Version 0.1 fields. |
| 2329 | if (legacy.size < offsetof(audio_offload_info_t, usage) + sizeof(audio_offload_info_t::usage)) { |
| 2330 | return unexpected(BAD_VALUE); |
| 2331 | } |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2332 | const audio_config_base_t base = { .sample_rate = legacy.sample_rate, |
| 2333 | .channel_mask = legacy.channel_mask, .format = legacy.format }; |
| 2334 | aidl.base = VALUE_OR_RETURN(legacy2aidl_audio_config_base_t_AudioConfigBase( |
| 2335 | base, false /*isInput*/)); |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2336 | aidl.streamType = VALUE_OR_RETURN( |
| 2337 | legacy2aidl_audio_stream_type_t_AudioStreamType(legacy.stream_type)); |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2338 | aidl.bitRatePerSecond = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.bit_rate)); |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2339 | aidl.durationUs = VALUE_OR_RETURN(convertIntegral<int64_t>(legacy.duration_us)); |
| 2340 | aidl.hasVideo = legacy.has_video; |
| 2341 | aidl.isStreaming = legacy.is_streaming; |
| 2342 | aidl.bitWidth = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.bit_width)); |
| 2343 | aidl.offloadBufferSize = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.offload_buffer_size)); |
| 2344 | aidl.usage = VALUE_OR_RETURN(legacy2aidl_audio_usage_t_AudioUsage(legacy.usage)); |
| 2345 | |
| 2346 | // Version 0.2 fields. |
| 2347 | if (legacy.version >= AUDIO_OFFLOAD_INFO_VERSION_0_2) { |
| 2348 | if (legacy.size < |
| 2349 | offsetof(audio_offload_info_t, sync_id) + sizeof(audio_offload_info_t::sync_id)) { |
| 2350 | return unexpected(BAD_VALUE); |
| 2351 | } |
| 2352 | aidl.encapsulationMode = VALUE_OR_RETURN( |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2353 | legacy2aidl_audio_encapsulation_mode_t_AudioEncapsulationMode( |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2354 | legacy.encapsulation_mode)); |
| 2355 | aidl.contentId = VALUE_OR_RETURN(convertReinterpret<int32_t>(legacy.content_id)); |
| 2356 | aidl.syncId = VALUE_OR_RETURN(convertReinterpret<int32_t>(legacy.sync_id)); |
| 2357 | } |
| 2358 | return aidl; |
| 2359 | } |
| 2360 | |
| 2361 | ConversionResult<audio_config_t> |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2362 | aidl2legacy_AudioConfig_audio_config_t(const AudioConfig& aidl, bool isInput) { |
| 2363 | const audio_config_base_t legacyBase = VALUE_OR_RETURN( |
| 2364 | aidl2legacy_AudioConfigBase_audio_config_base_t(aidl.base, isInput)); |
| 2365 | audio_config_t legacy = AUDIO_CONFIG_INITIALIZER; |
| 2366 | legacy.sample_rate = legacyBase.sample_rate; |
| 2367 | legacy.channel_mask = legacyBase.channel_mask; |
| 2368 | legacy.format = legacyBase.format; |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 2369 | legacy.offload_info = VALUE_OR_RETURN( |
| 2370 | aidl2legacy_AudioOffloadInfo_audio_offload_info_t(aidl.offloadInfo)); |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2371 | legacy.frame_count = VALUE_OR_RETURN(convertIntegral<uint32_t>(aidl.frameCount)); |
| 2372 | return legacy; |
| 2373 | } |
| 2374 | |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2375 | ConversionResult<AudioConfig> |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 2376 | legacy2aidl_audio_config_t_AudioConfig(const audio_config_t& legacy, bool isInput) { |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2377 | const audio_config_base_t base = { .sample_rate = legacy.sample_rate, |
| 2378 | .channel_mask = legacy.channel_mask, .format = legacy.format }; |
| 2379 | AudioConfig aidl; |
| 2380 | aidl.base = VALUE_OR_RETURN(legacy2aidl_audio_config_base_t_AudioConfigBase(base, isInput)); |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 2381 | aidl.offloadInfo = VALUE_OR_RETURN( |
| 2382 | legacy2aidl_audio_offload_info_t_AudioOffloadInfo(legacy.offload_info)); |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2383 | aidl.frameCount = VALUE_OR_RETURN(convertIntegral<int64_t>(legacy.frame_count)); |
| 2384 | return aidl; |
| 2385 | } |
| 2386 | |
| 2387 | ConversionResult<audio_config_base_t> |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2388 | aidl2legacy_AudioConfigBase_audio_config_base_t(const AudioConfigBase& aidl, bool isInput) { |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2389 | audio_config_base_t legacy; |
| 2390 | legacy.sample_rate = VALUE_OR_RETURN(convertIntegral<uint32_t>(aidl.sampleRate)); |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 2391 | legacy.channel_mask = VALUE_OR_RETURN( |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 2392 | aidl2legacy_AudioChannelLayout_audio_channel_mask_t(aidl.channelMask, isInput)); |
Mikhail Naganov | b60bd1b | 2021-07-15 17:31:43 -0700 | [diff] [blame] | 2393 | legacy.format = VALUE_OR_RETURN(aidl2legacy_AudioFormatDescription_audio_format_t(aidl.format)); |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2394 | return legacy; |
| 2395 | } |
| 2396 | |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2397 | ConversionResult<AudioConfigBase> |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 2398 | legacy2aidl_audio_config_base_t_AudioConfigBase(const audio_config_base_t& legacy, bool isInput) { |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2399 | AudioConfigBase aidl; |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2400 | aidl.sampleRate = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.sample_rate)); |
Ytai Ben-Tsvi | a381520 | 2020-10-28 14:58:08 -0700 | [diff] [blame] | 2401 | aidl.channelMask = VALUE_OR_RETURN( |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 2402 | legacy2aidl_audio_channel_mask_t_AudioChannelLayout(legacy.channel_mask, isInput)); |
Mikhail Naganov | b60bd1b | 2021-07-15 17:31:43 -0700 | [diff] [blame] | 2403 | aidl.format = VALUE_OR_RETURN(legacy2aidl_audio_format_t_AudioFormatDescription(legacy.format)); |
Ytai Ben-Tsvi | 4dfeb62 | 2020-11-02 12:47:30 -0800 | [diff] [blame] | 2404 | return aidl; |
| 2405 | } |
| 2406 | |
| 2407 | ConversionResult<sp<IMemory>> |
| 2408 | aidl2legacy_SharedFileRegion_IMemory(const media::SharedFileRegion& aidl) { |
| 2409 | sp<IMemory> legacy; |
| 2410 | if (!convertSharedFileRegionToIMemory(aidl, &legacy)) { |
| 2411 | return unexpected(BAD_VALUE); |
| 2412 | } |
| 2413 | return legacy; |
| 2414 | } |
| 2415 | |
| 2416 | ConversionResult<media::SharedFileRegion> |
| 2417 | legacy2aidl_IMemory_SharedFileRegion(const sp<IMemory>& legacy) { |
| 2418 | media::SharedFileRegion aidl; |
| 2419 | if (!convertIMemoryToSharedFileRegion(legacy, &aidl)) { |
| 2420 | return unexpected(BAD_VALUE); |
| 2421 | } |
| 2422 | return aidl; |
| 2423 | } |
| 2424 | |
| 2425 | ConversionResult<sp<IMemory>> |
| 2426 | aidl2legacy_NullableSharedFileRegion_IMemory(const std::optional<media::SharedFileRegion>& aidl) { |
| 2427 | sp<IMemory> legacy; |
| 2428 | if (!convertNullableSharedFileRegionToIMemory(aidl, &legacy)) { |
| 2429 | return unexpected(BAD_VALUE); |
| 2430 | } |
| 2431 | return legacy; |
| 2432 | } |
| 2433 | |
| 2434 | ConversionResult<std::optional<media::SharedFileRegion>> |
| 2435 | legacy2aidl_NullableIMemory_SharedFileRegion(const sp<IMemory>& legacy) { |
| 2436 | std::optional<media::SharedFileRegion> aidl; |
| 2437 | if (!convertNullableIMemoryToSharedFileRegion(legacy, &aidl)) { |
| 2438 | return unexpected(BAD_VALUE); |
| 2439 | } |
| 2440 | return aidl; |
| 2441 | } |
| 2442 | |
Ytai Ben-Tsvi | bdc293a | 2020-11-02 17:01:38 -0800 | [diff] [blame] | 2443 | ConversionResult<AudioTimestamp> |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 2444 | aidl2legacy_AudioTimestampInternal_AudioTimestamp(const media::AudioTimestampInternal& aidl) { |
Ytai Ben-Tsvi | bdc293a | 2020-11-02 17:01:38 -0800 | [diff] [blame] | 2445 | AudioTimestamp legacy; |
| 2446 | legacy.mPosition = VALUE_OR_RETURN(convertIntegral<uint32_t>(aidl.position)); |
| 2447 | legacy.mTime.tv_sec = VALUE_OR_RETURN(convertIntegral<uint32_t>(aidl.sec)); |
| 2448 | legacy.mTime.tv_nsec = VALUE_OR_RETURN(convertIntegral<uint32_t>(aidl.nsec)); |
| 2449 | return legacy; |
| 2450 | } |
| 2451 | |
| 2452 | ConversionResult<media::AudioTimestampInternal> |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 2453 | legacy2aidl_AudioTimestamp_AudioTimestampInternal(const AudioTimestamp& legacy) { |
Ytai Ben-Tsvi | bdc293a | 2020-11-02 17:01:38 -0800 | [diff] [blame] | 2454 | media::AudioTimestampInternal aidl; |
| 2455 | aidl.position = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.mPosition)); |
| 2456 | aidl.sec = VALUE_OR_RETURN(convertIntegral<int64_t>(legacy.mTime.tv_sec)); |
| 2457 | aidl.nsec = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.mTime.tv_nsec)); |
| 2458 | return aidl; |
| 2459 | } |
| 2460 | |
Ytai Ben-Tsvi | ce18294 | 2020-11-04 14:48:01 -0800 | [diff] [blame] | 2461 | ConversionResult<audio_uuid_t> |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2462 | aidl2legacy_AudioUuid_audio_uuid_t(const AudioUuid& aidl) { |
Ytai Ben-Tsvi | ce18294 | 2020-11-04 14:48:01 -0800 | [diff] [blame] | 2463 | audio_uuid_t legacy; |
| 2464 | legacy.timeLow = VALUE_OR_RETURN(convertReinterpret<uint32_t>(aidl.timeLow)); |
| 2465 | legacy.timeMid = VALUE_OR_RETURN(convertIntegral<uint16_t>(aidl.timeMid)); |
| 2466 | legacy.timeHiAndVersion = VALUE_OR_RETURN(convertIntegral<uint16_t>(aidl.timeHiAndVersion)); |
| 2467 | legacy.clockSeq = VALUE_OR_RETURN(convertIntegral<uint16_t>(aidl.clockSeq)); |
| 2468 | if (aidl.node.size() != std::size(legacy.node)) { |
| 2469 | return unexpected(BAD_VALUE); |
| 2470 | } |
| 2471 | std::copy(aidl.node.begin(), aidl.node.end(), legacy.node); |
| 2472 | return legacy; |
| 2473 | } |
| 2474 | |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2475 | ConversionResult<AudioUuid> |
Ytai Ben-Tsvi | ce18294 | 2020-11-04 14:48:01 -0800 | [diff] [blame] | 2476 | legacy2aidl_audio_uuid_t_AudioUuid(const audio_uuid_t& legacy) { |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2477 | AudioUuid aidl; |
Ytai Ben-Tsvi | ce18294 | 2020-11-04 14:48:01 -0800 | [diff] [blame] | 2478 | aidl.timeLow = VALUE_OR_RETURN(convertReinterpret<int32_t>(legacy.timeLow)); |
| 2479 | aidl.timeMid = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.timeMid)); |
| 2480 | aidl.timeHiAndVersion = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.timeHiAndVersion)); |
| 2481 | aidl.clockSeq = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.clockSeq)); |
| 2482 | std::copy(legacy.node, legacy.node + std::size(legacy.node), std::back_inserter(aidl.node)); |
| 2483 | return aidl; |
| 2484 | } |
| 2485 | |
| 2486 | ConversionResult<effect_descriptor_t> |
| 2487 | aidl2legacy_EffectDescriptor_effect_descriptor_t(const media::EffectDescriptor& aidl) { |
| 2488 | effect_descriptor_t legacy; |
| 2489 | legacy.type = VALUE_OR_RETURN(aidl2legacy_AudioUuid_audio_uuid_t(aidl.type)); |
| 2490 | legacy.uuid = VALUE_OR_RETURN(aidl2legacy_AudioUuid_audio_uuid_t(aidl.uuid)); |
| 2491 | legacy.apiVersion = VALUE_OR_RETURN(convertReinterpret<uint32_t>(aidl.apiVersion)); |
| 2492 | legacy.flags = VALUE_OR_RETURN(convertReinterpret<uint32_t>(aidl.flags)); |
| 2493 | legacy.cpuLoad = VALUE_OR_RETURN(convertIntegral<uint16_t>(aidl.cpuLoad)); |
| 2494 | legacy.memoryUsage = VALUE_OR_RETURN(convertIntegral<uint16_t>(aidl.memoryUsage)); |
| 2495 | RETURN_IF_ERROR(aidl2legacy_string(aidl.name, legacy.name, sizeof(legacy.name))); |
| 2496 | RETURN_IF_ERROR( |
| 2497 | aidl2legacy_string(aidl.implementor, legacy.implementor, sizeof(legacy.implementor))); |
| 2498 | return legacy; |
| 2499 | } |
| 2500 | |
| 2501 | ConversionResult<media::EffectDescriptor> |
| 2502 | legacy2aidl_effect_descriptor_t_EffectDescriptor(const effect_descriptor_t& legacy) { |
| 2503 | media::EffectDescriptor aidl; |
| 2504 | aidl.type = VALUE_OR_RETURN(legacy2aidl_audio_uuid_t_AudioUuid(legacy.type)); |
| 2505 | aidl.uuid = VALUE_OR_RETURN(legacy2aidl_audio_uuid_t_AudioUuid(legacy.uuid)); |
| 2506 | aidl.apiVersion = VALUE_OR_RETURN(convertReinterpret<int32_t>(legacy.apiVersion)); |
| 2507 | aidl.flags = VALUE_OR_RETURN(convertReinterpret<int32_t>(legacy.flags)); |
| 2508 | aidl.cpuLoad = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.cpuLoad)); |
| 2509 | aidl.memoryUsage = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.memoryUsage)); |
| 2510 | aidl.name = VALUE_OR_RETURN(legacy2aidl_string(legacy.name, sizeof(legacy.name))); |
| 2511 | aidl.implementor = VALUE_OR_RETURN( |
| 2512 | legacy2aidl_string(legacy.implementor, sizeof(legacy.implementor))); |
| 2513 | return aidl; |
| 2514 | } |
| 2515 | |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2516 | ConversionResult<audio_encapsulation_metadata_type_t> |
| 2517 | aidl2legacy_AudioEncapsulationMetadataType_audio_encapsulation_metadata_type_t( |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2518 | AudioEncapsulationMetadataType aidl) { |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2519 | switch (aidl) { |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2520 | case AudioEncapsulationMetadataType::NONE: |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2521 | return AUDIO_ENCAPSULATION_METADATA_TYPE_NONE; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2522 | case AudioEncapsulationMetadataType::FRAMEWORK_TUNER: |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2523 | return AUDIO_ENCAPSULATION_METADATA_TYPE_FRAMEWORK_TUNER; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2524 | case AudioEncapsulationMetadataType::DVB_AD_DESCRIPTOR: |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2525 | return AUDIO_ENCAPSULATION_METADATA_TYPE_DVB_AD_DESCRIPTOR; |
| 2526 | } |
| 2527 | return unexpected(BAD_VALUE); |
| 2528 | } |
| 2529 | |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2530 | ConversionResult<AudioEncapsulationMetadataType> |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2531 | legacy2aidl_audio_encapsulation_metadata_type_t_AudioEncapsulationMetadataType( |
| 2532 | audio_encapsulation_metadata_type_t legacy) { |
| 2533 | switch (legacy) { |
| 2534 | case AUDIO_ENCAPSULATION_METADATA_TYPE_NONE: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2535 | return AudioEncapsulationMetadataType::NONE; |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2536 | case AUDIO_ENCAPSULATION_METADATA_TYPE_FRAMEWORK_TUNER: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2537 | return AudioEncapsulationMetadataType::FRAMEWORK_TUNER; |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2538 | case AUDIO_ENCAPSULATION_METADATA_TYPE_DVB_AD_DESCRIPTOR: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2539 | return AudioEncapsulationMetadataType::DVB_AD_DESCRIPTOR; |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2540 | } |
| 2541 | return unexpected(BAD_VALUE); |
| 2542 | } |
| 2543 | |
| 2544 | ConversionResult<uint32_t> |
| 2545 | aidl2legacy_AudioEncapsulationMode_mask(int32_t aidl) { |
| 2546 | return convertBitmask<uint32_t, |
Ytai Ben-Tsvi | 08c7d9e | 2020-12-16 14:32:56 -0800 | [diff] [blame] | 2547 | int32_t, |
| 2548 | audio_encapsulation_mode_t, |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2549 | AudioEncapsulationMode>( |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2550 | aidl, aidl2legacy_AudioEncapsulationMode_audio_encapsulation_mode_t, |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2551 | indexToEnum_index<AudioEncapsulationMode>, |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2552 | enumToMask_index<uint32_t, audio_encapsulation_mode_t>); |
| 2553 | } |
| 2554 | |
| 2555 | ConversionResult<int32_t> |
| 2556 | legacy2aidl_AudioEncapsulationMode_mask(uint32_t legacy) { |
| 2557 | return convertBitmask<int32_t, |
Ytai Ben-Tsvi | 08c7d9e | 2020-12-16 14:32:56 -0800 | [diff] [blame] | 2558 | uint32_t, |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2559 | AudioEncapsulationMode, |
Ytai Ben-Tsvi | 08c7d9e | 2020-12-16 14:32:56 -0800 | [diff] [blame] | 2560 | audio_encapsulation_mode_t>( |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2561 | legacy, legacy2aidl_audio_encapsulation_mode_t_AudioEncapsulationMode, |
Ytai Ben-Tsvi | 08c7d9e | 2020-12-16 14:32:56 -0800 | [diff] [blame] | 2562 | indexToEnum_index<audio_encapsulation_mode_t>, |
Mikhail Naganov | dbf0364 | 2021-08-25 18:15:32 -0700 | [diff] [blame] | 2563 | enumToMask_index<int32_t, AudioEncapsulationMode>); |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2564 | } |
| 2565 | |
| 2566 | ConversionResult<uint32_t> |
| 2567 | aidl2legacy_AudioEncapsulationMetadataType_mask(int32_t aidl) { |
| 2568 | return convertBitmask<uint32_t, |
Ytai Ben-Tsvi | 08c7d9e | 2020-12-16 14:32:56 -0800 | [diff] [blame] | 2569 | int32_t, |
| 2570 | audio_encapsulation_metadata_type_t, |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2571 | AudioEncapsulationMetadataType>( |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2572 | aidl, aidl2legacy_AudioEncapsulationMetadataType_audio_encapsulation_metadata_type_t, |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2573 | indexToEnum_index<AudioEncapsulationMetadataType>, |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2574 | enumToMask_index<uint32_t, audio_encapsulation_metadata_type_t>); |
| 2575 | } |
| 2576 | |
| 2577 | ConversionResult<int32_t> |
| 2578 | legacy2aidl_AudioEncapsulationMetadataType_mask(uint32_t legacy) { |
| 2579 | return convertBitmask<int32_t, |
Ytai Ben-Tsvi | 08c7d9e | 2020-12-16 14:32:56 -0800 | [diff] [blame] | 2580 | uint32_t, |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2581 | AudioEncapsulationMetadataType, |
Ytai Ben-Tsvi | 08c7d9e | 2020-12-16 14:32:56 -0800 | [diff] [blame] | 2582 | audio_encapsulation_metadata_type_t>( |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2583 | legacy, legacy2aidl_audio_encapsulation_metadata_type_t_AudioEncapsulationMetadataType, |
Ytai Ben-Tsvi | 08c7d9e | 2020-12-16 14:32:56 -0800 | [diff] [blame] | 2584 | indexToEnum_index<audio_encapsulation_metadata_type_t>, |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2585 | enumToMask_index<int32_t, AudioEncapsulationMetadataType>); |
Ytai Ben-Tsvi | 50e016a | 2020-11-12 14:26:12 -0800 | [diff] [blame] | 2586 | } |
| 2587 | |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2588 | ConversionResult<audio_port_device_ext> |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 2589 | aidl2legacy_AudioPortDeviceExt_audio_port_device_ext( |
| 2590 | const AudioPortDeviceExt& aidl, const media::AudioPortDeviceExtSys& aidlSys) { |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2591 | audio_port_device_ext legacy; |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2592 | legacy.hw_module = VALUE_OR_RETURN( |
| 2593 | aidl2legacy_int32_t_audio_module_handle_t(aidlSys.hwModule)); |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 2594 | RETURN_IF_ERROR(aidl2legacy_AudioDevice_audio_device( |
| 2595 | aidl.device, &legacy.type, legacy.address)); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2596 | legacy.encapsulation_modes = VALUE_OR_RETURN( |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2597 | aidl2legacy_AudioEncapsulationMode_mask(aidlSys.encapsulationModes)); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2598 | legacy.encapsulation_metadata_types = VALUE_OR_RETURN( |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2599 | aidl2legacy_AudioEncapsulationMetadataType_mask( |
| 2600 | aidlSys.encapsulationMetadataTypes)); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2601 | return legacy; |
| 2602 | } |
| 2603 | |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 2604 | status_t legacy2aidl_audio_port_device_ext_AudioPortDeviceExt( |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2605 | const audio_port_device_ext& legacy, |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 2606 | AudioPortDeviceExt* aidl, media::AudioPortDeviceExtSys* aidlDeviceExt) { |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2607 | aidlDeviceExt->hwModule = VALUE_OR_RETURN_STATUS( |
| 2608 | legacy2aidl_audio_module_handle_t_int32_t(legacy.hw_module)); |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 2609 | aidl->device = VALUE_OR_RETURN_STATUS( |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2610 | legacy2aidl_audio_device_AudioDevice(legacy.type, legacy.address)); |
| 2611 | aidlDeviceExt->encapsulationModes = VALUE_OR_RETURN_STATUS( |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2612 | legacy2aidl_AudioEncapsulationMode_mask(legacy.encapsulation_modes)); |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2613 | aidlDeviceExt->encapsulationMetadataTypes = VALUE_OR_RETURN_STATUS( |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2614 | legacy2aidl_AudioEncapsulationMetadataType_mask(legacy.encapsulation_metadata_types)); |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2615 | return OK; |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2616 | } |
| 2617 | |
| 2618 | ConversionResult<audio_port_mix_ext> |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2619 | aidl2legacy_AudioPortMixExt_audio_port_mix_ext( |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2620 | const AudioPortMixExt& aidl, const media::AudioPortMixExtSys& aidlSys) { |
Mikhail Naganov | a4a926f | 2021-09-29 17:20:29 +0000 | [diff] [blame] | 2621 | audio_port_mix_ext legacy{}; |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2622 | legacy.hw_module = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_module_handle_t(aidlSys.hwModule)); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2623 | legacy.handle = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_io_handle_t(aidl.handle)); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2624 | return legacy; |
| 2625 | } |
| 2626 | |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2627 | status_t |
| 2628 | legacy2aidl_audio_port_mix_ext_AudioPortMixExt(const audio_port_mix_ext& legacy, |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2629 | AudioPortMixExt* aidl, media::AudioPortMixExtSys* aidlMixExt) { |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2630 | aidlMixExt->hwModule = VALUE_OR_RETURN_STATUS( |
| 2631 | legacy2aidl_audio_module_handle_t_int32_t(legacy.hw_module)); |
| 2632 | aidl->handle = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_io_handle_t_int32_t(legacy.handle)); |
| 2633 | return OK; |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2634 | } |
| 2635 | |
| 2636 | ConversionResult<audio_port_session_ext> |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2637 | aidl2legacy_int32_t_audio_port_session_ext(int32_t aidl) { |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2638 | audio_port_session_ext legacy; |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2639 | legacy.session = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_session_t(aidl)); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2640 | return legacy; |
| 2641 | } |
| 2642 | |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2643 | ConversionResult<int32_t> |
| 2644 | legacy2aidl_audio_port_session_ext_int32_t(const audio_port_session_ext& legacy) { |
| 2645 | return legacy2aidl_audio_session_t_int32_t(legacy.session); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2646 | } |
| 2647 | |
| 2648 | // This type is unnamed in the original definition, thus we name it here. |
| 2649 | using audio_port_v7_ext = decltype(audio_port_v7::ext); |
| 2650 | |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2651 | ConversionResult<audio_port_v7_ext> aidl2legacy_AudioPortExt_audio_port_v7_ext( |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2652 | const AudioPortExt& aidl, media::AudioPortType type, |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2653 | const media::AudioPortExtSys& aidlSys) { |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2654 | audio_port_v7_ext legacy; |
| 2655 | switch (type) { |
| 2656 | case media::AudioPortType::NONE: |
| 2657 | // Just verify that the union is empty. |
| 2658 | VALUE_OR_RETURN(UNION_GET(aidl, unspecified)); |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 2659 | return legacy; |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2660 | case media::AudioPortType::DEVICE: |
| 2661 | legacy.device = VALUE_OR_RETURN( |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 2662 | aidl2legacy_AudioPortDeviceExt_audio_port_device_ext( |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2663 | VALUE_OR_RETURN(UNION_GET(aidl, device)), |
| 2664 | VALUE_OR_RETURN(UNION_GET(aidlSys, device)))); |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 2665 | return legacy; |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2666 | case media::AudioPortType::MIX: |
| 2667 | legacy.mix = VALUE_OR_RETURN( |
| 2668 | aidl2legacy_AudioPortMixExt_audio_port_mix_ext( |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2669 | VALUE_OR_RETURN(UNION_GET(aidl, mix)), |
| 2670 | VALUE_OR_RETURN(UNION_GET(aidlSys, mix)))); |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 2671 | return legacy; |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2672 | case media::AudioPortType::SESSION: |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2673 | legacy.session = VALUE_OR_RETURN( |
| 2674 | aidl2legacy_int32_t_audio_port_session_ext( |
| 2675 | VALUE_OR_RETURN(UNION_GET(aidl, session)))); |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 2676 | return legacy; |
| 2677 | |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2678 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 2679 | LOG_ALWAYS_FATAL("Shouldn't get here"); // with -Werror,-Wswitch may compile-time fail |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2680 | } |
| 2681 | |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2682 | status_t legacy2aidl_AudioPortExt( |
| 2683 | const audio_port_v7_ext& legacy, audio_port_type_t type, |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2684 | AudioPortExt* aidl, media::AudioPortExtSys* aidlSys) { |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2685 | switch (type) { |
| 2686 | case AUDIO_PORT_TYPE_NONE: |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2687 | UNION_SET(*aidl, unspecified, false); |
| 2688 | UNION_SET(*aidlSys, unspecified, false); |
| 2689 | return OK; |
| 2690 | case AUDIO_PORT_TYPE_DEVICE: { |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 2691 | AudioPortDeviceExt device; |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2692 | media::AudioPortDeviceExtSys deviceSys; |
| 2693 | RETURN_STATUS_IF_ERROR( |
Mikhail Naganov | 1050612 | 2021-10-19 10:14:23 -0700 | [diff] [blame^] | 2694 | legacy2aidl_audio_port_device_ext_AudioPortDeviceExt( |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2695 | legacy.device, &device, &deviceSys)); |
| 2696 | UNION_SET(*aidl, device, device); |
| 2697 | UNION_SET(*aidlSys, device, deviceSys); |
| 2698 | return OK; |
| 2699 | } |
| 2700 | case AUDIO_PORT_TYPE_MIX: { |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2701 | AudioPortMixExt mix; |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2702 | media::AudioPortMixExtSys mixSys; |
| 2703 | RETURN_STATUS_IF_ERROR( |
| 2704 | legacy2aidl_audio_port_mix_ext_AudioPortMixExt( |
| 2705 | legacy.mix, &mix, &mixSys)); |
| 2706 | UNION_SET(*aidl, mix, mix); |
| 2707 | UNION_SET(*aidlSys, mix, mixSys); |
| 2708 | return OK; |
| 2709 | } |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2710 | case AUDIO_PORT_TYPE_SESSION: |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2711 | UNION_SET(*aidl, session, VALUE_OR_RETURN_STATUS( |
| 2712 | legacy2aidl_audio_port_session_ext_int32_t(legacy.session))); |
| 2713 | UNION_SET(*aidlSys, unspecified, false); |
| 2714 | return OK; |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2715 | } |
Andy Hung | 3f69c16 | 2020-12-09 12:08:48 -0800 | [diff] [blame] | 2716 | LOG_ALWAYS_FATAL("Shouldn't get here"); // with -Werror,-Wswitch may compile-time fail |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2717 | } |
| 2718 | |
| 2719 | ConversionResult<audio_profile> |
Mikhail Naganov | 89818ba | 2021-09-21 20:37:13 +0000 | [diff] [blame] | 2720 | aidl2legacy_AudioProfile_audio_profile(const AudioProfile& aidl, bool isInput) { |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2721 | audio_profile legacy; |
Mikhail Naganov | b60bd1b | 2021-07-15 17:31:43 -0700 | [diff] [blame] | 2722 | legacy.format = VALUE_OR_RETURN(aidl2legacy_AudioFormatDescription_audio_format_t(aidl.format)); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2723 | |
Mikhail Naganov | 89818ba | 2021-09-21 20:37:13 +0000 | [diff] [blame] | 2724 | if (aidl.sampleRates.size() > std::size(legacy.sample_rates)) { |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2725 | return unexpected(BAD_VALUE); |
| 2726 | } |
| 2727 | RETURN_IF_ERROR( |
Mikhail Naganov | 89818ba | 2021-09-21 20:37:13 +0000 | [diff] [blame] | 2728 | convertRange(aidl.sampleRates.begin(), aidl.sampleRates.end(), legacy.sample_rates, |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2729 | convertIntegral<int32_t, unsigned int>)); |
Mikhail Naganov | 89818ba | 2021-09-21 20:37:13 +0000 | [diff] [blame] | 2730 | legacy.num_sample_rates = aidl.sampleRates.size(); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2731 | |
| 2732 | if (aidl.channelMasks.size() > std::size(legacy.channel_masks)) { |
| 2733 | return unexpected(BAD_VALUE); |
| 2734 | } |
| 2735 | RETURN_IF_ERROR( |
| 2736 | convertRange(aidl.channelMasks.begin(), aidl.channelMasks.end(), legacy.channel_masks, |
Mikhail Naganov | 57bd06f | 2021-08-10 16:41:54 -0700 | [diff] [blame] | 2737 | [isInput](const AudioChannelLayout& l) { |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 2738 | return aidl2legacy_AudioChannelLayout_audio_channel_mask_t(l, isInput); |
| 2739 | })); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2740 | legacy.num_channel_masks = aidl.channelMasks.size(); |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 2741 | |
| 2742 | legacy.encapsulation_type = VALUE_OR_RETURN( |
| 2743 | aidl2legacy_AudioEncapsulationType_audio_encapsulation_type_t(aidl.encapsulationType)); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2744 | return legacy; |
| 2745 | } |
| 2746 | |
Mikhail Naganov | 89818ba | 2021-09-21 20:37:13 +0000 | [diff] [blame] | 2747 | ConversionResult<AudioProfile> |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 2748 | legacy2aidl_audio_profile_AudioProfile(const audio_profile& legacy, bool isInput) { |
Mikhail Naganov | 89818ba | 2021-09-21 20:37:13 +0000 | [diff] [blame] | 2749 | AudioProfile aidl; |
Mikhail Naganov | b60bd1b | 2021-07-15 17:31:43 -0700 | [diff] [blame] | 2750 | aidl.format = VALUE_OR_RETURN(legacy2aidl_audio_format_t_AudioFormatDescription(legacy.format)); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2751 | |
| 2752 | if (legacy.num_sample_rates > std::size(legacy.sample_rates)) { |
| 2753 | return unexpected(BAD_VALUE); |
| 2754 | } |
| 2755 | RETURN_IF_ERROR( |
| 2756 | convertRange(legacy.sample_rates, legacy.sample_rates + legacy.num_sample_rates, |
Mikhail Naganov | 89818ba | 2021-09-21 20:37:13 +0000 | [diff] [blame] | 2757 | std::back_inserter(aidl.sampleRates), |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2758 | convertIntegral<unsigned int, int32_t>)); |
| 2759 | |
| 2760 | if (legacy.num_channel_masks > std::size(legacy.channel_masks)) { |
| 2761 | return unexpected(BAD_VALUE); |
| 2762 | } |
| 2763 | RETURN_IF_ERROR( |
| 2764 | convertRange(legacy.channel_masks, legacy.channel_masks + legacy.num_channel_masks, |
| 2765 | std::back_inserter(aidl.channelMasks), |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 2766 | [isInput](audio_channel_mask_t m) { |
| 2767 | return legacy2aidl_audio_channel_mask_t_AudioChannelLayout(m, isInput); |
| 2768 | })); |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 2769 | |
| 2770 | aidl.encapsulationType = VALUE_OR_RETURN( |
| 2771 | legacy2aidl_audio_encapsulation_type_t_AudioEncapsulationType( |
| 2772 | legacy.encapsulation_type)); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2773 | return aidl; |
| 2774 | } |
| 2775 | |
| 2776 | ConversionResult<audio_gain> |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 2777 | aidl2legacy_AudioGain_audio_gain(const AudioGain& aidl, bool isInput) { |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2778 | audio_gain legacy; |
| 2779 | legacy.mode = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_gain_mode_t_mask(aidl.mode)); |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 2780 | legacy.channel_mask = VALUE_OR_RETURN(aidl2legacy_AudioChannelLayout_audio_channel_mask_t( |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 2781 | aidl.channelMask, isInput)); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2782 | legacy.min_value = VALUE_OR_RETURN(convertIntegral<int>(aidl.minValue)); |
| 2783 | legacy.max_value = VALUE_OR_RETURN(convertIntegral<int>(aidl.maxValue)); |
| 2784 | legacy.default_value = VALUE_OR_RETURN(convertIntegral<int>(aidl.defaultValue)); |
| 2785 | legacy.step_value = VALUE_OR_RETURN(convertIntegral<unsigned int>(aidl.stepValue)); |
| 2786 | legacy.min_ramp_ms = VALUE_OR_RETURN(convertIntegral<unsigned int>(aidl.minRampMs)); |
| 2787 | legacy.max_ramp_ms = VALUE_OR_RETURN(convertIntegral<unsigned int>(aidl.maxRampMs)); |
| 2788 | return legacy; |
| 2789 | } |
| 2790 | |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 2791 | ConversionResult<AudioGain> |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 2792 | legacy2aidl_audio_gain_AudioGain(const audio_gain& legacy, bool isInput) { |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 2793 | AudioGain aidl; |
Andy Hung | 973638a | 2020-12-08 20:47:45 -0800 | [diff] [blame] | 2794 | aidl.mode = VALUE_OR_RETURN(legacy2aidl_audio_gain_mode_t_int32_t_mask(legacy.mode)); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2795 | aidl.channelMask = VALUE_OR_RETURN( |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 2796 | legacy2aidl_audio_channel_mask_t_AudioChannelLayout(legacy.channel_mask, isInput)); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2797 | aidl.minValue = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.min_value)); |
| 2798 | aidl.maxValue = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.max_value)); |
| 2799 | aidl.defaultValue = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.default_value)); |
| 2800 | aidl.stepValue = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.step_value)); |
| 2801 | aidl.minRampMs = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.min_ramp_ms)); |
| 2802 | aidl.maxRampMs = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.max_ramp_ms)); |
| 2803 | return aidl; |
| 2804 | } |
| 2805 | |
| 2806 | ConversionResult<audio_port_v7> |
| 2807 | aidl2legacy_AudioPort_audio_port_v7(const media::AudioPort& aidl) { |
| 2808 | audio_port_v7 legacy; |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2809 | legacy.id = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_port_handle_t(aidl.hal.id)); |
| 2810 | legacy.role = VALUE_OR_RETURN(aidl2legacy_AudioPortRole_audio_port_role_t(aidl.sys.role)); |
| 2811 | legacy.type = VALUE_OR_RETURN(aidl2legacy_AudioPortType_audio_port_type_t(aidl.sys.type)); |
| 2812 | RETURN_IF_ERROR(aidl2legacy_string(aidl.hal.name, legacy.name, sizeof(legacy.name))); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2813 | |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2814 | if (aidl.hal.profiles.size() > std::size(legacy.audio_profiles)) { |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2815 | return unexpected(BAD_VALUE); |
| 2816 | } |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2817 | const bool isInput = |
| 2818 | VALUE_OR_RETURN(direction(aidl.sys.role, aidl.sys.type)) == Direction::INPUT; |
| 2819 | RETURN_IF_ERROR(convertRange( |
| 2820 | aidl.hal.profiles.begin(), aidl.hal.profiles.end(), legacy.audio_profiles, |
| 2821 | [isInput](const AudioProfile& p) { |
| 2822 | return aidl2legacy_AudioProfile_audio_profile(p, isInput); |
| 2823 | })); |
| 2824 | legacy.num_audio_profiles = aidl.hal.profiles.size(); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2825 | |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2826 | if (aidl.hal.extraAudioDescriptors.size() > std::size(legacy.extra_audio_descriptors)) { |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 2827 | return unexpected(BAD_VALUE); |
| 2828 | } |
| 2829 | RETURN_IF_ERROR( |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2830 | convertRange( |
| 2831 | aidl.hal.extraAudioDescriptors.begin(), aidl.hal.extraAudioDescriptors.end(), |
| 2832 | legacy.extra_audio_descriptors, |
| 2833 | aidl2legacy_ExtraAudioDescriptor_audio_extra_audio_descriptor)); |
| 2834 | legacy.num_extra_audio_descriptors = aidl.hal.extraAudioDescriptors.size(); |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 2835 | |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2836 | if (aidl.hal.gains.size() > std::size(legacy.gains)) { |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2837 | return unexpected(BAD_VALUE); |
| 2838 | } |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2839 | RETURN_IF_ERROR(convertRange(aidl.hal.gains.begin(), aidl.hal.gains.end(), legacy.gains, |
Mikhail Naganov | 7d0b36b | 2021-09-22 23:58:41 +0000 | [diff] [blame] | 2840 | [isInput](const AudioGain& g) { |
| 2841 | return aidl2legacy_AudioGain_audio_gain(g, isInput); |
| 2842 | })); |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2843 | legacy.num_gains = aidl.hal.gains.size(); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2844 | |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2845 | media::AudioPortConfig aidlPortConfig; |
| 2846 | aidlPortConfig.hal = aidl.hal.activeConfig; |
| 2847 | aidlPortConfig.sys = aidl.sys.activeConfig; |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2848 | legacy.active_config = VALUE_OR_RETURN( |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2849 | aidl2legacy_AudioPortConfig_audio_port_config(aidlPortConfig)); |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2850 | legacy.ext = VALUE_OR_RETURN( |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2851 | aidl2legacy_AudioPortExt_audio_port_v7_ext(aidl.hal.ext, aidl.sys.type, aidl.sys.ext)); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2852 | return legacy; |
| 2853 | } |
| 2854 | |
| 2855 | ConversionResult<media::AudioPort> |
| 2856 | legacy2aidl_audio_port_v7_AudioPort(const audio_port_v7& legacy) { |
| 2857 | media::AudioPort aidl; |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2858 | aidl.hal.id = VALUE_OR_RETURN(legacy2aidl_audio_port_handle_t_int32_t(legacy.id)); |
| 2859 | aidl.sys.role = VALUE_OR_RETURN(legacy2aidl_audio_port_role_t_AudioPortRole(legacy.role)); |
| 2860 | aidl.sys.type = VALUE_OR_RETURN(legacy2aidl_audio_port_type_t_AudioPortType(legacy.type)); |
| 2861 | aidl.hal.name = VALUE_OR_RETURN(legacy2aidl_string(legacy.name, sizeof(legacy.name))); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2862 | |
| 2863 | if (legacy.num_audio_profiles > std::size(legacy.audio_profiles)) { |
| 2864 | return unexpected(BAD_VALUE); |
| 2865 | } |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 2866 | const bool isInput = VALUE_OR_RETURN(direction(legacy.role, legacy.type)) == Direction::INPUT; |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2867 | RETURN_IF_ERROR( |
| 2868 | convertRange(legacy.audio_profiles, legacy.audio_profiles + legacy.num_audio_profiles, |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2869 | std::back_inserter(aidl.hal.profiles), |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 2870 | [isInput](const audio_profile& p) { |
| 2871 | return legacy2aidl_audio_profile_AudioProfile(p, isInput); |
| 2872 | })); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2873 | |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 2874 | if (legacy.num_extra_audio_descriptors > std::size(legacy.extra_audio_descriptors)) { |
| 2875 | return unexpected(BAD_VALUE); |
| 2876 | } |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2877 | aidl.sys.profiles.resize(legacy.num_audio_profiles); |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 2878 | RETURN_IF_ERROR( |
| 2879 | convertRange(legacy.extra_audio_descriptors, |
| 2880 | legacy.extra_audio_descriptors + legacy.num_extra_audio_descriptors, |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2881 | std::back_inserter(aidl.hal.extraAudioDescriptors), |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 2882 | legacy2aidl_audio_extra_audio_descriptor_ExtraAudioDescriptor)); |
| 2883 | |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2884 | if (legacy.num_gains > std::size(legacy.gains)) { |
| 2885 | return unexpected(BAD_VALUE); |
| 2886 | } |
| 2887 | RETURN_IF_ERROR( |
| 2888 | convertRange(legacy.gains, legacy.gains + legacy.num_gains, |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2889 | std::back_inserter(aidl.hal.gains), |
Mikhail Naganov | de3fa18 | 2021-07-30 15:06:42 -0700 | [diff] [blame] | 2890 | [isInput](const audio_gain& g) { |
| 2891 | return legacy2aidl_audio_gain_AudioGain(g, isInput); |
| 2892 | })); |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2893 | aidl.sys.gains.resize(legacy.num_gains); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2894 | |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2895 | media::AudioPortConfig aidlPortConfig = VALUE_OR_RETURN( |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2896 | legacy2aidl_audio_port_config_AudioPortConfig(legacy.active_config)); |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2897 | aidl.hal.activeConfig = aidlPortConfig.hal; |
| 2898 | aidl.sys.activeConfig = aidlPortConfig.sys; |
Mikhail Naganov | ceb8bf9 | 2021-09-23 21:29:39 +0000 | [diff] [blame] | 2899 | RETURN_IF_ERROR( |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 2900 | legacy2aidl_AudioPortExt(legacy.ext, legacy.type, &aidl.hal.ext, &aidl.sys.ext)); |
Ytai Ben-Tsvi | 0cf9265 | 2020-11-23 13:23:00 -0800 | [diff] [blame] | 2901 | return aidl; |
| 2902 | } |
| 2903 | |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 2904 | ConversionResult<audio_mode_t> |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2905 | aidl2legacy_AudioMode_audio_mode_t(AudioMode aidl) { |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 2906 | switch (aidl) { |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2907 | case AudioMode::SYS_RESERVED_INVALID: |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 2908 | return AUDIO_MODE_INVALID; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2909 | case AudioMode::SYS_RESERVED_CURRENT: |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 2910 | return AUDIO_MODE_CURRENT; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2911 | case AudioMode::NORMAL: |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 2912 | return AUDIO_MODE_NORMAL; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2913 | case AudioMode::RINGTONE: |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 2914 | return AUDIO_MODE_RINGTONE; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2915 | case AudioMode::IN_CALL: |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 2916 | return AUDIO_MODE_IN_CALL; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2917 | case AudioMode::IN_COMMUNICATION: |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 2918 | return AUDIO_MODE_IN_COMMUNICATION; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2919 | case AudioMode::CALL_SCREEN: |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 2920 | return AUDIO_MODE_CALL_SCREEN; |
| 2921 | } |
| 2922 | return unexpected(BAD_VALUE); |
| 2923 | } |
| 2924 | |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2925 | ConversionResult<AudioMode> |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 2926 | legacy2aidl_audio_mode_t_AudioMode(audio_mode_t legacy) { |
| 2927 | switch (legacy) { |
| 2928 | case AUDIO_MODE_INVALID: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2929 | return AudioMode::SYS_RESERVED_INVALID; |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 2930 | case AUDIO_MODE_CURRENT: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2931 | return AudioMode::SYS_RESERVED_CURRENT; |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 2932 | case AUDIO_MODE_NORMAL: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2933 | return AudioMode::NORMAL; |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 2934 | case AUDIO_MODE_RINGTONE: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2935 | return AudioMode::RINGTONE; |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 2936 | case AUDIO_MODE_IN_CALL: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2937 | return AudioMode::IN_CALL; |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 2938 | case AUDIO_MODE_IN_COMMUNICATION: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2939 | return AudioMode::IN_COMMUNICATION; |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 2940 | case AUDIO_MODE_CALL_SCREEN: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 2941 | return AudioMode::CALL_SCREEN; |
Ytai Ben-Tsvi | 50b8ccb | 2020-11-24 13:47:54 -0800 | [diff] [blame] | 2942 | case AUDIO_MODE_CNT: |
| 2943 | break; |
| 2944 | } |
| 2945 | return unexpected(BAD_VALUE); |
| 2946 | } |
| 2947 | |
| 2948 | ConversionResult<audio_unique_id_use_t> |
| 2949 | aidl2legacy_AudioUniqueIdUse_audio_unique_id_use_t(media::AudioUniqueIdUse aidl) { |
| 2950 | switch (aidl) { |
| 2951 | case media::AudioUniqueIdUse::UNSPECIFIED: |
| 2952 | return AUDIO_UNIQUE_ID_USE_UNSPECIFIED; |
| 2953 | case media::AudioUniqueIdUse::SESSION: |
| 2954 | return AUDIO_UNIQUE_ID_USE_SESSION; |
| 2955 | case media::AudioUniqueIdUse::MODULE: |
| 2956 | return AUDIO_UNIQUE_ID_USE_MODULE; |
| 2957 | case media::AudioUniqueIdUse::EFFECT: |
| 2958 | return AUDIO_UNIQUE_ID_USE_EFFECT; |
| 2959 | case media::AudioUniqueIdUse::PATCH: |
| 2960 | return AUDIO_UNIQUE_ID_USE_PATCH; |
| 2961 | case media::AudioUniqueIdUse::OUTPUT: |
| 2962 | return AUDIO_UNIQUE_ID_USE_OUTPUT; |
| 2963 | case media::AudioUniqueIdUse::INPUT: |
| 2964 | return AUDIO_UNIQUE_ID_USE_INPUT; |
| 2965 | case media::AudioUniqueIdUse::CLIENT: |
| 2966 | return AUDIO_UNIQUE_ID_USE_CLIENT; |
| 2967 | } |
| 2968 | return unexpected(BAD_VALUE); |
| 2969 | } |
| 2970 | |
| 2971 | ConversionResult<media::AudioUniqueIdUse> |
| 2972 | legacy2aidl_audio_unique_id_use_t_AudioUniqueIdUse(audio_unique_id_use_t legacy) { |
| 2973 | switch (legacy) { |
| 2974 | case AUDIO_UNIQUE_ID_USE_UNSPECIFIED: |
| 2975 | return media::AudioUniqueIdUse::UNSPECIFIED; |
| 2976 | case AUDIO_UNIQUE_ID_USE_SESSION: |
| 2977 | return media::AudioUniqueIdUse::SESSION; |
| 2978 | case AUDIO_UNIQUE_ID_USE_MODULE: |
| 2979 | return media::AudioUniqueIdUse::MODULE; |
| 2980 | case AUDIO_UNIQUE_ID_USE_EFFECT: |
| 2981 | return media::AudioUniqueIdUse::EFFECT; |
| 2982 | case AUDIO_UNIQUE_ID_USE_PATCH: |
| 2983 | return media::AudioUniqueIdUse::PATCH; |
| 2984 | case AUDIO_UNIQUE_ID_USE_OUTPUT: |
| 2985 | return media::AudioUniqueIdUse::OUTPUT; |
| 2986 | case AUDIO_UNIQUE_ID_USE_INPUT: |
| 2987 | return media::AudioUniqueIdUse::INPUT; |
| 2988 | case AUDIO_UNIQUE_ID_USE_CLIENT: |
| 2989 | return media::AudioUniqueIdUse::CLIENT; |
| 2990 | case AUDIO_UNIQUE_ID_USE_MAX: |
| 2991 | break; |
| 2992 | } |
| 2993 | return unexpected(BAD_VALUE); |
| 2994 | } |
| 2995 | |
Ytai Ben-Tsvi | 7e7a79d | 2020-12-15 16:48:16 -0800 | [diff] [blame] | 2996 | ConversionResult<volume_group_t> |
| 2997 | aidl2legacy_int32_t_volume_group_t(int32_t aidl) { |
| 2998 | return convertReinterpret<volume_group_t>(aidl); |
| 2999 | } |
| 3000 | |
| 3001 | ConversionResult<int32_t> |
| 3002 | legacy2aidl_volume_group_t_int32_t(volume_group_t legacy) { |
| 3003 | return convertReinterpret<int32_t>(legacy); |
| 3004 | } |
| 3005 | |
Ytai Ben-Tsvi | 0a4904a | 2021-01-06 12:57:05 -0800 | [diff] [blame] | 3006 | ConversionResult<product_strategy_t> |
| 3007 | aidl2legacy_int32_t_product_strategy_t(int32_t aidl) { |
| 3008 | return convertReinterpret<product_strategy_t>(aidl); |
| 3009 | } |
| 3010 | |
| 3011 | ConversionResult<int32_t> |
| 3012 | legacy2aidl_product_strategy_t_int32_t(product_strategy_t legacy) { |
| 3013 | return convertReinterpret<int32_t>(legacy); |
| 3014 | } |
| 3015 | |
Kuowei Li | d4adbdb | 2020-08-13 14:44:25 +0800 | [diff] [blame] | 3016 | ConversionResult<audio_dual_mono_mode_t> |
| 3017 | aidl2legacy_AudioDualMonoMode_audio_dual_mono_mode_t(media::AudioDualMonoMode aidl) { |
| 3018 | switch (aidl) { |
| 3019 | case media::AudioDualMonoMode::OFF: |
| 3020 | return AUDIO_DUAL_MONO_MODE_OFF; |
| 3021 | case media::AudioDualMonoMode::LR: |
| 3022 | return AUDIO_DUAL_MONO_MODE_LR; |
| 3023 | case media::AudioDualMonoMode::LL: |
| 3024 | return AUDIO_DUAL_MONO_MODE_LL; |
| 3025 | case media::AudioDualMonoMode::RR: |
| 3026 | return AUDIO_DUAL_MONO_MODE_RR; |
| 3027 | } |
| 3028 | return unexpected(BAD_VALUE); |
| 3029 | } |
| 3030 | |
| 3031 | ConversionResult<media::AudioDualMonoMode> |
| 3032 | legacy2aidl_audio_dual_mono_mode_t_AudioDualMonoMode(audio_dual_mono_mode_t legacy) { |
| 3033 | switch (legacy) { |
| 3034 | case AUDIO_DUAL_MONO_MODE_OFF: |
| 3035 | return media::AudioDualMonoMode::OFF; |
| 3036 | case AUDIO_DUAL_MONO_MODE_LR: |
| 3037 | return media::AudioDualMonoMode::LR; |
| 3038 | case AUDIO_DUAL_MONO_MODE_LL: |
| 3039 | return media::AudioDualMonoMode::LL; |
| 3040 | case AUDIO_DUAL_MONO_MODE_RR: |
| 3041 | return media::AudioDualMonoMode::RR; |
| 3042 | } |
| 3043 | return unexpected(BAD_VALUE); |
| 3044 | } |
| 3045 | |
| 3046 | ConversionResult<audio_timestretch_fallback_mode_t> |
| 3047 | aidl2legacy_int32_t_audio_timestretch_fallback_mode_t(int32_t aidl) { |
| 3048 | return convertReinterpret<audio_timestretch_fallback_mode_t>(aidl); |
| 3049 | } |
| 3050 | |
| 3051 | ConversionResult<int32_t> |
| 3052 | legacy2aidl_audio_timestretch_fallback_mode_t_int32_t(audio_timestretch_fallback_mode_t legacy) { |
| 3053 | return convertReinterpret<int32_t>(legacy); |
| 3054 | } |
| 3055 | |
| 3056 | ConversionResult<audio_timestretch_stretch_mode_t> |
| 3057 | aidl2legacy_int32_t_audio_timestretch_stretch_mode_t(int32_t aidl) { |
| 3058 | return convertReinterpret<audio_timestretch_stretch_mode_t>(aidl); |
| 3059 | } |
| 3060 | |
| 3061 | ConversionResult<int32_t> |
| 3062 | legacy2aidl_audio_timestretch_stretch_mode_t_int32_t(audio_timestretch_stretch_mode_t legacy) { |
| 3063 | return convertReinterpret<int32_t>(legacy); |
| 3064 | } |
| 3065 | |
| 3066 | ConversionResult<audio_playback_rate_t> |
| 3067 | aidl2legacy_AudioPlaybackRate_audio_playback_rate_t(const media::AudioPlaybackRate& aidl) { |
| 3068 | audio_playback_rate_t legacy; |
| 3069 | legacy.mSpeed = aidl.speed; |
| 3070 | legacy.mPitch = aidl.pitch; |
| 3071 | legacy.mFallbackMode = VALUE_OR_RETURN( |
| 3072 | aidl2legacy_int32_t_audio_timestretch_fallback_mode_t(aidl.fallbackMode)); |
| 3073 | legacy.mStretchMode = VALUE_OR_RETURN( |
| 3074 | aidl2legacy_int32_t_audio_timestretch_stretch_mode_t(aidl.stretchMode)); |
| 3075 | return legacy; |
| 3076 | } |
| 3077 | |
| 3078 | ConversionResult<media::AudioPlaybackRate> |
| 3079 | legacy2aidl_audio_playback_rate_t_AudioPlaybackRate(const audio_playback_rate_t& legacy) { |
| 3080 | media::AudioPlaybackRate aidl; |
| 3081 | aidl.speed = legacy.mSpeed; |
| 3082 | aidl.pitch = legacy.mPitch; |
| 3083 | aidl.fallbackMode = VALUE_OR_RETURN( |
| 3084 | legacy2aidl_audio_timestretch_fallback_mode_t_int32_t(legacy.mFallbackMode)); |
| 3085 | aidl.stretchMode = VALUE_OR_RETURN( |
| 3086 | legacy2aidl_audio_timestretch_stretch_mode_t_int32_t(legacy.mStretchMode)); |
| 3087 | return aidl; |
| 3088 | } |
| 3089 | |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 3090 | ConversionResult<audio_standard_t> |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 3091 | aidl2legacy_AudioStandard_audio_standard_t(AudioStandard aidl) { |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 3092 | switch (aidl) { |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 3093 | case AudioStandard::NONE: |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 3094 | return AUDIO_STANDARD_NONE; |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 3095 | case AudioStandard::EDID: |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 3096 | return AUDIO_STANDARD_EDID; |
| 3097 | } |
| 3098 | return unexpected(BAD_VALUE); |
| 3099 | } |
| 3100 | |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 3101 | ConversionResult<AudioStandard> |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 3102 | legacy2aidl_audio_standard_t_AudioStandard(audio_standard_t legacy) { |
| 3103 | switch (legacy) { |
| 3104 | case AUDIO_STANDARD_NONE: |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 3105 | return AudioStandard::NONE; |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 3106 | case AUDIO_STANDARD_EDID: |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 3107 | return AudioStandard::EDID; |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 3108 | } |
| 3109 | return unexpected(BAD_VALUE); |
| 3110 | } |
| 3111 | |
| 3112 | ConversionResult<audio_extra_audio_descriptor> |
| 3113 | aidl2legacy_ExtraAudioDescriptor_audio_extra_audio_descriptor( |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 3114 | const ExtraAudioDescriptor& aidl) { |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 3115 | audio_extra_audio_descriptor legacy; |
| 3116 | legacy.standard = VALUE_OR_RETURN(aidl2legacy_AudioStandard_audio_standard_t(aidl.standard)); |
| 3117 | if (aidl.audioDescriptor.size() > EXTRA_AUDIO_DESCRIPTOR_SIZE) { |
| 3118 | return unexpected(BAD_VALUE); |
| 3119 | } |
| 3120 | legacy.descriptor_length = aidl.audioDescriptor.size(); |
| 3121 | std::copy(aidl.audioDescriptor.begin(), aidl.audioDescriptor.end(), |
| 3122 | std::begin(legacy.descriptor)); |
| 3123 | legacy.encapsulation_type = |
| 3124 | VALUE_OR_RETURN(aidl2legacy_AudioEncapsulationType_audio_encapsulation_type_t( |
| 3125 | aidl.encapsulationType)); |
| 3126 | return legacy; |
| 3127 | } |
| 3128 | |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 3129 | ConversionResult<ExtraAudioDescriptor> |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 3130 | legacy2aidl_audio_extra_audio_descriptor_ExtraAudioDescriptor( |
| 3131 | const audio_extra_audio_descriptor& legacy) { |
Mikhail Naganov | 0078ee5 | 2021-09-30 23:06:20 +0000 | [diff] [blame] | 3132 | ExtraAudioDescriptor aidl; |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 3133 | aidl.standard = VALUE_OR_RETURN(legacy2aidl_audio_standard_t_AudioStandard(legacy.standard)); |
| 3134 | if (legacy.descriptor_length > EXTRA_AUDIO_DESCRIPTOR_SIZE) { |
| 3135 | return unexpected(BAD_VALUE); |
| 3136 | } |
| 3137 | aidl.audioDescriptor.resize(legacy.descriptor_length); |
| 3138 | std::copy(legacy.descriptor, legacy.descriptor + legacy.descriptor_length, |
| 3139 | aidl.audioDescriptor.begin()); |
| 3140 | aidl.encapsulationType = |
| 3141 | VALUE_OR_RETURN(legacy2aidl_audio_encapsulation_type_t_AudioEncapsulationType( |
| 3142 | legacy.encapsulation_type)); |
| 3143 | return aidl; |
| 3144 | } |
| 3145 | |
| 3146 | ConversionResult<audio_encapsulation_type_t> |
| 3147 | aidl2legacy_AudioEncapsulationType_audio_encapsulation_type_t( |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 3148 | const AudioEncapsulationType& aidl) { |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 3149 | switch (aidl) { |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 3150 | case AudioEncapsulationType::NONE: |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 3151 | return AUDIO_ENCAPSULATION_TYPE_NONE; |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 3152 | case AudioEncapsulationType::IEC61937: |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 3153 | return AUDIO_ENCAPSULATION_TYPE_IEC61937; |
| 3154 | } |
| 3155 | return unexpected(BAD_VALUE); |
| 3156 | } |
| 3157 | |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 3158 | ConversionResult<AudioEncapsulationType> |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 3159 | legacy2aidl_audio_encapsulation_type_t_AudioEncapsulationType( |
| 3160 | const audio_encapsulation_type_t & legacy) { |
| 3161 | switch (legacy) { |
| 3162 | case AUDIO_ENCAPSULATION_TYPE_NONE: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 3163 | return AudioEncapsulationType::NONE; |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 3164 | case AUDIO_ENCAPSULATION_TYPE_IEC61937: |
Mikhail Naganov | ddceecc | 2021-09-03 13:58:56 -0700 | [diff] [blame] | 3165 | return AudioEncapsulationType::IEC61937; |
jiabin | 82e5693 | 2021-03-05 06:35:19 +0000 | [diff] [blame] | 3166 | } |
| 3167 | return unexpected(BAD_VALUE); |
| 3168 | } |
| 3169 | |
jiabin | 10a03f1 | 2021-05-07 23:46:28 +0000 | [diff] [blame] | 3170 | ConversionResult<TrackSecondaryOutputInfoPair> |
| 3171 | aidl2legacy_TrackSecondaryOutputInfo_TrackSecondaryOutputInfoPair( |
| 3172 | const media::TrackSecondaryOutputInfo& aidl) { |
| 3173 | TrackSecondaryOutputInfoPair trackSecondaryOutputInfoPair; |
| 3174 | trackSecondaryOutputInfoPair.first = |
| 3175 | VALUE_OR_RETURN(aidl2legacy_int32_t_audio_port_handle_t(aidl.portId)); |
| 3176 | trackSecondaryOutputInfoPair.second = |
| 3177 | VALUE_OR_RETURN(convertContainer<std::vector<audio_port_handle_t>>( |
| 3178 | aidl.secondaryOutputIds, aidl2legacy_int32_t_audio_io_handle_t)); |
| 3179 | return trackSecondaryOutputInfoPair; |
| 3180 | } |
| 3181 | |
| 3182 | ConversionResult<media::TrackSecondaryOutputInfo> |
| 3183 | legacy2aidl_TrackSecondaryOutputInfoPair_TrackSecondaryOutputInfo( |
| 3184 | const TrackSecondaryOutputInfoPair& legacy) { |
| 3185 | media::TrackSecondaryOutputInfo trackSecondaryOutputInfo; |
| 3186 | trackSecondaryOutputInfo.portId = |
| 3187 | VALUE_OR_RETURN(legacy2aidl_audio_port_handle_t_int32_t(legacy.first)); |
| 3188 | trackSecondaryOutputInfo.secondaryOutputIds = |
| 3189 | VALUE_OR_RETURN(convertContainer<std::vector<int32_t>>( |
| 3190 | legacy.second, legacy2aidl_audio_io_handle_t_int32_t)); |
| 3191 | return trackSecondaryOutputInfo; |
| 3192 | } |
| 3193 | |
Ytai Ben-Tsvi | 10dc0a6 | 2020-09-18 11:31:55 -0700 | [diff] [blame] | 3194 | } // namespace android |