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

Commit 3d48fac3 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

am df065195: am f578953e: Merge "AudioTrack in SoundPool uses... 

am df065195: am f578953e: Merge "AudioTrack in SoundPool uses audio_attributes_t parameter" into mnc-dev

* commit 'df065195':
  AudioTrack in SoundPool uses audio_attributes_t parameter
parents 41e2714c df065195

media/jni/soundpool/SoundPool.cpp

+6 −2
Original line number Diff line number Diff line
@@ -738,12 +738,16 @@ void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftV 
            // do not create a new audio track if current track is compatible with sample parameters

    #ifdef USE_SHARED_MEM_BUFFER

            newTrack = new AudioTrack(streamType, sampleRate, sample->format(),

                    channelMask, sample->getIMemory(), AUDIO_OUTPUT_FLAG_FAST, callback, userData);

                    channelMask, sample->getIMemory(), AUDIO_OUTPUT_FLAG_FAST, callback, userData,

                    0 /*default notification frames*/, AUDIO_SESSION_ALLOCATE,

                    AudioTrack::TRANSFER_DEFAULT,

                    NULL /*offloadInfo*/, -1 /*uid*/, -1 /*pid*/, mSoundPool->attributes());

    #else

            uint32_t bufferFrames = (totalFrames + (kDefaultBufferCount - 1)) / kDefaultBufferCount;

            newTrack = new AudioTrack(streamType, sampleRate, sample->format(),

                    channelMask, frameCount, AUDIO_OUTPUT_FLAG_FAST, callback, userData,

                    bufferFrames);

                    bufferFrames, AUDIO_SESSION_ALLOCATE, AudioTrack::TRANSFER_DEFAULT,

                    NULL /*offloadInfo*/, -1 /*uid*/, -1 /*pid*/, mSoundPool->attributes());

    #endif

            oldTrack = mAudioTrack;

            status = newTrack->initCheck();