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

Commit 6d8018f0 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Improve audio logs and dumpsys media.audio_flinger 

Include mFrameCount in shared memory corrupt error log.

Fix typo in log for primary audio interface.

Include the new server frame count in logs for fast tracks.

Always log when fast is successful for output tracks, as it helpful
  (was already there for input).

Cleanup dumpsys for threads.

Bug: 37153050
Test: builds OK, and logs contain more information
Change-Id: I2b5b4d700e8eb7c261a3125fb03ddc00bf08537e
(cherry picked from commit 1bfe09a0)
parent eb12e8bd

media/libaudioclient/AudioRecord.cpp

+2 −2
Original line number Diff line number Diff line
@@ -645,10 +645,10 @@ status_t AudioRecord::openRecord_l(const Modulo<uint32_t> &epoch, const String16 
    mAwaitBoost = false;

    if (mFlags & AUDIO_INPUT_FLAG_FAST) {

        if (flags & AUDIO_INPUT_FLAG_FAST) {

            ALOGI("AUDIO_INPUT_FLAG_FAST successful; frameCount %zu", frameCount);

            ALOGI("AUDIO_INPUT_FLAG_FAST successful; frameCount %zu -> %zu", frameCount, temp);

            mAwaitBoost = true;

        } else {

            ALOGW("AUDIO_INPUT_FLAG_FAST denied by server; frameCount %zu", frameCount);

            ALOGW("AUDIO_INPUT_FLAG_FAST denied by server; frameCount %zu -> %zu", frameCount, temp);

            mFlags = (audio_input_flags_t) (mFlags & ~(AUDIO_INPUT_FLAG_FAST |

                    AUDIO_INPUT_FLAG_RAW));

            continue;   // retry

media/libaudioclient/AudioTrack.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1479,12 +1479,13 @@ status_t AudioTrack::createTrack_l() 
    mAwaitBoost = false;

    if (mFlags & AUDIO_OUTPUT_FLAG_FAST) {

        if (flags & AUDIO_OUTPUT_FLAG_FAST) {

            ALOGV("AUDIO_OUTPUT_FLAG_FAST successful; frameCount %zu", frameCount);

            ALOGI("AUDIO_OUTPUT_FLAG_FAST successful; frameCount %zu -> %zu", frameCount, temp);

            if (!mThreadCanCallJava) {

                mAwaitBoost = true;

            }

        } else {

            ALOGW("AUDIO_OUTPUT_FLAG_FAST denied by server; frameCount %zu", frameCount);

            ALOGW("AUDIO_OUTPUT_FLAG_FAST denied by server; frameCount %zu -> %zu", frameCount,

                    temp);

        }

    }

    mFlags = flags;

media/libaudioclient/AudioTrackShared.cpp

+4 −2
Original line number Diff line number Diff line
@@ -696,7 +696,8 @@ status_t ServerProxy::obtainBuffer(Buffer* buffer, bool ackFlush) 
    ssize_t filled = rear - front;

    // pipe should not already be overfull

    if (!(0 <= filled && (size_t) filled <= mFrameCount)) {

        ALOGE("Shared memory control block is corrupt (filled=%zd); shutting down", filled);

        ALOGE("Shared memory control block is corrupt (filled=%zd, mFrameCount=%zu); shutting down",

                filled, mFrameCount);

        mIsShutdown = true;

    }

    if (mIsShutdown) {
@@ -820,7 +821,8 @@ size_t AudioTrackServerProxy::framesReady() 
    ssize_t filled = rear - cblk->u.mStreaming.mFront;

    // pipe should not already be overfull

    if (!(0 <= filled && (size_t) filled <= mFrameCount)) {

        ALOGE("Shared memory control block is corrupt (filled=%zd); shutting down", filled);

        ALOGE("Shared memory control block is corrupt (filled=%zd, mFrameCount=%zu); shutting down",

                filled, mFrameCount);

        mIsShutdown = true;

        return 0;

    }

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2044,7 +2044,7 @@ status_t AudioFlinger::openOutput(audio_module_handle_t module, 


            // the first primary output opened designates the primary hw device

            if ((mPrimaryHardwareDev == NULL) && (flags & AUDIO_OUTPUT_FLAG_PRIMARY)) {

                ALOGI("Using module %d has the primary audio interface", module);

                ALOGI("Using module %d as the primary audio interface", module);

                mPrimaryHardwareDev = playbackThread->getOutput()->audioHwDev;



                AutoMutex lock(mHardwareLock);

services/audioflinger/FastThread.cpp

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ bool FastThread::threadLoop() 
                }

                int policy = sched_getscheduler(0) & ~SCHED_RESET_ON_FORK;

                if (!(policy == SCHED_FIFO || policy == SCHED_RR)) {

                    ALOGE("did not receive expected priority boost");

                    ALOGE("did not receive expected priority boost on time");

                }

                // This may be overly conservative; there could be times that the normal mixer

                // requests such a brief cold idle that it doesn't require resetting this flag.