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

Commit f79cbd93 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 24337 into eclair 

* changes:
  Fix issue 2107584: media server crash when AudioFlinger fails to allocate memory for track control block.
parents 4f5d9bd8 6ad8c64c

libs/audioflinger/AudioFlinger.cpp

+27 −22
Original line number Diff line number Diff line
@@ -2014,6 +2014,7 @@ AudioFlinger::ThreadBase::TrackBase::TrackBase( 
    :   RefBase(),

        mThread(thread),

        mClient(client),

        mCblk(0),

        mFrameCount(0),

        mState(IDLE),

        mClientTid(-1),
@@ -2162,6 +2163,7 @@ AudioFlinger::PlaybackThread::Track::Track( 
    :   TrackBase(thread, client, sampleRate, format, channelCount, frameCount, 0, sharedBuffer),

    mMute(false), mSharedBuffer(sharedBuffer), mName(-1)

{

    if (mCblk != NULL) {

        sp<ThreadBase> baseThread = thread.promote();

        if (baseThread != 0) {

            PlaybackThread *playbackThread = (PlaybackThread *)baseThread.get();
@@ -2178,6 +2180,7 @@ AudioFlinger::PlaybackThread::Track::Track( 
        // 16 bit because data is converted to 16 bit before being stored in buffer by AudioTrack

        mCblk->frameSize = AudioSystem::isLinearPCM(format) ? channelCount * sizeof(int16_t) : sizeof(int8_t);

    }

}



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

{
@@ -2390,6 +2393,7 @@ AudioFlinger::RecordThread::RecordTrack::RecordTrack( 
                  channelCount, frameCount, flags, 0),

        mOverflow(false)

{

    if (mCblk != NULL) {

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

       if (format == AudioSystem::PCM_16_BIT) {

           mCblk->frameSize = channelCount * sizeof(int16_t);
@@ -2399,6 +2403,7 @@ AudioFlinger::RecordThread::RecordTrack::RecordTrack( 
           mCblk->frameSize = sizeof(int8_t);

       }

    }

}



AudioFlinger::RecordThread::RecordTrack::~RecordTrack()

{