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

Commit d3092e31 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary level of priority indirection"

parents 279ad356 993fccec

include/private/media/AudioTrackShared.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ namespace android { 


// ----------------------------------------------------------------------------



#define THREAD_PRIORITY_AUDIO_CLIENT (ANDROID_PRIORITY_AUDIO)

// Maximum cumulated timeout milliseconds before restarting audioflinger thread

#define MAX_STARTUP_TIMEOUT_MS  3000    // Longer timeout period at startup to cope with A2DP init time

#define MAX_RUN_TIMEOUT_MS      1000

media/libmedia/AudioRecord.cpp

+2 −2
Original line number Diff line number Diff line
@@ -315,9 +315,9 @@ status_t AudioRecord::start() 
            cblk->bufferTimeoutMs = MAX_RUN_TIMEOUT_MS;

            cblk->waitTimeMs = 0;

            if (t != 0) {

               t->run("ClientRecordThread", THREAD_PRIORITY_AUDIO_CLIENT);

               t->run("ClientRecordThread", ANDROID_PRIORITY_AUDIO);

            } else {

                setpriority(PRIO_PROCESS, 0, THREAD_PRIORITY_AUDIO_CLIENT);

                setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_AUDIO);

            }

        } else {

            mActive = 0;

media/libmedia/AudioTrack.cpp

+2 −2
Original line number Diff line number Diff line
@@ -342,9 +342,9 @@ void AudioTrack::start() 
        cblk->waitTimeMs = 0;

        android_atomic_and(~CBLK_DISABLED_ON, &cblk->flags);

        if (t != 0) {

           t->run("AudioTrackThread", THREAD_PRIORITY_AUDIO_CLIENT);

           t->run("AudioTrackThread", ANDROID_PRIORITY_AUDIO);

        } else {

            setpriority(PRIO_PROCESS, 0, THREAD_PRIORITY_AUDIO_CLIENT);

            setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_AUDIO);

        }



        LOGV("start %p before lock cblk %p", this, mCblk);