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

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

Clean up Track constructor 

The 'thread' parameter can never be NULL.
Use constructor initialization list when possible.
Make more members const.
Only put the relevant code under "if (mCblk != NULL)".
Add comment about track name leak.

Change-Id: Ib963390a69bed1999638cc982a759edd1d5f4712
parent 54fa7254

services/audioflinger/AudioFlinger.cpp

+14 −10
Original line number Diff line number Diff line
@@ -3479,23 +3479,27 @@ AudioFlinger::PlaybackThread::Track::Track( 
            const sp<IMemory>& sharedBuffer,

            int sessionId)

    :   TrackBase(thread, client, sampleRate, format, channelMask, frameCount, sharedBuffer, sessionId),

    mMute(false), mSharedBuffer(sharedBuffer), mName(-1), mMainBuffer(NULL), mAuxBuffer(NULL),

    mMute(false),

    // mFillingUpStatus ?

    // mRetryCount initialized later when needed

    mSharedBuffer(sharedBuffer),

    mStreamType(streamType),

    mName(-1),  // see note below

    mMainBuffer(thread->mixBuffer()),

    mAuxBuffer(NULL),

    mAuxEffectId(0), mHasVolumeController(false)

{

    if (mCblk != NULL) {

        if (thread != NULL) {

        // NOTE: audio_track_cblk_t::frameSize for 8 bit PCM data is based on a sample size of

        // 16 bit because data is converted to 16 bit before being stored in buffer by AudioTrack

        mCblk->frameSize = audio_is_linear_pcm(format) ? mChannelCount * sizeof(int16_t) : sizeof(uint8_t);

        // to avoid leaking a track name, do not allocate one unless there is an mCblk

        mName = thread->getTrackName_l();

            mMainBuffer = thread->mixBuffer();

        }

        ALOGV("Track constructor name %d, calling pid %d", mName, IPCThreadState::self()->getCallingPid());

        if (mName < 0) {

            ALOGE("no more track names available");

        }

        mStreamType = streamType;

        // NOTE: audio_track_cblk_t::frameSize for 8 bit PCM data is based on a sample size of

        // 16 bit because data is converted to 16 bit before being stored in buffer by AudioTrack

        mCblk->frameSize = audio_is_linear_pcm(format) ? mChannelCount * sizeof(int16_t) : sizeof(uint8_t);

    }

    ALOGV("Track constructor name %d, calling pid %d", mName, IPCThreadState::self()->getCallingPid());

}



AudioFlinger::PlaybackThread::Track::~Track()

services/audioflinger/AudioFlinger.h

+2 −2
Original line number Diff line number Diff line
@@ -681,9 +681,9 @@ private: 
            enum {FS_FILLING, FS_FILLED, FS_ACTIVE};

            mutable uint8_t     mFillingUpStatus;

            int8_t              mRetryCount;

            sp<IMemory>         mSharedBuffer;

            const sp<IMemory>   mSharedBuffer;

            bool                mResetDone;

            audio_stream_type_t mStreamType;

            const audio_stream_type_t mStreamType;

            int                 mName;

            int16_t             *mMainBuffer;

            int32_t             *mAuxBuffer;