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