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

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

Merge "aaudio: update state for legacy mode" into oc-mr1-dev

parents 0a182255 0befec60

media/libaaudio/examples/loopback/src/loopback.cpp

+12 −5
Original line number Diff line number Diff line
@@ -417,11 +417,18 @@ int main(int argc, const char **argv) 
            sleep(1);

            printf("%4d: ", i);

            loopbackData.loopbackProcessor->printStatus();

            int64_t framesWritten = AAudioStream_getFramesWritten(loopbackData.inputStream);

            int64_t framesRead = AAudioStream_getFramesRead(loopbackData.inputStream);

            printf(" input written = %lld, read %lld, xruns = %d\n",

                   (long long) framesWritten,

                   (long long) framesRead,



            int64_t inputFramesWritten = AAudioStream_getFramesWritten(loopbackData.inputStream);

            int64_t inputFramesRead = AAudioStream_getFramesRead(loopbackData.inputStream);

            int64_t outputFramesWritten = AAudioStream_getFramesWritten(outputStream);

            int64_t outputFramesRead = AAudioStream_getFramesRead(outputStream);

            printf(" INPUT: wr %lld rd %lld state %s, OUTPUT: wr %lld rd %lld state %s, xruns %d\n",

                   (long long) inputFramesWritten,

                   (long long) inputFramesRead,

                   AAudio_convertStreamStateToText(AAudioStream_getState(loopbackData.inputStream)),

                   (long long) outputFramesWritten,

                   (long long) outputFramesRead,

                   AAudio_convertStreamStateToText(AAudioStream_getState(outputStream)),

                   AAudioStream_getXRunCount(outputStream)

            );

        }

media/libaaudio/src/client/AudioStreamInternal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ aaudio_result_t AudioStreamInternal::getTimestamp(clockid_t clockId, 
    }

}



aaudio_result_t AudioStreamInternal::updateStateWhileWaiting() {

aaudio_result_t AudioStreamInternal::updateStateMachine() {

    if (isDataCallbackActive()) {

        return AAUDIO_OK; // state is getting updated by the callback thread read/write call

    }

media/libaaudio/src/client/AudioStreamInternal.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public: 
                                       int64_t *framePosition,

                                       int64_t *timeNanoseconds) override;



    virtual aaudio_result_t updateStateWhileWaiting() override;

    virtual aaudio_result_t updateStateMachine() override;



    aaudio_result_t open(const AudioStreamBuilder &builder) override;

media/libaaudio/src/core/AudioStream.cpp

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ aaudio_result_t AudioStream::waitForStateChange(aaudio_stream_state_t currentSta 
                                                aaudio_stream_state_t *nextState,

                                                int64_t timeoutNanoseconds)

{

    aaudio_result_t result = updateStateWhileWaiting();

    aaudio_result_t result = updateStateMachine();

    if (result != AAUDIO_OK) {

        return result;

    }
@@ -112,7 +112,7 @@ aaudio_result_t AudioStream::waitForStateChange(aaudio_stream_state_t currentSta 
        AudioClock::sleepForNanos(durationNanos);

        timeoutNanoseconds -= durationNanos;



        aaudio_result_t result = updateStateWhileWaiting();

        aaudio_result_t result = updateStateMachine();

        if (result != AAUDIO_OK) {

            return result;

        }

media/libaaudio/src/core/AudioStream.h

+2 −2
Original line number Diff line number Diff line
@@ -68,10 +68,10 @@ public: 




    /**

     * Update state while in the middle of waitForStateChange()

     * Update state machine.()

     * @return

     */

    virtual aaudio_result_t updateStateWhileWaiting() = 0;

    virtual aaudio_result_t updateStateMachine() = 0;





    // =========== End ABSTRACT methods ===========================