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

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

Snap for 7880955 from d4fb6b2d to sc-v2-release 

Change-Id: Id8f09d98c66a169981694de67888e97015606fa6
parents 86e76837 d4fb6b2d

services/audioflinger/Effects.cpp

+5 −7
Original line number Diff line number Diff line
@@ -953,11 +953,7 @@ status_t AudioFlinger::EffectModule::configure() 
    // Auxiliary effect:

    //      accumulates in output buffer: input buffer != output buffer

    // Therefore: accumulate <=> input buffer != output buffer

    if (mConfig.inputCfg.buffer.raw != mConfig.outputCfg.buffer.raw) {

        mConfig.outputCfg.accessMode = EFFECT_BUFFER_ACCESS_ACCUMULATE;

    } else {

        mConfig.outputCfg.accessMode = EFFECT_BUFFER_ACCESS_WRITE;

    }

    mConfig.outputCfg.accessMode = requiredEffectBufferAccessMode();

    mConfig.inputCfg.mask = EFFECT_CONFIG_ALL;

    mConfig.outputCfg.mask = EFFECT_CONFIG_ALL;

    mConfig.inputCfg.buffer.frameCount = callback->frameCount();
@@ -2340,8 +2336,10 @@ status_t AudioFlinger::EffectChain::addEffect_ll(const sp<EffectModule>& effect) 
        // output buffer, otherwise to chain input buffer

        if (idx_insert == size) {

            if (idx_insert != 0) {

                // update channel mask before setting output buffer.

                mEffects[idx_insert - 1]->configure();

                mEffects[idx_insert-1]->setOutBuffer(mInBuffer);

                mEffects[idx_insert - 1]->setOutBuffer(mInBuffer); // set output buffer

                mEffects[idx_insert - 1]->updateAccessMode();      // reconfig if neeeded.

            }

            effect->setOutBuffer(mOutBuffer);

        } else {

services/audioflinger/Effects.h

+12 −0
Original line number Diff line number Diff line
@@ -254,6 +254,13 @@ public: 
        return mOutBuffer != 0 ? reinterpret_cast<int16_t*>(mOutBuffer->ptr()) : NULL;

    }



    // Updates the access mode if it is out of date.  May issue a new effect configure.

    void        updateAccessMode() {

                    if (requiredEffectBufferAccessMode() != mConfig.outputCfg.accessMode) {

                        configure();

                    }

                }



    status_t         setDevices(const AudioDeviceTypeAddrVector &devices);

    status_t         setInputDevice(const AudioDeviceTypeAddr &device);

    status_t         setVolume(uint32_t *left, uint32_t *right, bool controller);
@@ -289,6 +296,11 @@ private: 
    status_t stop_l();

    status_t removeEffectFromHal_l();

    status_t sendSetAudioDevicesCommand(const AudioDeviceTypeAddrVector &devices, uint32_t cmdCode);

    effect_buffer_access_e requiredEffectBufferAccessMode() const {

        return mConfig.inputCfg.buffer.raw == mConfig.outputCfg.buffer.raw

                ? EFFECT_BUFFER_ACCESS_WRITE : EFFECT_BUFFER_ACCESS_ACCUMULATE;

    }





    effect_config_t     mConfig;    // input and output audio configuration

    sp<EffectHalInterface> mEffectInterface; // Effect module HAL

services/camera/libcameraservice/api1/Camera2Client.cpp

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ Camera2Client::Camera2Client(const sp<CameraService>& cameraService, 
        bool overrideForPerfClass):

        Camera2ClientBase(cameraService, cameraClient, clientPackageName, clientFeatureId,

                cameraDeviceId, api1CameraId, cameraFacing, sensorOrientation,

                clientPid, clientUid, servicePid, overrideForPerfClass),

                clientPid, clientUid, servicePid, overrideForPerfClass, /*legacyClient*/ true),

        mParameters(api1CameraId, cameraFacing)

{

    ATRACE_CALL();

services/camera/libcameraservice/common/Camera2ClientBase.cpp

+3 −2
Original line number Diff line number Diff line
@@ -55,13 +55,14 @@ Camera2ClientBase<TClientBase>::Camera2ClientBase( 
        int clientPid,

        uid_t clientUid,

        int servicePid,

        bool overrideForPerfClass):

        bool overrideForPerfClass,

        bool legacyClient):

        TClientBase(cameraService, remoteCallback, clientPackageName, clientFeatureId,

                cameraId, api1CameraId, cameraFacing, sensorOrientation, clientPid, clientUid,

                servicePid),

        mSharedCameraCallbacks(remoteCallback),

        mDeviceVersion(cameraService->getDeviceVersion(TClientBase::mCameraIdStr)),

        mDevice(new Camera3Device(cameraId, overrideForPerfClass)),

        mDevice(new Camera3Device(cameraId, overrideForPerfClass, legacyClient)),

        mDeviceActive(false), mApi1CameraId(api1CameraId)

{

    ALOGI("Camera %s: Opened. Client: %s (PID %d, UID %d)", cameraId.string(),

services/camera/libcameraservice/common/Camera2ClientBase.h

+2 −1
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ public: 
                      int clientPid,

                      uid_t clientUid,

                      int servicePid,

                      bool overrideForPerfClass);

                      bool overrideForPerfClass,

                      bool legacyClient = false);

    virtual ~Camera2ClientBase();



    virtual status_t      initialize(sp<CameraProviderManager> manager, const String8& monitorTags);