Merge "Audio Policy: Engine Configurable: Force Encoded surround setting" into nyc-dev (ba388ac4) · Commits · e / os / android_frameworks_av

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

+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"
		};

+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
		}
		}
		}