diff --git a/audio/audio_platform_info.xml b/audio/audio_platform_info.xml
index 75ab928..3da8ae8 100644
--- a/audio/audio_platform_info.xml
+++ b/audio/audio_platform_info.xml
@@ -58,6 +58,14 @@
 </backend_names>
 
 <pcm_ids>
+	<usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD2" type="out" id="24"/>
+	<usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD3" type="out" id="27"/>
+	<usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD4" type="out" id="28"/>
+	<usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD5" type="out" id="29"/>
+	<usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD6" type="out" id="30"/>
+	<usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD7" type="out" id="31"/>
+	<usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD8" type="out" id="32"/>
+	<usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD9" type="out" id="33"/>
 	<usecase name="USECASE_AUDIO_PLAYBACK_LOW_LATENCY" type="out" id="12"/>
 	<usecase name="USECASE_AUDIO_RECORD_LOW_LATENCY" type="in" id="12"/>
 	<usecase name="USECASE_VOICEMMODE1_CALL" type="in" id="34"/>
diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index 7d77430..2078305 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -45,6 +45,18 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="direct_pcm" role="source"
+                        flags="AUDIO_OUTPUT_FLAG_DIRECT">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000"
+                             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_PCM_8_24_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000"
+                             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_PCM_24_BIT_PACKED"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000"
+                             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"/>
+                </mixPort>
                 <mixPort name="compressed_offload" role="source"
                          flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">
                     <profile name="" format="AUDIO_FORMAT_MP3"
@@ -121,17 +133,17 @@
                 <route type="mix" sink="Speaker"
                        sources="primary output,deep_buffer,compressed_offload"/>
                 <route type="mix" sink="Wired Headset"
-                       sources="primary output,deep_buffer,compressed_offload"/>
+                       sources="primary output,deep_buffer,direct_pcm,compressed_offload"/>
                 <route type="mix" sink="Wired Headphones"
-                       sources="primary output,deep_buffer,compressed_offload"/>
+                       sources="primary output,deep_buffer,direct_pcm,compressed_offload"/>
                 <route type="mix" sink="Line Out"
-                       sources="primary output,deep_buffer,compressed_offload"/>
+                       sources="primary output,deep_buffer,direct_pcm,compressed_offload"/>
                 <route type="mix" sink="Dock Headset"
                        sources="primary output,deep_buffer"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep_buffer,compressed_offload"/>
+                       sources="primary output,deep_buffer,direct_pcm,compressed_offload"/>
                 <route type="mix" sink="HDMI Out"
-                       sources="primary output,deep_buffer,compressed_offload"/>
+                       sources="primary output,deep_buffer,direct_pcm,compressed_offload"/>
                 <route type="mix" sink="Telephony Tx"
                        sources="voice_tx"/>
                 <route type="mix" sink="primary input"
diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml
index e10c444..cafd42e 100644
--- a/audio/mixer_paths.xml
+++ b/audio/mixer_paths.xml
@@ -434,6 +434,168 @@
 		<path name="compress-offload-playback bt-sco-wb" />
 	</path>
 
