commit bd5401d43616bd4117b07ee546422d1fee1b89a0
author Linux Build Service Account <lnxbuild@localhost> Sat Mar 07 05:40:22 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Mar 07 05:40:22 2015 -0800
tree 04d429c517feef7318f8cc659fe6e510f2acf1cd
parent 8d39aef8e9f24827debb7469aaf16bd175c71c0f
parent 01e54e619198c510f78bf2d306f53e51c92f00cc

Merge "hal: Reduce offload latency and log spam"

hal/Android.mk

diff --git a/hal/Android.mk b/hal/Android.mk
index 38873cf..54ac70f 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -52,7 +52,7 @@
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
-ifneq ($(filter msm8994 msm8992,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8994 msm8992 thulium,$(TARGET_BOARD_PLATFORM)),)
     LOCAL_SRC_FILES += edid.c
 endif
 

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index e7ebaa8..7e97ff9 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1546,6 +1546,14 @@
         if (out->offload_callback)
             compress_nonblock(out->compr, out->non_blocking);
 
+        /* Since small bufs uses blocking writes, a write will be blocked
+           for the default max poll time (20s) in the event of an SSR.
+           Reduce the poll time to observe and deal with SSR faster.
+        */
+        if (out->use_small_bufs) {
+            compress_set_max_poll_wait(out->compr, 1000);
+        }
+
         audio_extn_dts_create_state_notifier_node(out->usecase);
         audio_extn_dts_notify_playback_state(out->usecase, 0, out->sample_rate,
                                              popcount(out->channel_mask),