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

Commit 1cf6b4df authored by Kevin Rocard's avatar Kevin Rocard
Browse files

libaudiohal: move to Stream Metadata to common 



So that it can be used by the Bluetooth HAL.

Test: compile
Change-Id: I5b122d329811de2c10fc25f457a0eed7b5ece7b6
Signed-off-by: default avatarKevin Rocard <krocard@google.com>
parent 3d48dcea

media/libaudiohal/impl/DeviceHalHidl.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -49,8 +49,10 @@ using ::android::hardware::audio::CPP_VERSION::Result; 
using ::android::hardware::hidl_string;

using ::android::hardware::hidl_string;

using ::android::hardware::hidl_vec;

using ::android::hardware::hidl_vec;





#if MAJOR_VERSION >= 4

#if MAJOR_VERSION == 4

using ::android::hardware::audio::CPP_VERSION::SinkMetadata;

using ::android::hardware::audio::CPP_VERSION::SinkMetadata;

#elif MAJOR_VERSION == 5

using ::android::hardware::audio::common::CPP_VERSION::SinkMetadata;

#endif

#endif





namespace android {

namespace android {

media/libaudiohal/impl/StreamHalHidl.cpp

+13 −3
Original line number Original line Diff line number Diff line
@@ -49,8 +49,18 @@ using ::android::hardware::audio::common::CPP_VERSION::AudioContentType; 
using ::android::hardware::audio::common::CPP_VERSION::AudioSource;

using ::android::hardware::audio::common::CPP_VERSION::AudioSource;

using ::android::hardware::audio::common::CPP_VERSION::AudioUsage;

using ::android::hardware::audio::common::CPP_VERSION::AudioUsage;

using ::android::hardware::audio::CPP_VERSION::MicrophoneInfo;

using ::android::hardware::audio::CPP_VERSION::MicrophoneInfo;

#endif



#if MAJOR_VERSION == 4

using ::android::hardware::audio::CPP_VERSION::PlaybackTrackMetadata;

using ::android::hardware::audio::CPP_VERSION::PlaybackTrackMetadata;

using ::android::hardware::audio::CPP_VERSION::RecordTrackMetadata;

using ::android::hardware::audio::CPP_VERSION::RecordTrackMetadata;

using HalSinkMetadata = ::android::hardware::audio::CPP_VERSION::SinkMetadata;

using HalSourceMetadata = ::android::hardware::audio::CPP_VERSION::SourceMetadata;

#elif MAJOR_VERSION == 5

using ::android::hardware::audio::common::CPP_VERSION::PlaybackTrackMetadata;

using ::android::hardware::audio::common::CPP_VERSION::RecordTrackMetadata;

using HalSinkMetadata = ::android::hardware::audio::common::CPP_VERSION::SinkMetadata;

using HalSourceMetadata = ::android::hardware::audio::common::CPP_VERSION::SourceMetadata;

#endif

#endif





namespace android {

namespace android {
@@ -357,7 +367,7 @@ status_t StreamOutHalHidl::selectPresentation(int presentationId, int programId) 
    parametersToHal(hidl_vec<ParameterValue>(parameters), &halParameters);

    parametersToHal(hidl_vec<ParameterValue>(parameters), &halParameters);

    return setParameters(halParameters);

    return setParameters(halParameters);

}

}

#elif MAJOR_VERSION == 4

#elif MAJOR_VERSION >= 4

status_t StreamOutHalHidl::selectPresentation(int presentationId, int programId) {

status_t StreamOutHalHidl::selectPresentation(int presentationId, int programId) {

    if (mStream == 0) return NO_INIT;

    if (mStream == 0) return NO_INIT;

    return processReturn("selectPresentation",

    return processReturn("selectPresentation",
@@ -614,7 +624,7 @@ static auto transformToHidlVec(const Values& values, ElementConverter converter) 
}

}





status_t StreamOutHalHidl::updateSourceMetadata(const SourceMetadata& sourceMetadata) {

status_t StreamOutHalHidl::updateSourceMetadata(const SourceMetadata& sourceMetadata) {

    hardware::audio::CPP_VERSION::SourceMetadata halMetadata = {

    HalSourceMetadata halMetadata = {

        .tracks = transformToHidlVec(sourceMetadata.tracks,

        .tracks = transformToHidlVec(sourceMetadata.tracks,

              [](const playback_track_metadata& metadata) -> PlaybackTrackMetadata {

              [](const playback_track_metadata& metadata) -> PlaybackTrackMetadata {

                  return {

                  return {
@@ -853,7 +863,7 @@ status_t StreamInHalHidl::getActiveMicrophones( 
}

}





status_t StreamInHalHidl::updateSinkMetadata(const SinkMetadata& sinkMetadata) {

status_t StreamInHalHidl::updateSinkMetadata(const SinkMetadata& sinkMetadata) {

    hardware::audio::CPP_VERSION::SinkMetadata halMetadata = {

    HalSinkMetadata halMetadata = {

        .tracks = transformToHidlVec(sinkMetadata.tracks,

        .tracks = transformToHidlVec(sinkMetadata.tracks,

              [](const record_track_metadata& metadata) -> RecordTrackMetadata {

              [](const record_track_metadata& metadata) -> RecordTrackMetadata {

                  return {

                  return {