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

Commit 88876fb4 authored by Eric Laurent's avatar Eric Laurent
Browse files

AudioTrack: fix obtainBuffer timeout calculation 

AudioTrack::obtainBuffer() passes a pointer to a timeout
variable that has gone out of scope when calling
ClientProxy::obtainBuffer().

Same fix for AudioRecord.

Bug: 11968591.
Change-Id: I5b3d0d86ed2bd8c0412eb2432b1ab519d70efce9
parent 145b727b

media/libmedia/AudioRecord.cpp

+1 −1
Original line number Diff line number Diff line
@@ -545,13 +545,13 @@ status_t AudioRecord::obtainBuffer(Buffer* audioBuffer, int32_t waitCount) 
    }



    const struct timespec *requested;

    struct timespec timeout;

    if (waitCount == -1) {

        requested = &ClientProxy::kForever;

    } else if (waitCount == 0) {

        requested = &ClientProxy::kNonBlocking;

    } else if (waitCount > 0) {

        long long ms = WAIT_PERIOD_MS * (long long) waitCount;

        struct timespec timeout;

        timeout.tv_sec = ms / 1000;

        timeout.tv_nsec = (int) (ms % 1000) * 1000000;

        requested = &timeout;

media/libmedia/AudioTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1104,13 +1104,13 @@ status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, int32_t waitCount) 
    }



    const struct timespec *requested;

    struct timespec timeout;

    if (waitCount == -1) {

        requested = &ClientProxy::kForever;

    } else if (waitCount == 0) {

        requested = &ClientProxy::kNonBlocking;

    } else if (waitCount > 0) {

        long long ms = WAIT_PERIOD_MS * (long long) waitCount;

        struct timespec timeout;

        timeout.tv_sec = ms / 1000;

        timeout.tv_nsec = (int) (ms % 1000) * 1000000;

        requested = &timeout;