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

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

Merge "Allow TRANSFER_OBTAIN to be used for fast tracks"

parents 172e2c5a 1dfe2f9c

media/libmedia/AudioTrack.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1002,7 +1002,9 @@ status_t AudioTrack::createTrack_l() 
            // use case 1: shared buffer

            (mSharedBuffer != 0) ||

            // use case 2: callback transfer mode

            (mTransfer == TRANSFER_CALLBACK)) &&

            (mTransfer == TRANSFER_CALLBACK) ||

            // use case 3: obtain/release mode

            (mTransfer == TRANSFER_OBTAIN)) &&

            // matching sample rate

            (mSampleRate == afSampleRate))) {

        ALOGW("AUDIO_OUTPUT_FLAG_FAST denied by client");

services/audioflinger/Threads.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1550,9 +1550,10 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac 
              (

                (sharedBuffer != 0)

              ) ||

              // use case 2: callback handler and frame count is default or at least as large as HAL

              // use case 2: frame count is default or at least as large as HAL

              (

                (tid != -1) &&

                // we formerly checked for a callback handler (non-0 tid),

                // but that is no longer required for TRANSFER_OBTAIN mode

                ((frameCount == 0) ||

                (frameCount >= mFrameCount))

              )