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

Commit 75da4224 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "libaudiohal@aidl: Fix handling of "unknown" position" into main am:... 

Merge "libaudiohal@aidl: Fix handling of "unknown" position" into main am: 02aa5103 am: 528c78d9

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



Change-Id: I8b0a0e14aca2a128caf308c8902a91065127ca58
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fb0e9549 528c78d9

media/libaudiohal/impl/StreamHalAidl.cpp

+21 −7
Original line number Diff line number Diff line
@@ -367,8 +367,12 @@ status_t StreamHalAidl::getObservablePosition(int64_t* frames, int64_t* timestam 
    if (!mStream) return NO_INIT;

    StreamDescriptor::Reply reply;

    RETURN_STATUS_IF_ERROR(updateCountersIfNeeded(&reply, statePositions));

    *frames = std::max<int64_t>(0, reply.observable.frames);

    *timestamp = std::max<int64_t>(0, reply.observable.timeNs);

    if (reply.observable.frames == StreamDescriptor::Position::UNKNOWN ||

        reply.observable.timeNs == StreamDescriptor::Position::UNKNOWN) {

        return INVALID_OPERATION;

    }

    *frames = reply.observable.frames;

    *timestamp = reply.observable.timeNs;

    return OK;

}
@@ -377,8 +381,12 @@ status_t StreamHalAidl::getHardwarePosition(int64_t *frames, int64_t *timestamp) 
    if (!mStream) return NO_INIT;

    StreamDescriptor::Reply reply;

    RETURN_STATUS_IF_ERROR(updateCountersIfNeeded(&reply));

    *frames = std::max<int64_t>(0, reply.hardware.frames);

    *timestamp = std::max<int64_t>(0, reply.hardware.timeNs);

    if (reply.hardware.frames == StreamDescriptor::Position::UNKNOWN ||

        reply.hardware.timeNs == StreamDescriptor::Position::UNKNOWN) {

        return INVALID_OPERATION;

    }

    *frames = reply.hardware.frames;

    *timestamp = reply.hardware.timeNs;

    return OK;

}
@@ -387,7 +395,10 @@ status_t StreamHalAidl::getXruns(int32_t *frames) { 
    if (!mStream) return NO_INIT;

    StreamDescriptor::Reply reply;

    RETURN_STATUS_IF_ERROR(updateCountersIfNeeded(&reply));

    *frames = std::max<int32_t>(0, reply.xrunFrames);

    if (reply.xrunFrames == StreamDescriptor::Position::UNKNOWN) {

        return INVALID_OPERATION;

    }

    *frames = reply.xrunFrames;

    return OK;

}
@@ -577,7 +588,9 @@ void StreamHalAidl::onAsyncDrainReady() { 
        // For compatibility with HIDL behavior, apply a "soft" position reset

        // after receiving the "drain ready" callback.

        std::lock_guard l(mLock);

        if (mLastReply.observable.frames != StreamDescriptor::Position::UNKNOWN) {

            mStatePositions.framesAtFlushOrDrain = mLastReply.observable.frames;

        }

    } else {

        AUGMENT_LOG(W, "unexpected onDrainReady in the state %s", toString(state).c_str());

    }
@@ -670,7 +683,8 @@ status_t StreamHalAidl::sendCommand( 
            }

            mLastReply = *reply;

            mLastReplyExpirationNs = uptimeNanos() + mLastReplyLifeTimeNs;

            if (!mIsInput && reply->status == STATUS_OK) {

            if (!mIsInput && reply->status == STATUS_OK &&

                    reply->observable.frames != StreamDescriptor::Position::UNKNOWN) {

                if (command.getTag() == StreamDescriptor::Command::standby &&

                        reply->state == StreamDescriptor::State::STANDBY) {

                    mStatePositions.framesAtStandby = reply->observable.frames;