sm8450-common: audio: Move bluetooth A2DP back to primary audio module
Partially revert "sm8450-common: audio: Enable AOSP bluetooth audio HAL v2"
This partially reverts commit 73270a0aa6.
Change-Id: I8c319c9ae13a179955c6271acf1cea27b5c4137b
			
			
This commit is contained in:
		@@ -258,6 +258,21 @@
 | 
			
		||||
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
 | 
			
		||||
                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/>
 | 
			
		||||
                </devicePort>
 | 
			
		||||
                <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
 | 
			
		||||
                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP AUDIO_FORMAT_LC3 AUDIO_FORMAT_LHDC">
 | 
			
		||||
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
 | 
			
		||||
                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
 | 
			
		||||
                </devicePort>
 | 
			
		||||
                <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
 | 
			
		||||
                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP AUDIO_FORMAT_LC3 AUDIO_FORMAT_LHDC">
 | 
			
		||||
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
 | 
			
		||||
                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
 | 
			
		||||
                </devicePort>
 | 
			
		||||
                <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
 | 
			
		||||
                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP AUDIO_FORMAT_LC3 AUDIO_FORMAT_LHDC">
 | 
			
		||||
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
 | 
			
		||||
                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
 | 
			
		||||
                </devicePort>
 | 
			
		||||
                <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">
 | 
			
		||||
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
 | 
			
		||||
                             samplingRates="44100 48000 64000 88200 96000 128000 176400 192000"/>
 | 
			
		||||
@@ -300,6 +315,11 @@
 | 
			
		||||
                </devicePort>
 | 
			
		||||
                <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" role="source">
 | 
			
		||||
                </devicePort>
 | 
			
		||||
                <devicePort tagName="A2DP In" type="AUDIO_DEVICE_IN_BLUETOOTH_A2DP" role="source"
 | 
			
		||||
                            encodedFormats="AUDIO_FORMAT_LC3">
 | 
			
		||||
                   <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
 | 
			
		||||
                            samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
 | 
			
		||||
                </devicePort>
 | 
			
		||||
            </devicePorts>
 | 
			
		||||
            <!-- route declaration, i.e. list all available sources for a given sink -->
 | 
			
		||||
            <routes>
 | 
			
		||||
@@ -334,7 +354,7 @@
 | 
			
		||||
                <route type="mix" sink="voice_rx"
 | 
			
		||||
                       sources="Telephony Rx"/>
 | 
			
		||||
                <route type="mix" sink="primary input"
 | 
			
		||||
                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>
 | 
			
		||||
                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx,A2DP In"/>
 | 
			
		||||
                <route type="mix" sink="usb_surround_sound"
 | 
			
		||||
                       sources="USB Device In,USB Headset In"/>
 | 
			
		||||
                <route type="mix" sink="fast input"
 | 
			
		||||
@@ -344,9 +364,15 @@
 | 
			
		||||
                <route type="mix" sink="voip_tx"
 | 
			
		||||
                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>
 | 
			
		||||
                <route type="mix" sink="record_24"
 | 
			
		||||
                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/>
 | 
			
		||||
                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,A2DP In"/>
 | 
			
		||||
                <route type="mix" sink="mmap_no_irq_in"
 | 
			
		||||
                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,USB Device In,USB Headset In"/>
 | 
			
		||||
                <route type="mix" sink="BT A2DP Out"
 | 
			
		||||
                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
 | 
			
		||||
                <route type="mix" sink="BT A2DP Headphones"
 | 
			
		||||
                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
 | 
			
		||||
                <route type="mix" sink="BT A2DP Speaker"
 | 
			
		||||
                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
 | 
			
		||||
                <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
 | 
			
		||||
            </routes>
 | 
			
		||||
 | 
			
		||||
@@ -374,9 +400,6 @@
 | 
			
		||||
            </routes>
 | 
			
		||||
        </module>
 | 
			
		||||
 | 
			
		||||
        <!-- Bluetooth Audio HAL -->
 | 
			
		||||
        <xi:include href="/vendor/etc/bluetooth_audio_policy_configuration.xml"/>
 | 
			
		||||
 | 
			
		||||
        <!-- Remote Submix Audio HAL -->
 | 
			
		||||
        <xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/>
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user