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

Commit 40eb0159 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: Ife0a72e4b17c96c39c743be8ed75a52fbe66c2f6
parents f62ee019 16c41dd9
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -2093,12 +2093,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)",