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

Commit 4fc61619 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Remove dead code 

mFormat is unused in resampler
mClientTid is unused
local variable pid is unused in dump

Change-Id: Ib156e38029366620bfeff2a13e73471867155a5b
parent f55bc564

services/audioflinger/AudioFlinger.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -3259,7 +3259,6 @@ AudioFlinger::ThreadBase::TrackBase::TrackBase( 
        // mBufferEnd

        // mBufferEnd

        mFrameCount(0),

        mFrameCount(0),

        mState(IDLE),

        mState(IDLE),

        mClientTid(-1),

        mFormat(format),

        mFormat(format),

        mFlags(flags & ~SYSTEM_FLAGS_MASK),

        mFlags(flags & ~SYSTEM_FLAGS_MASK),

        mSessionId(sessionId)

        mSessionId(sessionId)
@@ -4631,7 +4630,6 @@ status_t AudioFlinger::RecordThread::dump(int fd, const Vector<String16>& args) 
    const size_t SIZE = 256;

    const size_t SIZE = 256;

    char buffer[SIZE];

    char buffer[SIZE];

    String8 result;

    String8 result;

    pid_t pid = 0;





    snprintf(buffer, SIZE, "\nInput thread %p internals\n", this);

    snprintf(buffer, SIZE, "\nInput thread %p internals\n", this);

    result.append(buffer);

    result.append(buffer);

services/audioflinger/AudioFlinger.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -376,7 +376,6 @@ private: 
            uint32_t            mFrameCount;

            uint32_t            mFrameCount;

            // we don't really need a lock for these

            // we don't really need a lock for these

            track_state         mState;

            track_state         mState;

            int                 mClientTid;

            const audio_format_t mFormat;

            const audio_format_t mFormat;

            uint32_t            mFlags;

            uint32_t            mFlags;

            const int           mSessionId;

            const int           mSessionId;

services/audioflinger/AudioResampler.cpp

+0 −6
Original line number Original line Diff line number Diff line
@@ -130,12 +130,6 @@ AudioResampler::AudioResampler(int bitDepth, int inChannelCount, 
    mVolume[0] = mVolume[1] = 0;

    mVolume[0] = mVolume[1] = 0;

    mBuffer.frameCount = 0;

    mBuffer.frameCount = 0;





    // save format for quick lookup

    if (inChannelCount == 1) {

        mFormat = MONO_16_BIT;

    } else {

        mFormat = STEREO_16_BIT;

    }

}

}





AudioResampler::~AudioResampler() {

AudioResampler::~AudioResampler() {

services/audioflinger/AudioResampler.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -66,7 +66,6 @@ protected: 
    // multiplier to calculate fixed point phase increment

    // multiplier to calculate fixed point phase increment

    static const double kPhaseMultiplier = 1L << kNumPhaseBits;

    static const double kPhaseMultiplier = 1L << kNumPhaseBits;





    enum format {MONO_16_BIT, STEREO_16_BIT};

    AudioResampler(int bitDepth, int inChannelCount, int32_t sampleRate);

    AudioResampler(int bitDepth, int inChannelCount, int32_t sampleRate);





    // prevent copying

    // prevent copying
@@ -83,7 +82,6 @@ protected: 
        uint32_t mVolumeRL;

        uint32_t mVolumeRL;

    };

    };

    int16_t mTargetVolume[2];

    int16_t mTargetVolume[2];

    format mFormat;

    size_t mInputIndex;

    size_t mInputIndex;

    int32_t mPhaseIncrement;

    int32_t mPhaseIncrement;

    uint32_t mPhaseFraction;

    uint32_t mPhaseFraction;