+	<path name="compress-offload-playback2">
+		<ctl name="PRI_MI2S_RX Audio Mixer MultiMedia7" value="1" />
+	</path>
+
+	<path name="compress-offload-playback2 bt-sco">
+		<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia7" value="1" />
+	</path>
+
+	<path name="compress-offload-playback2 bt-sco-wb">
+		<ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+		<path name="compress-offload-playback2 bt-sco" />
+	</path>
+
+	<path name="compress-offload-playback2 speaker-and-bt-sco">
+		<path name="compress-offload-playback2 bt-sco" />
+		<path name="compress-offload-playback2" />
+	</path>
+
+	<path name="compress-offload-playback2 speaker-and-bt-sco-wb">
+		<path name="compress-offload-playback2 bt-sco-wb" />
+		<path name="compress-offload-playback2" />
+	</path>
+
+	<path name="compress-offload-playback2 speaker-and-headphones">
+		<path name="compress-offload-playback2" />
+	</path>
+
+	<path name="compress-offload-playback3">
+		<ctl name="PRI_MI2S_RX Audio Mixer MultiMedia10" value="1" />
+	</path>
+
+	<path name="compress-offload-playback3 bt-sco">
+		<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia10" value="1" />
+	</path>
+
+	<path name="compress-offload-playback3 bt-sco-wb">
+		<ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+		<path name="compress-offload-playback3 bt-sco" />
+	</path>
+
+	<path name="compress-offload-playback3 speaker-and-bt-sco">
+		<path name="compress-offload-playback3 bt-sco" />
+		<path name="compress-offload-playback3" />
+	</path>
+
+	<path name="compress-offload-playback3 speaker-and-bt-sco-wb">
+		<path name="compress-offload-playback3 bt-sco-wb" />
+		<path name="compress-offload-playback3" />
+	</path>
+
+	<path name="compress-offload-playback3 speaker-and-headphones">
+		<path name="compress-offload-playback3" />
+	</path>
+
+	<path name="compress-offload-playback4">
+		<ctl name="PRI_MI2S_RX Audio Mixer MultiMedia11" value="1" />
+	</path>
+
+	<path name="compress-offload-playback4 bt-sco">
+		<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia11" value="1" />
+	</path>
+
+	<path name="compress-offload-playback4 bt-sco-wb">
+		<ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+		<path name="compress-offload-playback4 bt-sco" />
+	</path>
+
+	<path name="compress-offload-playback4 speaker-and-bt-sco">
+		<path name="compress-offload-playback4 bt-sco" />
+		<path name="compress-offload-playback4" />
+	</path>
+
+	<path name="compress-offload-playback4 speaker-and-bt-sco-wb">
+		<path name="compress-offload-playback4 bt-sco-wb" />
+		<path name="compress-offload-playback4" />
+	</path>
+
+	<path name="compress-offload-playback4 speaker-and-headphones">
+		<path name="compress-offload-playback4" />
+	</path>
+
+	<path name="compress-offload-playback5">
+		<ctl name="PRI_MI2S_RX Audio Mixer MultiMedia12" value="1" />
+	</path>
+
+	<path name="compress-offload-playback5 bt-sco">
+		<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia12" value="1" />
+	</path>
+
+	<path name="compress-offload-playback5 bt-sco-wb">
+		<ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+		<path name="compress-offload-playback5 bt-sco" />
+	</path>
+
+	<path name="compress-offload-playback5 speaker-and-bt-sco">
+		<path name="compress-offload-playback5 bt-sco" />
+		<path name="compress-offload-playback5" />
+	</path>
+
+	<path name="compress-offload-playback5 speaker-and-bt-sco-wb">
+		<path name="compress-offload-playback5 bt-sco-wb" />
+		<path name="compress-offload-playback5" />
+	</path>
+
+	<path name="compress-offload-playback5 speaker-and-headphones">
+		<path name="compress-offload-playback5" />
+	</path>
+
+	<path name="compress-offload-playback6">
+		<ctl name="PRI_MI2S_RX Audio Mixer MultiMedia13" value="1" />
+	</path>
+
+	<path name="compress-offload-playback6 bt-sco">
+		<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia13" value="1" />
+	</path>
+
+	<path name="compress-offload-playback6 bt-sco-wb">
+		<ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+		<path name="compress-offload-playback6 bt-sco" />
+	</path>
+
+	<path name="compress-offload-playback6 speaker-and-bt-sco">
+		<path name="compress-offload-playback6 bt-sco" />
+		<path name="compress-offload-playback6" />
+	</path>
+
+	<path name="compress-offload-playback6 speaker-and-bt-sco-wb">
+		<path name="compress-offload-playback6 bt-sco-wb" />
+		<path name="compress-offload-playback6" />
+	</path>
+
+	<path name="compress-offload-playback6 speaker-and-headphones">
+		<path name="compress-offload-playback6" />
+	</path>
+
+	<path name="compress-offload-playback7">
+		<ctl name="PRI_MI2S_RX Audio Mixer MultiMedia14" value="1" />
+	</path>
+
+	<path name="compress-offload-playback7 bt-sco">
+		<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia14" value="1" />
+	</path>
+
+	<path name="compress-offload-playback7 bt-sco-wb">
+		<ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+		<path name="compress-offload-playback7 bt-sco" />
+	</path>
+
+	<path name="compress-offload-playback7 speaker-and-bt-sco">
+		<path name="compress-offload-playback7 bt-sco" />
+		<path name="compress-offload-playback7" />
+	</path>
+
+	<path name="compress-offload-playback7 speaker-and-bt-sco-wb">
+		<path name="compress-offload-playback7 bt-sco-wb" />
+		<path name="compress-offload-playback7" />
+	</path>
+
+	<path name="compress-offload-playback7 speaker-and-headphones">
+		<path name="compress-offload-playback7" />
+	</path>
+
 	<path name="audio-record">
 		<ctl name="MultiMedia1 Mixer TERT_MI2S_TX" value="1" />
 	</path>