Snap for 10566461 from 2e9b7bb522
to udc-qpr1-release
Change-Id: I689e2bd50a266e19e0aa1edd1045e7efc2f7aaf3
This commit is contained in:
commit
f852c0627d
11 changed files with 118 additions and 15 deletions
|
@ -149,7 +149,7 @@
|
|||
</devicePort>
|
||||
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
|
||||
</devicePort>
|
||||
<devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
|
||||
<devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
|
||||
</devicePort>
|
||||
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
|
||||
</devicePort>
|
||||
|
@ -184,6 +184,8 @@
|
|||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
|
||||
<route type="mix" sink="USB Headset Out"
|
||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
|
||||
<route type="mix" sink="HDMI Out"
|
||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
|
||||
<route type="mix" sink="BT SCO"
|
||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||
<route type="mix" sink="BT SCO Headset"
|
||||
|
|
|
@ -145,7 +145,7 @@
|
|||
</devicePort>
|
||||
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
|
||||
</devicePort>
|
||||
<devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
|
||||
<devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
|
||||
</devicePort>
|
||||
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
|
||||
</devicePort>
|
||||
|
@ -180,6 +180,8 @@
|
|||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/>
|
||||
<route type="mix" sink="USB Headset Out"
|
||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/>
|
||||
<route type="mix" sink="HDMI Out"
|
||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="BT SCO"
|
||||
sources="primary output,deep buffer,haptic,voip_rx,raw,mmap_no_irq_out"/>
|
||||
<route type="mix" sink="BT SCO Headset"
|
||||
|
|
|
@ -149,7 +149,7 @@
|
|||
</devicePort>
|
||||
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
|
||||
</devicePort>
|
||||
<devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
|
||||
<devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
|
||||
</devicePort>
|
||||
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
|
||||
</devicePort>
|
||||
|
@ -205,6 +205,8 @@
|
|||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
|
||||
<route type="mix" sink="USB Headset Out"
|
||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
|
||||
<route type="mix" sink="HDMI Out"
|
||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
|
||||
<route type="mix" sink="BT SCO"
|
||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||
<route type="mix" sink="BT SCO Headset"
|
||||
|
|
|
@ -149,7 +149,7 @@
|
|||
</devicePort>
|
||||
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
|
||||
</devicePort>
|
||||
<devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
|
||||
<devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
|
||||
</devicePort>
|
||||
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
|
||||
</devicePort>
|
||||
|
@ -184,6 +184,8 @@
|
|||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
|
||||
<route type="mix" sink="USB Headset Out"
|
||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
|
||||
<route type="mix" sink="HDMI Out"
|
||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
|
||||
<route type="mix" sink="BT SCO"
|
||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||
<route type="mix" sink="BT SCO Headset"
|
||||
|
|
|
@ -145,7 +145,7 @@
|
|||
</devicePort>
|
||||
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
|
||||
</devicePort>
|
||||
<devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
|
||||
<devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
|
||||
</devicePort>
|
||||
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
|
||||
</devicePort>
|
||||
|
@ -180,6 +180,8 @@
|
|||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/>
|
||||
<route type="mix" sink="USB Headset Out"
|
||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/>
|
||||
<route type="mix" sink="HDMI Out"
|
||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="BT SCO"
|
||||
sources="primary output,deep buffer,haptic,voip_rx,raw,mmap_no_irq_out"/>
|
||||
<route type="mix" sink="BT SCO Headset"
|
||||
|
|
|
@ -149,7 +149,7 @@
|
|||
</devicePort>
|
||||
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
|
||||
</devicePort>
|
||||
<devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
|
||||
<devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
|
||||
</devicePort>
|
||||
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
|
||||
</devicePort>
|
||||
|
@ -205,6 +205,8 @@
|
|||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
|
||||
<route type="mix" sink="USB Headset Out"
|
||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
|
||||
<route type="mix" sink="HDMI Out"
|
||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
|
||||
<route type="mix" sink="BT SCO"
|
||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||
<route type="mix" sink="BT SCO Headset"
|
||||
|
|
|
@ -47,6 +47,8 @@
|
|||
<scenario encode="TwoChanStereo_32_2" decode="OneChanMono_32_2"/>
|
||||
<scenario encode="OneChanMono_32_2" decode="OneChanMono_32_2"/>
|
||||
<!-- broadcast -->
|
||||
<scenario encode="invalid" decode="invalid" broadcast="BcastStereo_48_4"/>
|
||||
<scenario encode="invalid" decode="invalid" broadcast="BcastStereo_48_2"/>
|
||||
<scenario encode="invalid" decode="invalid" broadcast="BcastStereo_24_2"/>
|
||||
<scenario encode="invalid" decode="invalid" broadcast="BcastStereo_16_2"/>
|
||||
</scenarioList>
|
||||
|
@ -65,6 +67,8 @@
|
|||
<configuration name="OneChanMono_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
|
||||
<configuration name="TwoChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
|
||||
<configuration name="OneChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>
|
||||
<configuration name="BcastStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="BROADCAST_STEREO"/>
|
||||
<configuration name="BcastStereo_48_2" codecConfiguration="LC3_48k_2" strategyConfiguration="BROADCAST_STEREO"/>
|
||||
<configuration name="BcastStereo_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="BROADCAST_STEREO"/>
|
||||
<configuration name="BcastStereo_16_2" codecConfiguration="LC3_16k_2" strategyConfiguration="BROADCAST_STEREO"/>
|
||||
</configurationList>
|
||||
|
@ -73,6 +77,7 @@
|
|||
<codecConfiguration name="LC3_16k_2" codec="LC3" samplingFrequency="16000" frameDurationUs="10000" octetsPerCodecFrame="40"/>
|
||||
<codecConfiguration name="LC3_24k_2" codec="LC3" samplingFrequency="24000" frameDurationUs="10000" octetsPerCodecFrame="60"/>
|
||||
<codecConfiguration name="LC3_32k_2" codec="LC3" samplingFrequency="32000" frameDurationUs="10000" octetsPerCodecFrame="80"/>
|
||||
<codecConfiguration name="LC3_48k_2" codec="LC3" samplingFrequency="48000" frameDurationUs="10000" octetsPerCodecFrame="100"/>
|
||||
<codecConfiguration name="LC3_48k_4" codec="LC3" samplingFrequency="48000" frameDurationUs="10000" octetsPerCodecFrame="120"/>
|
||||
</codecConfigurationList>
|
||||
<strategyConfigurationList>
|
||||
|
|
|
@ -754,18 +754,23 @@
|
|||
"Name": "VIRTUAL-SKIN-CPU-MID",
|
||||
"Path": "vendor.thermal.VIRTUAL-SKIN-CPU-MID.profile",
|
||||
"Values": [
|
||||
"game",
|
||||
""
|
||||
"",
|
||||
"game"
|
||||
],
|
||||
"DefaultIndex": 0,
|
||||
"ResetOnInit": true,
|
||||
"Type": "Property"
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-CPU-HIGH",
|
||||
"Path": "vendor.thermal.VIRTUAL-SKIN-CPU-HIGH.profile",
|
||||
"Values": [
|
||||
"",
|
||||
"game",
|
||||
""
|
||||
"camera"
|
||||
],
|
||||
"DefaultIndex": 0,
|
||||
"ResetOnInit": true,
|
||||
"Type": "Property"
|
||||
},
|
||||
{
|
||||
|
@ -1519,6 +1524,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_EXTREME",
|
||||
"Node": "VIRTUAL-SKIN-CPU-HIGH",
|
||||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_HIGH",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
@ -1663,6 +1674,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_HIGH",
|
||||
"Node": "VIRTUAL-SKIN-CPU-HIGH",
|
||||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_STANDARD",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
@ -1789,6 +1806,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_STANDARD",
|
||||
"Node": "VIRTUAL-SKIN-CPU-HIGH",
|
||||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_LOW",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
|
|
@ -754,18 +754,23 @@
|
|||
"Name": "VIRTUAL-SKIN-CPU-MID",
|
||||
"Path": "vendor.thermal.VIRTUAL-SKIN-CPU-MID.profile",
|
||||
"Values": [
|
||||
"game",
|
||||
""
|
||||
"",
|
||||
"game"
|
||||
],
|
||||
"DefaultIndex": 0,
|
||||
"ResetOnInit": true,
|
||||
"Type": "Property"
|
||||
},
|
||||
{
|
||||
"Name": "VIRTUAL-SKIN-CPU-HIGH",
|
||||
"Path": "vendor.thermal.VIRTUAL-SKIN-CPU-HIGH.profile",
|
||||
"Values": [
|
||||
"",
|
||||
"game",
|
||||
""
|
||||
"camera"
|
||||
],
|
||||
"DefaultIndex": 0,
|
||||
"ResetOnInit": true,
|
||||
"Type": "Property"
|
||||
},
|
||||
{
|
||||
|
@ -1417,6 +1422,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_EXTREME",
|
||||
"Node": "VIRTUAL-SKIN-CPU-HIGH",
|
||||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_HIGH",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
@ -1561,6 +1572,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_HIGH",
|
||||
"Node": "VIRTUAL-SKIN-CPU-HIGH",
|
||||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_STANDARD",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
@ -1687,6 +1704,12 @@
|
|||
"Duration": 0,
|
||||
"Value": "0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_STANDARD",
|
||||
"Node": "VIRTUAL-SKIN-CPU-HIGH",
|
||||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_STREAMING_LOW",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
|
|
|
@ -531,17 +531,37 @@
|
|||
{
|
||||
"CdevRequest": "thermal-cpufreq-0",
|
||||
"MaxReleaseStep": 1,
|
||||
"Disabled":true
|
||||
"Disabled":true
|
||||
},
|
||||
{
|
||||
"CdevRequest": "thermal-cpufreq-1",
|
||||
"MaxReleaseStep": 1,
|
||||
"Disabled":true
|
||||
"Disabled":true
|
||||
},
|
||||
{
|
||||
"CdevRequest": "thermal-cpufreq-2",
|
||||
"MaxReleaseStep": 1,
|
||||
"Disabled":true
|
||||
"Disabled":true
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"Mode": "camera",
|
||||
"BindedCdevInfo": [
|
||||
{
|
||||
"CdevRequest": "thermal-cpufreq-0",
|
||||
"MaxReleaseStep": 1,
|
||||
"Disabled":true
|
||||
},
|
||||
{
|
||||
"CdevRequest": "thermal-cpufreq-1",
|
||||
"MaxReleaseStep": 1,
|
||||
"Disabled":true
|
||||
},
|
||||
{
|
||||
"CdevRequest": "thermal-cpufreq-2",
|
||||
"MaxReleaseStep": 1,
|
||||
"Disabled":true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
@ -512,6 +512,26 @@
|
|||
"Disabled":true
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"Mode": "camera",
|
||||
"BindedCdevInfo": [
|
||||
{
|
||||
"CdevRequest": "thermal-cpufreq-0",
|
||||
"MaxReleaseStep": 1,
|
||||
"Disabled":true
|
||||
},
|
||||
{
|
||||
"CdevRequest": "thermal-cpufreq-1",
|
||||
"MaxReleaseStep": 1,
|
||||
"Disabled":true
|
||||
},
|
||||
{
|
||||
"CdevRequest": "thermal-cpufreq-2",
|
||||
"MaxReleaseStep": 1,
|
||||
"Disabled":true
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue