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

Commit eb1211df authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use index mask when there is no valid input mask from output mask." am:...

Merge "Use index mask when there is no valid input mask from output mask." am: a646890c am: c9168aae am: 9ae38a68

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



Change-Id: I9af5d7991c83428ec405519780b690a5705d603d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6965a4d4 9ae38a68
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -3704,6 +3704,12 @@ void AudioFlinger::updateSecondaryOutputsForTrack_l(

        using namespace std::chrono_literals;
        auto inChannelMask = audio_channel_mask_out_to_in(track->channelMask());
        if (inChannelMask == AUDIO_CHANNEL_INVALID) {
            // The downstream PatchTrack has the proper output channel mask,
            // so if there is no input channel mask equivalent, we can just
            // use an index mask here to create the PatchRecord.
            inChannelMask = audio_channel_mask_out_to_in_index_mask(track->channelMask());
        }
        sp patchRecord = new RecordThread::PatchRecord(nullptr /* thread */,
                                                       track->sampleRate(),
                                                       inChannelMask,