diff options
| author | Andy Hung <hunga@google.com> | 2021-05-04 21:13:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-04 21:13:54 +0000 |
| commit | 1e1514be04bc5c6a2a5a0b22ff16182127651814 (patch) | |
| tree | d6a1bbe714bd6e02bdce4710aff42299c101ccd3 /audio/core/all-versions/default/StreamOut.cpp | |
| parent | 8226694fcfdeb04498e20b5b331c8e2bed6d9a80 (diff) | |
| parent | 66ffc5b99a2fd9bdb808c394becbe8351f05590d (diff) | |
Merge "StreamOut: Fix STREAM_EVENT_CBK_TYPE_CODEC_FORMAT_CHANGED" am: 66ffc5b99a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692490
Change-Id: I8da5b65e922c3fae06d29f4e4a990d66dacfe5d0
Diffstat (limited to 'audio/core/all-versions/default/StreamOut.cpp')
| -rw-r--r-- | audio/core/all-versions/default/StreamOut.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/audio/core/all-versions/default/StreamOut.cpp b/audio/core/all-versions/default/StreamOut.cpp index a089f6baf9..4fe6601cd2 100644 --- a/audio/core/all-versions/default/StreamOut.cpp +++ b/audio/core/all-versions/default/StreamOut.cpp @@ -28,6 +28,7 @@ #include <HidlUtils.h> #include <android/log.h> +#include <audio_utils/Metadata.h> #include <hardware/audio.h> #include <util/CoreUtils.h> #include <utils/Trace.h> @@ -742,7 +743,11 @@ int StreamOut::asyncEventCallback(stream_event_callback_type_t event, void* para switch (event) { case STREAM_EVENT_CBK_TYPE_CODEC_FORMAT_CHANGED: { hidl_vec<uint8_t> audioMetadata; - audioMetadata.setToExternal((uint8_t*)param, strlen((char*)param)); + // void* param is the byte string buffer from byte_string_from_audio_metadata(). + // As the byte string buffer may have embedded zeroes, we cannot use strlen() + // but instead use audio_utils::metadata::dataByteStringLen(). + audioMetadata.setToExternal((uint8_t*)param, audio_utils::metadata::dataByteStringLen( + (const uint8_t*)param)); result = eventCallback->onCodecFormatChanged(audioMetadata); } break; default: |