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

Commit 837a55ca authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12241618 from 6522abdd to 24Q4-release

Change-Id: Ia7764a9c67a3f468afd375e5629637d5604639f1
parents 01e2b050 6522abdd
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -327,10 +327,10 @@ c2_status_t MultiAccessUnitHelper::scatter(
                newWork->worklets.front()->component = inWork->worklets.front()->component;
                std::vector<std::unique_ptr<C2Tuning>> tunings;
                for (std::unique_ptr<C2Tuning>& tuning : inWork->worklets.front()->tunings) {
                    tunings.push_back(std::move(
                    tunings.push_back(
                            std::unique_ptr<C2Tuning>(
                                    static_cast<C2Tuning*>(
                                            C2Param::Copy(*(tuning.get())).release()))));
                                            C2Param::Copy(*(tuning.get())).release())));
                }
                newWork->worklets.front()->tunings = std::move(tunings);
            }
@@ -344,7 +344,7 @@ c2_status_t MultiAccessUnitHelper::scatter(
                    << inputOrdinal.frameIndex.peekull()
                    << ") -> newFrameIndex " << newFrameIdx
                    <<" : input ts " << inputOrdinal.timestamp.peekull();
            sliceWork.push_back(std::move(cloneInputWork(w, w->input.flags)));
            sliceWork.push_back(cloneInputWork(w, w->input.flags));
            if (!w->input.buffers.empty() && w->input.buffers.front() != nullptr) {
                sliceWork.back()->input.buffers = std::move(w->input.buffers);
            }
+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ private:
                                    .id = getId(mClient),
                                    .name = mCodecName,
                                    .importance = mImportance};
        return std::move(clientInfo);
        return clientInfo;
    }

private:
+1 −1
Original line number Diff line number Diff line
@@ -4569,7 +4569,7 @@ sp<IAfEffectHandle> AudioFlinger::createOrphanEffect_l(
            // TODO(b/184194057): Use the vibrator information from the vibrator that will be used
            // for the HapticGenerator.
            const std::optional<media::AudioVibratorInfo> defaultVibratorInfo =
                    std::move(getDefaultVibratorInfo_l());
                    getDefaultVibratorInfo_l();
            if (defaultVibratorInfo) {
                // Only set the vibrator info when it is a valid one.
                audio_utils::lock_guard _cl(chain->mutex());
+2 −2
Original line number Diff line number Diff line
@@ -1704,7 +1704,7 @@ sp<IAfEffectHandle> ThreadBase::createEffect_l(
            // TODO(b/184194057): Use the vibrator information from the vibrator that will be used
            // for the HapticGenerator.
            const std::optional<media::AudioVibratorInfo> defaultVibratorInfo =
                    std::move(mAfThreadCallback->getDefaultVibratorInfo_l());
                    mAfThreadCallback->getDefaultVibratorInfo_l();
            if (defaultVibratorInfo) {
                audio_utils::lock_guard _cl(chain->mutex());
                // Only set the vibrator info when it is a valid one.
@@ -2925,7 +2925,7 @@ status_t PlaybackThread::addTrack_l(const sp<IAfTrack>& track)
                // TODO(b/184194780): Use the vibrator information from the vibrator that will be
                // used to play this track.
                 audio_utils::lock_guard _l(mAfThreadCallback->mutex());
                vibratorInfo = std::move(mAfThreadCallback->getDefaultVibratorInfo_l());
                vibratorInfo = mAfThreadCallback->getDefaultVibratorInfo_l();
            }
            mutex().lock();
            track->setHapticScale(hapticScale);
+3 −2
Original line number Diff line number Diff line
@@ -6358,10 +6358,11 @@ bool AudioPolicyManager::canBeSpatializedInt(const audio_attributes_t *attr,
    // mode is not requested.

    if (config != nullptr && *config != AUDIO_CONFIG_INITIALIZER) {
        static const bool stereo_spatialization_enabled =
        static const bool stereo_spatialization_prop_enabled =
                property_get_bool("ro.audio.stereo_spatialization_enabled", false);
        const bool channel_mask_spatialized =
                (stereo_spatialization_enabled && com_android_media_audio_stereo_spatialization())
                (stereo_spatialization_prop_enabled
                        && com_android_media_audio_stereo_spatialization())
                ? audio_channel_mask_contains_stereo(config->channel_mask)
                : audio_is_channel_mask_spatialized(config->channel_mask);
        if (!channel_mask_spatialized) {
Loading