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

Commit aaa0b69e authored by Ashish Jain's avatar Ashish Jain Committed by Gerrit - the friendly Code Review server
Browse files

policy_hal: Move global effects to correct output 

-With voice playback concurrency handling in place, offload or direct
outputs are force closed if a voice call is on.
-In such scenario, on closeOutput, global effects are moved to
primary output by audioflinger instead of deep buffer output
(mix output).
- When call ends, and playback resumes, movement of effects
from previous output to new output fails.
- Ensure that when a output is closed, effects if present
are moved to mix output, such that when a new output comes up
the effects can be moved from MIX output to the required output.

CRs-Fixed: 1030710
Change-Id: I127c02adff3f2148e318d9f4945c501f3f20dc55
parent 7e720a98

policy_hal/AudioPolicyManager.cpp

+43 −0
Original line number Diff line number Diff line
@@ -97,6 +97,37 @@ audio_output_flags_t AudioPolicyManagerCustom::getFallBackPath() 
    return flag;

}

#endif /*VOICE_CONCURRENCY*/



void AudioPolicyManagerCustom::moveGlobalEffect()

{

    audio_io_handle_t dstOutput = getOutputForEffect();

    if (hasPrimaryOutput() && dstOutput != mPrimaryOutput->mIoHandle) {

#ifdef DOLBY_ENABLE

        status_t status =

                        mpClientInterface->moveEffects(AUDIO_SESSION_OUTPUT_MIX,

                                                    mPrimaryOutput->mIoHandle,

                                                    dstOutput);

        if (status == NO_ERROR) {

            for (size_t i = 0; i < mEffects.size(); i++) {

                 sp<EffectDescriptor> desc = mEffects.valueAt(i);

                 if (desc->mSession == AUDIO_SESSION_OUTPUT_MIX) {

                     // update the mIo member of EffectDescriptor

                     // for the global effect

                     ALOGV("%s updating mIo", __FUNCTION__);

                     desc->mIo = dstOutput;

                 }

            }

        } else {

                ALOGW("%s moveEffects from %d to %d failed", __FUNCTION__,

                                     mPrimaryOutput->mIoHandle, dstOutput);

        }

#else // DOLBY_END

        mpClientInterface->moveEffects(AUDIO_SESSION_OUTPUT_MIX,

                                   mPrimaryOutput->mIoHandle, dstOutput);

#endif

    }

}



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

// AudioPolicyInterface implementation

// ----------------------------------------------------------------------------
@@ -818,6 +849,10 @@ void AudioPolicyManagerCustom::setPhoneState(audio_mode_t state) 
                }

            }

        }

        // If effects where present on any of the above closed outputs,

        // audioflinger moved them to the primary output by default

        // move them back to the appropriate output.

        moveGlobalEffect();

    }



    if ((AUDIO_MODE_IN_CALL == oldState || AUDIO_MODE_IN_COMMUNICATION == oldState) &&
@@ -886,6 +921,10 @@ void AudioPolicyManagerCustom::setPhoneState(audio_mode_t state) 
                    closeOutput(mOutputs.keyAt(i));

                }

            }

            // If effects where present on any of the above closed outputs,

            // audioflinger moved them to the primary output by default

            // move them back to the appropriate output.

            moveGlobalEffect();

        } else if ((oldState == AUDIO_MODE_IN_COMMUNICATION) &&

                    (mEngine->getPhoneState() == AUDIO_MODE_NORMAL)) {

            // call invalidate for music so that music can fallback to compress
@@ -1934,6 +1973,10 @@ status_t AudioPolicyManagerCustom::startInput(audio_io_handle_t input, 
                closeOutput(mOutputs.keyAt(i));

            }

        }

        // If effects where present on any of the above closed outputs,

        // audioflinger moved them to the primary output by default

        // move them back to the appropriate output.

        moveGlobalEffect();

    }

#endif

policy_hal/AudioPolicyManager.h

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ protected: 
        static audio_output_flags_t getFallBackPath();

        int mFallBackflag;

#endif /*VOICE_CONCURRENCY*/

        void moveGlobalEffect();



        // handle special cases for sonification strategy while in call: mute streams or replace by

        // a special tone in the device used for communication