Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6e3a171 authored by Andy Hung's avatar Andy Hung
Browse files

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
parent b76d8e27

audio/core/all-versions/default/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ cc_defaults { 
        "android.hardware.audio-impl_headers",

        "android.hardware.audio.common.util@all-versions",

        "libaudioclient_headers",

        "libaudioutils_headers",

        "libaudio_system_headers",

        "libhardware_headers",

        "libmedia_headers",

audio/core/all-versions/default/StreamOut.cpp

+6 −1
Original line number Diff line number Diff line
@@ -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: