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

Commit c0fc041d 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:...

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

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

Change-Id: I433726242391016f6b408214ee7a333db3d7a08f
parents 85f96074 c8ab37b6
Loading
Loading
Loading
Loading
+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)",