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

Commit 4f4ba318 authored Apr 14, 2019 by qctecmdr Committed by Gerrit - the friendly Code Review server Apr 14, 2019

Merge "configs: Remove Dolby formats by default."

parents 31195059 767579cf

configs/apq8098_latv/audio_policy.conf

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ audio_hw_modules {
		compress_offload {
		sampling_rates 8000\|11025\|12000\|16000\|22050\|24000\|32000\|44100\|48000\|64000\|88200\|96000\|176400\|192000
		channel_masks AUDIO_CHANNEL_OUT_MONO\|AUDIO_CHANNEL_OUT_STEREO\|AUDIO_CHANNEL_OUT_2POINT1\|AUDIO_CHANNEL_OUT_QUAD\|AUDIO_CHANNEL_OUT_PENTA\|AUDIO_CHANNEL_OUT_5POINT1\|AUDIO_CHANNEL_OUT_6POINT1\|AUDIO_CHANNEL_OUT_7POINT1
		formats AUDIO_FORMAT_MP3\|AUDIO_FORMAT_FLAC\|AUDIO_FORMAT_ALAC\|AUDIO_FORMAT_APE\|AUDIO_FORMAT_AAC_LC\|AUDIO_FORMAT_AAC_HE_V1\|AUDIO_FORMAT_AAC_HE_V2\|AUDIO_FORMAT_WMA\|AUDIO_FORMAT_WMA_PRO\|AUDIO_FORMAT_VORBIS\|AUDIO_FORMAT_AAC_ADTS_LC\|AUDIO_FORMAT_AAC_ADTS_HE_V1\|AUDIO_FORMAT_AAC_ADTS_HE_V2\|AUDIO_FORMAT_MP2\|AUDIO_FORMAT_AC3\|AUDIO_FORMAT_E_AC3
		formats AUDIO_FORMAT_MP3\|AUDIO_FORMAT_FLAC\|AUDIO_FORMAT_ALAC\|AUDIO_FORMAT_APE\|AUDIO_FORMAT_AAC_LC\|AUDIO_FORMAT_AAC_HE_V1\|AUDIO_FORMAT_AAC_HE_V2\|AUDIO_FORMAT_WMA\|AUDIO_FORMAT_WMA_PRO\|AUDIO_FORMAT_VORBIS\|AUDIO_FORMAT_AAC_ADTS_LC\|AUDIO_FORMAT_AAC_ADTS_HE_V1\|AUDIO_FORMAT_AAC_ADTS_HE_V2\|AUDIO_FORMAT_MP2
		devices AUDIO_DEVICE_OUT_SPEAKER\|AUDIO_DEVICE_OUT_EARPIECE\|AUDIO_DEVICE_OUT_WIRED_HEADSET\|AUDIO_DEVICE_OUT_WIRED_HEADPHONE\|AUDIO_DEVICE_OUT_LINE\|AUDIO_DEVICE_OUT_ALL_SCO\|AUDIO_DEVICE_OUT_AUX_DIGITAL\|AUDIO_DEVICE_OUT_PROXY\|AUDIO_DEVICE_OUT_USB_DEVICE\|AUDIO_DEVICE_OUT_BLUETOOTH_A2DP\|AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES\|AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER
		flags AUDIO_OUTPUT_FLAG_DIRECT\|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD\|AUDIO_OUTPUT_FLAG_NON_BLOCKING
		}

configs/apq8098_latv/audio_policy_configuration.xml

+0 −9

Original line number	Diff line number	Diff line
		@@ -87,15 +87,6 @@
		<profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
		samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
		channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
		<profile name="" format="AUDIO_FORMAT_AC3"
		samplingRates="32000,44100,48000"
		channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1"/>
		<profile name="" format="AUDIO_FORMAT_E_AC3"
		samplingRates="32000,44100,48000"
		channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
		<profile name="" format="AUDIO_FORMAT_E_AC3_JOC"
		samplingRates="32000,44100,48000"
		channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
		<profile name="" format="AUDIO_FORMAT_AAC_ADTS_LC"
		samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
		channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>

configs/kona/audio_io_policy.conf

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ outputs {
		}
		compress_passthrough {
		flags AUDIO_OUTPUT_FLAG_DIRECT\|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD\|AUDIO_OUTPUT_FLAG_NON_BLOCKING\|AUDIO_OUTPUT_FLAG_COMPRESS_PASSTHROUGH
		formats AUDIO_FORMAT_AC3\|AUDIO_FORMAT_E_AC3\|AUDIO_FORMAT_E_AC3_JOC\|AUDIO_FORMAT_DTS\|AUDIO_FORMAT_DTS_HD\|AUDIO_FORMAT_DSD
		formats AUDIO_FORMAT_DTS\|AUDIO_FORMAT_DTS_HD\|AUDIO_FORMAT_DSD
		sampling_rates 32000\|44100\|48000\|88200\|96000\|176400\|192000\|352800
		bit_width 16
		app_type 69941

configs/kona/audio_policy_configuration.xml

+0 −9

Original line number	Diff line number	Diff line
		@@ -121,15 +121,6 @@
		<profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
		samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
		channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
		<profile name="" format="AUDIO_FORMAT_AC3"
		samplingRates="32000,44100,48000"
		channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1"/>
		<profile name="" format="AUDIO_FORMAT_E_AC3"
		samplingRates="32000,44100,48000"
		channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
		<profile name="" format="AUDIO_FORMAT_E_AC3_JOC"
		samplingRates="32000,44100,48000"
		channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
		<profile name="" format="AUDIO_FORMAT_DTS"
		samplingRates="32000,44100,48000"
		channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1"/>

configs/lito/audio_io_policy.conf

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ outputs {
		}
		compress_passthrough {
		flags AUDIO_OUTPUT_FLAG_DIRECT\|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD\|AUDIO_OUTPUT_FLAG_NON_BLOCKING\|AUDIO_OUTPUT_FLAG_COMPRESS_PASSTHROUGH
		formats AUDIO_FORMAT_AC3\|AUDIO_FORMAT_E_AC3\|AUDIO_FORMAT_E_AC3_JOC\|AUDIO_FORMAT_DTS\|AUDIO_FORMAT_DTS_HD\|AUDIO_FORMAT_DSD
		formats AUDIO_FORMAT_DTS\|AUDIO_FORMAT_DTS_HD\|AUDIO_FORMAT_DSD
		sampling_rates 32000\|44100\|48000\|88200\|96000\|176400\|192000\|352800
		bit_width 16
		app_type 69941