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

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

Merge "Remove obsolete mBufferEnd"

parents b283374c 35cc4f31

services/audioflinger/TrackBase.h

+0 −2
Original line number Diff line number Diff line
@@ -118,8 +118,6 @@ protected: 
    audio_track_cblk_t* mCblk;

    void*               mBuffer;    // start of track buffer, typically in shared memory

                                    // except for OutputTrack when it is in local memory

    void*               mBufferEnd; // &mBuffer[mFrameCount * frameSize], where frameSize

                                    //   is based on mChannelCount and 16-bit samples

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

    track_state         mState;

    const uint32_t      mSampleRate;    // initial sample rate only; for tracks which

services/audioflinger/Tracks.cpp

+3 −5
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ AudioFlinger::ThreadBase::TrackBase::TrackBase( 
        mClient(client),

        mCblk(NULL),

        // mBuffer

        // mBufferEnd

        mState(IDLE),

        mSampleRate(sampleRate),

        mFormat(format),
@@ -133,7 +132,6 @@ AudioFlinger::ThreadBase::TrackBase::TrackBase( 
            mCblk->flags = CBLK_FORCEREADY;     // FIXME hack, need to fix the track ready logic

#endif

        }

        mBufferEnd = (uint8_t *)mBuffer + bufferSize;



#ifdef TEE_SINK

        if (mTeeSinkTrackEnabled) {
@@ -1399,9 +1397,9 @@ AudioFlinger::PlaybackThread::OutputTrack::OutputTrack( 
        mOutBuffer.frameCount = 0;

        playbackThread->mTracks.add(this);

        ALOGV("OutputTrack constructor mCblk %p, mBuffer %p, "

                "mCblk->frameCount_ %u, mChannelMask 0x%08x mBufferEnd %p",

                "mCblk->frameCount_ %u, mChannelMask 0x%08x",

                mCblk, mBuffer,

                mCblk->frameCount_, mChannelMask, mBufferEnd);

                mCblk->frameCount_, mChannelMask);

        // since client and server are in the same process,

        // the buffer has the same virtual address on both sides

        mClientProxy = new AudioTrackClientProxy(mCblk, mBuffer, mFrameCount, mFrameSize);
@@ -1656,7 +1654,7 @@ AudioFlinger::RecordThread::RecordTrack::RecordTrack( 
                  channelMask, frameCount, 0 /*sharedBuffer*/, sessionId, false /*isOut*/),

        mOverflow(false)

{

    ALOGV("RecordTrack constructor, size %d", (int)mBufferEnd - (int)mBuffer);

    ALOGV("RecordTrack constructor");

    if (mCblk != NULL) {

        mAudioRecordServerProxy = new AudioRecordServerProxy(mCblk, mBuffer, frameCount,

                mFrameSize);