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

Commit d8075c8d authored by Ajender Reddy's avatar Ajender Reddy
Browse files

libaudiohal@aidl: adjust pause and flush for a stream 

pause: HAL pause can be achieved in one of the
playing/recording kind of states ACTIVE, TRANSFERRING,
or DRAINING. In other states, pause may be treated as success.

flush: HAL flush can be achieved in one of the flushable
states PAUSED, TRANSFER_PAUSED or DRAIN_PAUSED. In other
states, may be treated as success except for playing/recording
kind of states.

BUG: 356083752
Test: play compress offload playback

Change-Id: Ia7f3461d1c3aff87ab3398f35a431828d305543f
parent 3786f3d5

media/libaudiohal/impl/StreamHalAidl.cpp

+23 −4
Original line number Diff line number Diff line
@@ -417,8 +417,16 @@ status_t StreamHalAidl::pause(StreamDescriptor::Reply* reply) { 
    ALOGD("%p %s::%s", this, getClassName().c_str(), __func__);

    TIME_CHECK();

    if (!mStream) return NO_INIT;

    return sendCommand(makeHalCommand<HalCommand::Tag::pause>(), reply,



    if (const auto state = getState(); isInPlayOrRecordState(state)) {

        return sendCommand(

                makeHalCommand<HalCommand::Tag::pause>(), reply,

                true /*safeFromNonWorkerThread*/);  // The workers stops its I/O activity first.

    } else {

        ALOGD("%s: already stream in one of the PAUSED kind of states, current state: %s", __func__,

              toString(state).c_str());

        return OK;

    }

}



status_t StreamHalAidl::resume(StreamDescriptor::Reply* reply) {
@@ -473,8 +481,19 @@ status_t StreamHalAidl::flush(StreamDescriptor::Reply* reply) { 
    ALOGD("%p %s::%s", this, getClassName().c_str(), __func__);

    TIME_CHECK();

    if (!mStream) return NO_INIT;

    return sendCommand(makeHalCommand<HalCommand::Tag::flush>(), reply,



    if (const auto state = getState(); isInPausedState(state)) {

        return sendCommand(

                makeHalCommand<HalCommand::Tag::flush>(), reply,

                true /*safeFromNonWorkerThread*/);  // The workers stops its I/O activity first.

    } else if (isInPlayOrRecordState(state)) {

        ALOGE("%s: found stream in non-flushable state: %s", __func__, toString(state).c_str());

        return INVALID_OPERATION;

    } else {

        ALOGD("%s: already stream in one of the flushable state: current state: %s", __func__,

              toString(state).c_str());

        return OK;

    }

}



status_t StreamHalAidl::exit() {

media/libaudiohal/impl/StreamHalAidl.h

+25 −0
Original line number Diff line number Diff line
@@ -230,6 +230,31 @@ class StreamHalAidl : public virtual StreamHalInterface, public ConversionHelper 
        return false;

    }



    bool isInPlayOrRecordState(

            const ::aidl::android::hardware::audio::core::StreamDescriptor::State state) {

        if (state == ::aidl::android::hardware::audio::core::StreamDescriptor::State::ACTIVE ||

            state ==

                    ::aidl::android::hardware::audio::core::StreamDescriptor::State::TRANSFERRING ||

            state == ::aidl::android::hardware::audio::core::StreamDescriptor::State::DRAINING) {

            // play or record equivalent states

            return true;

        }

        return false;

    }



    bool isInPausedState(

            const ::aidl::android::hardware::audio::core::StreamDescriptor::State& state) {

        if (state == ::aidl::android::hardware::audio::core::StreamDescriptor::State::PAUSED ||

            state ==

                    ::aidl::android::hardware::audio::core::StreamDescriptor::State::DRAIN_PAUSED ||

            state == ::aidl::android::hardware::audio::core::StreamDescriptor::State::

                             TRANSFER_PAUSED) {

            // pause equivalent states

            return true;

        }

        return false;

    }



    status_t getLatency(uint32_t *latency);



    // Always returns non-negative values.