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

Commit 08705b86 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "upstream-hal-v7_1-p3" am: 6651930c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1978750

Change-Id: I39551cd38080586653536cfad035e47dd66b1385
parents 9c7d7ce8 6651930c

media/libaudiohal/impl/DeviceHalHidl.cpp

+2 −5
Original line number Diff line number Diff line
@@ -300,13 +300,10 @@ status_t DeviceHalHidl::openInputStream( 
        sinkMetadata.tracks[0].destination.device(std::move(hidlOutputDevice));

    }

#endif

#if MAJOR_VERSION == 7 && MINOR_VERSION == 1

    Return<void> ret = mDevice->openInputStream_7_1(

#else

    Return<void> ret = mDevice->openInputStream(

#endif

            handle, hidlDevice, hidlConfig, hidlFlags, sinkMetadata,

            [&](Result r, const sp<::android::hardware::audio::CPP_VERSION::IStreamIn>& result,

            [&](Result r,

                const sp<::android::hardware::audio::CORE_TYPES_CPP_VERSION::IStreamIn>& result,

                    const AudioConfig& suggestedConfig) {

                retval = r;

                if (retval == Result::OK) {

media/libaudiohal/impl/StreamHalHidl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ using ::android::hardware::Void; 


namespace android {



using ReadCommand = ::android::hardware::audio::CPP_VERSION::IStreamIn::ReadCommand;

using ReadCommand = ::android::hardware::audio::CORE_TYPES_CPP_VERSION::IStreamIn::ReadCommand;



using namespace ::android::hardware::audio::common::COMMON_TYPES_CPP_VERSION;

using namespace ::android::hardware::audio::CORE_TYPES_CPP_VERSION;
@@ -907,7 +907,7 @@ void StreamOutHalHidl::onRecommendedLatencyModeChanged( 




StreamInHalHidl::StreamInHalHidl(

        const sp<::android::hardware::audio::CPP_VERSION::IStreamIn>& stream)

        const sp<::android::hardware::audio::CORE_TYPES_CPP_VERSION::IStreamIn>& stream)

        : StreamHalHidl(stream.get()), mStream(stream), mReaderClient(0), mEfGroup(nullptr) {

}

media/libaudiohal/impl/StreamHalHidl.h

+7 −5
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <atomic>



#include PATH(android/hardware/audio/CORE_TYPES_FILE_VERSION/IStream.h)

#include PATH(android/hardware/audio/FILE_VERSION/IStreamIn.h)

#include PATH(android/hardware/audio/CORE_TYPES_FILE_VERSION/IStreamIn.h)

#include PATH(android/hardware/audio/FILE_VERSION/IStreamOut.h)

#include <fmq/EventFlag.h>

#include <fmq/MessageQueue.h>
@@ -35,8 +35,9 @@ using ::android::hardware::audio::CORE_TYPES_CPP_VERSION::IStream; 
using ::android::hardware::EventFlag;

using ::android::hardware::MessageQueue;

using ::android::hardware::Return;

using ReadParameters = ::android::hardware::audio::CPP_VERSION::IStreamIn::ReadParameters;

using ReadStatus = ::android::hardware::audio::CPP_VERSION::IStreamIn::ReadStatus;

using ReadParameters =

        ::android::hardware::audio::CORE_TYPES_CPP_VERSION::IStreamIn::ReadParameters;

using ReadStatus = ::android::hardware::audio::CORE_TYPES_CPP_VERSION::IStreamIn::ReadStatus;

using WriteCommand = ::android::hardware::audio::CPP_VERSION::IStreamOut::WriteCommand;

using WriteStatus = ::android::hardware::audio::CPP_VERSION::IStreamOut::WriteStatus;
@@ -262,7 +263,7 @@ class StreamInHalHidl : public StreamInHalInterface, public StreamHalHidl { 
    typedef MessageQueue<uint8_t, hardware::kSynchronizedReadWrite> DataMQ;

    typedef MessageQueue<ReadStatus, hardware::kSynchronizedReadWrite> StatusMQ;



    const sp<::android::hardware::audio::CPP_VERSION::IStreamIn> mStream;

    const sp<::android::hardware::audio::CORE_TYPES_CPP_VERSION::IStreamIn> mStream;

    std::unique_ptr<CommandMQ> mCommandMQ;

    std::unique_ptr<DataMQ> mDataMQ;

    std::unique_ptr<StatusMQ> mStatusMQ;
@@ -270,7 +271,8 @@ class StreamInHalHidl : public StreamInHalInterface, public StreamHalHidl { 
    EventFlag* mEfGroup;



    // Can not be constructed directly by clients.

    StreamInHalHidl(const sp<::android::hardware::audio::CPP_VERSION::IStreamIn>& stream);

    StreamInHalHidl(

            const sp<::android::hardware::audio::CORE_TYPES_CPP_VERSION::IStreamIn>& stream);



    virtual ~StreamInHalHidl();