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

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

Merge "AudioRecord TRANSFER_OBTAIN can be used with FAST flag"

parents 957af4ce b7fbf7ec

media/libmedia/AudioRecord.cpp

+6 −3
Original line number Diff line number Diff line
@@ -438,9 +438,12 @@ status_t AudioRecord::openRecord_l(size_t epoch) 
    }



    // Client can only express a preference for FAST.  Server will perform additional tests.

    if ((mFlags & AUDIO_INPUT_FLAG_FAST) && !(

            // use case: callback transfer mode

            (mTransfer == TRANSFER_CALLBACK) &&

    if ((mFlags & AUDIO_INPUT_FLAG_FAST) && !((

            // either of these use cases:

            // use case 1: callback transfer mode

            (mTransfer == TRANSFER_CALLBACK) ||

            // use case 2: obtain/release mode

            (mTransfer == TRANSFER_OBTAIN)) &&

            // matching sample rate

            (mSampleRate == afSampleRate))) {

        ALOGW("AUDIO_INPUT_FLAG_FAST denied by client; transfer %d, track %u Hz, primary %u Hz",

services/audioflinger/Threads.cpp

+3 −2
Original line number Diff line number Diff line
@@ -5867,8 +5867,9 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe 
    // client expresses a preference for FAST, but we get the final say

    if (*flags & IAudioFlinger::TRACK_FAST) {

      if (

            // use case: callback handler

            (tid != -1) &&

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

            // but that is no longer required for TRANSFER_OBTAIN mode

            //

            // frame count is not specified, or is exactly the pipe depth

            ((frameCount == 0) || (frameCount == mPipeFramesP2)) &&

            // PCM data