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

Commit 684e0ae8 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android Git Automerger
Browse files

am 9a98b6de: Merge "Partial fix for SoundPool not terminating" into klp-dev 

* commit '9a98b6de':
  Partial fix for SoundPool not terminating
parents ec467110 9a98b6de

media/libmedia/SoundPool.cpp

+2 −2
Original line number Diff line number Diff line
@@ -740,8 +740,8 @@ void SoundChannel::process(int event, void *info, unsigned long toggle) 
            b->size = count;

            //ALOGV("buffer=%p, [0]=%d", b->i16, b->i16[0]);

        }

    } else if (event == AudioTrack::EVENT_UNDERRUN) {

        ALOGV("process %p channel %d EVENT_UNDERRUN", this, mChannelID);

    } else if (event == AudioTrack::EVENT_UNDERRUN || event == AudioTrack::EVENT_BUFFER_END) {

        ALOGV("process %p channel %d EVENT_UNDERRUN or EVENT_BUFFER_END", this, mChannelID);

        mSoundPool->addToStopList(this);

    } else if (event == AudioTrack::EVENT_LOOP_END) {

        ALOGV("End loop %p channel %d count %d", this, mChannelID, *(int *)info);