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

Commit 22568387 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Force DIRECT flag on direct output thread."" into rvc-dev am: 16c41dd9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12059582

Change-Id: I9400bff30c736d56cfc66e10bbf821a1f0efba96
parents 90dcc0b7 16c41dd9

services/audioflinger/Threads.cpp

+0 −6
Original line number Diff line number Diff line
@@ -2092,12 +2092,6 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac 
        outputFlags = (audio_output_flags_t)(outputFlags | AUDIO_OUTPUT_FLAG_FAST);

    }



    // Set DIRECT flag if current thread is DirectOutputThread. This can happen when the playback is

    // rerouted to direct output thread by dynamic audio policy.

    if (mType == DIRECT) {

        *flags = (audio_output_flags_t)(*flags | AUDIO_OUTPUT_FLAG_DIRECT);

    }



    // Check if requested flags are compatible with output stream flags

    if ((*flags & outputFlags) != *flags) {

        ALOGW("createTrack_l(): mismatch between requested flags (%08x) and output flags (%08x)",