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

Commit f4541b1d authored by François Gaffie's avatar François Gaffie Committed by Eric Laurent
Browse files

Audio Policy: Engine Configurable: Force Encoded surround setting 



This patch is the counter part of 09bc4612.
It solves Bug: 26373761 for configurable policy engine, i.e. Parameter-framework
based policy.

Bug: 26373761

Change-Id: I5f01732238375c1fa08a8f2116698d4362840ba6
Signed-off-by: default avatarFrançois Gaffie <francois.gaffie@intel.com>
parent fc302fd9

services/audiopolicy/engineconfigurable/parameter-framework/example/policy_criteria.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ ExclusiveCriterion ForceUseForRecord : ForceNone ForceBtSco 
ExclusiveCriterion ForceUseForDock              :   ForceNone       ForceWiredAccessory     ForceBtCarDock      ForceBtDeskDock     ForceAnalogDock ForceDigitalDock

ExclusiveCriterion ForceUseForSystem            :   ForceNone       ForceSystemEnforced

ExclusiveCriterion ForceUseForHdmiSystemAudio   :   ForceNone       ForceHdmiSystemEnforced

ExclusiveCriterion ForceUseForEncodedSurround   :   ForceNone       ForceEncodedSurroundNever   ForceEncodedSurroundAlways

services/audiopolicy/engineconfigurable/wrapper/audio_policy_criteria_conf.h

+2 −1
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ static const std::string gForceUseCriterionTag[AUDIO_POLICY_FORCE_USE_CNT] = 
    [AUDIO_POLICY_FORCE_FOR_RECORD] =               "ForceUseForRecord",

    [AUDIO_POLICY_FORCE_FOR_DOCK] =                 "ForceUseForDock",

    [AUDIO_POLICY_FORCE_FOR_SYSTEM] =               "ForceUseForSystem",

    [AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO] =    "ForceUseForHdmiSystemAudio"

    [AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO] =    "ForceUseForHdmiSystemAudio",

    [AUDIO_POLICY_FORCE_FOR_ENCODED_SURROUND] =     "ForceUseForEncodedSurround"

};

services/audiopolicy/engineconfigurable/wrapper/config/audio_policy_criteria.conf

+9 −0
Original line number Diff line number Diff line
@@ -93,6 +93,11 @@ Policy { 
        # audio_policy_forced_config_t from system/audio.h

        #

        ForceUseForHdmiSystemAudioType  0:ForceNone,12:ForceHdmiSystemEnforced

        #

        # The values of the mode MUST be aligned with the definition of the

        # audio_policy_forced_config_t from system/audio_policy.h

        #

        ForceUseForEncodedSurroundType  0:ForceNone,13:ForceEncodedSurroundNever,14:ForceEncodedSurroundAlways

    }



    Criterion {
@@ -132,6 +137,10 @@ Policy { 
            Type            ForceUseForHdmiSystemAudioType

            Default         ForceNone

        }

        ForceUseForEncodedSurround {

            Type            ForceUseForEncodedSurroundType

            Default         ForceNone

        }

    }

}