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

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

Snap for 7655020 from 3e295742 to sc-v2-release 

Change-Id: I297d699b8eb07af22acb5dab711849bd347c66bf
parents d75c1db5 3e295742

media/libheadtracking/HeadTrackingProcessor-test.cpp

+4 −4
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ TEST(HeadTrackingProcessor, Initial) { 
    for (auto mode : {HeadTrackingMode::STATIC, HeadTrackingMode::WORLD_RELATIVE,

                      HeadTrackingMode::SCREEN_RELATIVE}) {

        std::unique_ptr<HeadTrackingProcessor> processor =

                createHeadTrackingProcess(Options{}, mode);

                createHeadTrackingProcessor(Options{}, mode);

        processor->calculate(0);

        EXPECT_EQ(processor->getActualMode(), HeadTrackingMode::STATIC);

        EXPECT_EQ(processor->getHeadToStagePose(), Pose3f());
@@ -47,7 +47,7 @@ TEST(HeadTrackingProcessor, BasicComposition) { 
    const float physicalToLogical = M_PI_2;



    std::unique_ptr<HeadTrackingProcessor> processor =

            createHeadTrackingProcess(Options{}, HeadTrackingMode::SCREEN_RELATIVE);

            createHeadTrackingProcessor(Options{}, HeadTrackingMode::SCREEN_RELATIVE);

    processor->setWorldToHeadPose(0, worldToHead, Twist3f());

    processor->setWorldToScreenPose(0, worldToScreen);

    processor->setScreenToStagePose(screenToStage);
@@ -74,7 +74,7 @@ TEST(HeadTrackingProcessor, Prediction) { 
    const Twist3f headTwist{{4, 5, 6}, quaternionToRotationVector(Quaternionf::UnitRandom()) / 10};

    const Pose3f worldToScreen{{4, 5, 6}, Quaternionf::UnitRandom()};



    std::unique_ptr<HeadTrackingProcessor> processor = createHeadTrackingProcess(

    std::unique_ptr<HeadTrackingProcessor> processor = createHeadTrackingProcessor(

            Options{.predictionDuration = 2.f}, HeadTrackingMode::WORLD_RELATIVE);

    processor->setWorldToHeadPose(0, worldToHead, headTwist);

    processor->setWorldToScreenPose(0, worldToScreen);
@@ -97,7 +97,7 @@ TEST(HeadTrackingProcessor, Prediction) { 
TEST(HeadTrackingProcessor, SmoothModeSwitch) {

    const Pose3f targetHeadToWorld = Pose3f({4, 0, 0}, rotateZ(M_PI / 2));



    std::unique_ptr<HeadTrackingProcessor> processor = createHeadTrackingProcess(

    std::unique_ptr<HeadTrackingProcessor> processor = createHeadTrackingProcessor(

            Options{.maxTranslationalVelocity = 1}, HeadTrackingMode::STATIC);



    processor->calculate(0);

media/libheadtracking/HeadTrackingProcessor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ class HeadTrackingProcessorImpl : public HeadTrackingProcessor { 


}  // namespace



std::unique_ptr<HeadTrackingProcessor> createHeadTrackingProcess(

std::unique_ptr<HeadTrackingProcessor> createHeadTrackingProcessor(

        const HeadTrackingProcessor::Options& options, HeadTrackingMode initialMode) {

    return std::make_unique<HeadTrackingProcessorImpl>(options, initialMode);

}

media/libheadtracking/include/media/HeadTrackingProcessor.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ class HeadTrackingProcessor { 
/**

 * Creates an instance featuring a default implementation of the HeadTrackingProcessor interface.

 */

std::unique_ptr<HeadTrackingProcessor> createHeadTrackingProcess(

std::unique_ptr<HeadTrackingProcessor> createHeadTrackingProcessor(

        const HeadTrackingProcessor::Options& options,

        HeadTrackingMode initialMode = HeadTrackingMode::STATIC);

services/audioflinger/AudioFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2569,10 +2569,10 @@ sp<AudioFlinger::ThreadBase> AudioFlinger::openOutput_l(audio_module_handle_t mo 
            return thread;

        } else {

            sp<PlaybackThread> thread;

            //TODO: b/193496180 use virtualizer stage flag at audio HAL when available

            //TODO: b/193496180 use spatializer flag at audio HAL when available

            if (flags == (audio_output_flags_t)(AUDIO_OUTPUT_FLAG_FAST

                                                    | AUDIO_OUTPUT_FLAG_DEEP_BUFFER)) {

                thread = new VirtualizerStageThread(this, outputStream, *output,

                thread = new SpatializerThread(this, outputStream, *output,

                                                    mSystemReady, mixerConfig);

                ALOGD("openOutput_l() created virtualizer output: ID %d thread %p",

                      *output, thread.get());

services/audioflinger/Threads.cpp

+2 −2
Original line number Diff line number Diff line
@@ -7064,7 +7064,7 @@ void AudioFlinger::DuplicatingThread::cacheParameters_l() 


// ----------------------------------------------------------------------------



AudioFlinger::VirtualizerStageThread::VirtualizerStageThread(const sp<AudioFlinger>& audioFlinger,

AudioFlinger::SpatializerThread::SpatializerThread(const sp<AudioFlinger>& audioFlinger,

                                                             AudioStreamOut* output,

                                                             audio_io_handle_t id,

                                                             bool systemReady,
@@ -7073,7 +7073,7 @@ AudioFlinger::VirtualizerStageThread::VirtualizerStageThread(const sp<AudioFling 
{

}



void AudioFlinger::VirtualizerStageThread::checkOutputStageEffects()

void AudioFlinger::SpatializerThread::checkOutputStageEffects()

{

    bool hasVirtualizer = false;

    bool hasDownMixer = false;