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

Commit d9499eb6 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

Audio HAL: Update for the new definition of SinkMetadata 

In Audio HAL V5.0 SinkMetadata receives a new member: optional
DeviceAddress. Use per field initialization to leave
the safe_union in an uninitialized state.

Bug: 120859615
Test: make
Change-Id: I358b9abbcb0690aebb2c658a72adb287ceec22b5
parent 4f20844f

media/libaudiohal/impl/DeviceHalHidl.cpp

+3 −3
Original line number Diff line number Diff line
@@ -277,18 +277,18 @@ status_t DeviceHalHidl::openInputStream( 
    HidlUtils::audioConfigFromHal(*config, &hidlConfig);

    Result retval = Result::NOT_INITIALIZED;

#if MAJOR_VERSION == 2

    auto sourceMetadata = AudioSource(source);

    auto sinkMetadata = AudioSource(source);

#elif MAJOR_VERSION >= 4

    // TODO: correctly propagate the tracks sources and volume

    //       for now, only send the main source at 1dbfs

    SinkMetadata sourceMetadata = {{{AudioSource(source), 1}}};

    SinkMetadata sinkMetadata = {{{ .source = AudioSource(source), .gain = 1 }}};

#endif

    Return<void> ret = mDevice->openInputStream(

            handle,

            hidlDevice,

            hidlConfig,

            EnumBitfield<AudioInputFlag>(flags),

            sourceMetadata,

            sinkMetadata,

            [&](Result r, const sp<IStreamIn>& result, const AudioConfig& suggestedConfig) {

                retval = r;

                if (retval == Result::OK) {