| commit | fd0abfb0c6140ae10d52a206a0e8771caa26accc | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon May 02 21:29:54 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 21:29:54 2022 +0000 |
| tree | 49d707e7a05f9a14d88dc427cba4f5285b57c7ac | |
| parent | 10993b2697205b76f32728e4e45360c513b98b83 [diff] | |
| parent | 3f0d11a7c4d4b154be26e4cb2aaa35ca08c6edfb [diff] |
Merge "audio: Reserve audio format constant for APTX QLEA" am: 3f0d11a7c4 Original change: https://android-review.googlesource.com/c/platform/system/media/+/2072569 Change-Id: I2844ce8cd0c52574813e2287cb0a510f25b28527 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/include/system/audio-hal-enums.h b/audio/include/system/audio-hal-enums.h index 8e89899..1f4ed4f 100644 --- a/audio/include/system/audio-hal-enums.h +++ b/audio/include/system/audio-hal-enums.h
@@ -618,6 +618,7 @@ V(AUDIO_FORMAT_IEC60958, 0x2D000000u) \ V(AUDIO_FORMAT_DTS_UHD, 0x2E000000u) \ V(AUDIO_FORMAT_DRA, 0x2F000000u) +// V(AUDIO_FORMAT_APTX_ADAPTIVE_QLEA, 0x30000000u) // Reserved for future use #define AUDIO_FORMAT_LIST_DEF(V) \ AUDIO_FORMAT_LIST_UNIQUE_DEF(V) \
diff --git a/audio/include/system/audio.h b/audio/include/system/audio.h index b43bb60..c408283 100644 --- a/audio/include/system/audio.h +++ b/audio/include/system/audio.h
@@ -1804,6 +1804,7 @@ case AUDIO_FORMAT_LHDC_LL: case AUDIO_FORMAT_APTX_TWSP: case AUDIO_FORMAT_LC3: +// case AUDIO_FORMAT_APTX_ADAPTIVE_QLEA: return true; case AUDIO_FORMAT_MPEGH: switch (format) {