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

Commit 3db4f4f8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "audiohal: Remove timeouts in eventflag waits"

parents a898440a b4e77913

media/libaudiohal/EffectHalHidl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ status_t EffectHalHidl::processImpl(uint32_t mqFlag) { 
    uint32_t efState = 0;

retry:

    status_t ret = mEfGroup->wait(

            static_cast<uint32_t>(MessageQueueFlagBits::DONE_PROCESSING), &efState, NS_PER_SEC);

            static_cast<uint32_t>(MessageQueueFlagBits::DONE_PROCESSING), &efState);

    if (efState & static_cast<uint32_t>(MessageQueueFlagBits::DONE_PROCESSING)) {

        Result retval = Result::NOT_INITIALIZED;

        mStatusMQ->read(&retval);

media/libaudiohal/StreamHalHidl.cpp

+2 −4
Original line number Diff line number Diff line
@@ -338,8 +338,7 @@ status_t StreamOutHalHidl::callWriterThread( 
    // TODO: Remove manual event flag handling once blocking MQ is implemented. b/33815422

    uint32_t efState = 0;

retry:

    status_t ret = mEfGroup->wait(

            static_cast<uint32_t>(MessageQueueFlagBits::NOT_FULL), &efState, NS_PER_SEC);

    status_t ret = mEfGroup->wait(static_cast<uint32_t>(MessageQueueFlagBits::NOT_FULL), &efState);

    if (efState & static_cast<uint32_t>(MessageQueueFlagBits::NOT_FULL)) {

        WriteStatus writeStatus;

        writeStatus.retval = Result::NOT_INITIALIZED;
@@ -597,8 +596,7 @@ status_t StreamInHalHidl::callReaderThread( 
    // TODO: Remove manual event flag handling once blocking MQ is implemented. b/33815422

    uint32_t efState = 0;

retry:

    status_t ret = mEfGroup->wait(

            static_cast<uint32_t>(MessageQueueFlagBits::NOT_EMPTY), &efState, NS_PER_SEC);

    status_t ret = mEfGroup->wait(static_cast<uint32_t>(MessageQueueFlagBits::NOT_EMPTY), &efState);

    if (efState & static_cast<uint32_t>(MessageQueueFlagBits::NOT_EMPTY)) {

        ReadStatus readStatus;

        readStatus.retval = Result::NOT_INITIALIZED;