diff options
| author | Andy Hung <hunga@google.com> | 2021-04-30 15:29:47 -0700 |
|---|---|---|
| committer | Andy Hung <hunga@google.com> | 2021-04-30 21:07:33 -0700 |
| commit | e6e3a171261d81ec8605ee8c0e129e7fa96703ef (patch) | |
| tree | 7ecf51ba478c57616fc55c0c5d010dc5bcf3e753 /audio/core/all-versions/default/StreamOut.cpp | |
| parent | b76d8e27fb6b87a316f81b8d42265c4aec41e2a8 (diff) | |
StreamOut: Fix STREAM_EVENT_CBK_TYPE_CODEC_FORMAT_CHANGED
Use audio_metadata_byte_string_len method in asyncEventCallback.
Test: atest metadata_tests
Bug: 186894288
Change-Id: I04914bc5b2c778002b53b8f8da5bf29fff5c80f8
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: |