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

Commit 109fdae2 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android Git Automerger
Browse files

am e0efd5f6: Merge "Remove dead code"

* commit 'e0efd5f6':
  Remove dead code
parents fdc8b7a4 e0efd5f6
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -3259,7 +3259,6 @@ AudioFlinger::ThreadBase::TrackBase::TrackBase(
        // mBufferEnd
        mFrameCount(0),
        mState(IDLE),
        mClientTid(-1),
        mFormat(format),
        mFlags(flags & ~SYSTEM_FLAGS_MASK),
        mSessionId(sessionId)
@@ -4631,7 +4630,6 @@ status_t AudioFlinger::RecordThread::dump(int fd, const Vector<String16>& args)
    const size_t SIZE = 256;
    char buffer[SIZE];
    String8 result;
    pid_t pid = 0;

    snprintf(buffer, SIZE, "\nInput thread %p internals\n", this);
    result.append(buffer);
+0 −1
Original line number Diff line number Diff line
@@ -376,7 +376,6 @@ private:
            uint32_t            mFrameCount;
            // we don't really need a lock for these
            track_state         mState;
            int                 mClientTid;
            const audio_format_t mFormat;
            uint32_t            mFlags;
            const int           mSessionId;
+0 −6
Original line number Diff line number Diff line
@@ -130,12 +130,6 @@ AudioResampler::AudioResampler(int bitDepth, int inChannelCount,
    mVolume[0] = mVolume[1] = 0;
    mBuffer.frameCount = 0;

    // save format for quick lookup
    if (inChannelCount == 1) {
        mFormat = MONO_16_BIT;
    } else {
        mFormat = STEREO_16_BIT;
    }
}

AudioResampler::~AudioResampler() {
+0 −2
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ protected:
    // multiplier to calculate fixed point phase increment
    static const double kPhaseMultiplier = 1L << kNumPhaseBits;

    enum format {MONO_16_BIT, STEREO_16_BIT};
    AudioResampler(int bitDepth, int inChannelCount, int32_t sampleRate);

    // prevent copying
@@ -83,7 +82,6 @@ protected:
        uint32_t mVolumeRL;
    };
    int16_t mTargetVolume[2];
    format mFormat;
    size_t mInputIndex;
    int32_t mPhaseIncrement;
    uint32_t mPhaseFraction;