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

Commit d702a568 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Pull out commandToString() from FastMixerDumpState.cpp 

to FastThreadState.cpp, FastMixerState.cpp, and FastCaptureState.cpp

Change-Id: I872efb211e8a0335c42906367859d3674340e374
parent fbdb2ace

services/audioflinger/FastCaptureState.cpp

+15 −0
Original line number Diff line number Diff line
@@ -27,4 +27,19 @@ FastCaptureState::~FastCaptureState() 
{

}



// static

const char *FastCaptureState::commandToString(Command command)

{

    const char *str = FastThreadState::commandToString(command);

    if (str != NULL) {

        return str;

    }

    switch (command) {

    case FastCaptureState::READ:        return "READ";

    case FastCaptureState::WRITE:       return "WRITE";

    case FastCaptureState::READ_WRITE:  return "READ_WRITE";

    }

    LOG_ALWAYS_FATAL("%s", __func__);

}



}   // android

services/audioflinger/FastCaptureState.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ struct FastCaptureState : FastThreadState { 
        WRITE = 0x10,           // write to pipe sink

        READ_WRITE = 0x18;      // read from input source and write to pipe sink



    // never returns NULL; asserts if command is invalid

    static const char *commandToString(Command command);

};  // struct FastCaptureState



}   // namespace android

services/audioflinger/FastMixerDumpState.cpp

+1 −29
Original line number Diff line number Diff line
@@ -62,34 +62,6 @@ void FastMixerDumpState::dump(int fd) const 
        dprintf(fd, "  FastMixer not initialized\n");

        return;

    }

#define COMMAND_MAX 32

    char string[COMMAND_MAX];

    switch (mCommand) {

    case FastMixerState::INITIAL:

        strcpy(string, "INITIAL");

        break;

    case FastMixerState::HOT_IDLE:

        strcpy(string, "HOT_IDLE");

        break;

    case FastMixerState::COLD_IDLE:

        strcpy(string, "COLD_IDLE");

        break;

    case FastMixerState::EXIT:

        strcpy(string, "EXIT");

        break;

    case FastMixerState::MIX:

        strcpy(string, "MIX");

        break;

    case FastMixerState::WRITE:

        strcpy(string, "WRITE");

        break;

    case FastMixerState::MIX_WRITE:

        strcpy(string, "MIX_WRITE");

        break;

    default:

        snprintf(string, COMMAND_MAX, "%d", mCommand);

        break;

    }

    double measuredWarmupMs = (mMeasuredWarmupTs.tv_sec * 1000.0) +

            (mMeasuredWarmupTs.tv_nsec / 1000000.0);

    double mixPeriodSec = (double) mFrameCount / (double) mSampleRate;
@@ -97,7 +69,7 @@ void FastMixerDumpState::dump(int fd) const 
                "            numTracks=%u writeErrors=%u underruns=%u overruns=%u\n"

                "            sampleRate=%u frameCount=%zu measuredWarmup=%.3g ms, warmupCycles=%u\n"

                "            mixPeriod=%.2f ms\n",

                 string, mWriteSequence, mFramesWritten,

                 FastMixerState::commandToString(mCommand), mWriteSequence, mFramesWritten,

                 mNumTracks, mWriteErrors, mUnderruns, mOverruns,

                 mSampleRate, mFrameCount, measuredWarmupMs, mWarmupCycles,

                 mixPeriodSec * 1e3);

services/audioflinger/FastMixerState.cpp

+15 −0
Original line number Diff line number Diff line
@@ -39,4 +39,19 @@ FastMixerState::~FastMixerState() 
{

}



// static

const char *FastMixerState::commandToString(Command command)

{

    const char *str = FastThreadState::commandToString(command);

    if (str != NULL) {

        return str;

    }

    switch (command) {

    case FastMixerState::MIX:       return "MIX";

    case FastMixerState::WRITE:     return "WRITE";

    case FastMixerState::MIX_WRITE: return "MIX_WRITE";

    }

    LOG_ALWAYS_FATAL("%s", __func__);

}



}   // namespace android

services/audioflinger/FastMixerState.h

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ struct FastMixerState : FastThreadState { 


    // This might be a one-time configuration rather than per-state

    NBAIO_Sink* mTeeSink;       // if non-NULL, then duplicate write()s to this non-blocking sink



    // never returns NULL; asserts if command is invalid

    static const char *commandToString(Command command);

};  // struct FastMixerState



}   // namespace android