hal:qap-test: fix for dts/dolby use cases in qap path
-fix to pick the 64 bit library if present
-Absolute path is only needed when lib is not present in default
path (/usr/lib or /usr/lib64) but as LE uses default path,
absolute path is not needed.
-fix to wait for secondary stream eos
Change-Id: Ia392b4716bb323e0c98e81540dfe4062ab183fef
diff --git a/qahw_api/test/qap_wrapper_extn.c b/qahw_api/test/qap_wrapper_extn.c
index a2b52bb..0f24412 100644
--- a/qahw_api/test/qap_wrapper_extn.c
+++ b/qahw_api/test/qap_wrapper_extn.c
@@ -41,8 +41,8 @@
/*#define LOG_NDEBUG 0*/
#if LINUX_ENABLED
-#define QAC_LIB_MS12 "/usr/lib/libdolby_ms12_wrapper.so"
-#define QAC_LIB_M8 "/usr/lib/libdts_m8_wrapper.so"
+#define QAC_LIB_MS12 "libdolby_ms12_wrapper.so"
+#define QAC_LIB_M8 "libdts_m8_wrapper.so"
#else
#define QAC_LIB_MS12 "/system/lib/libdolby_ms12_wrapper.so"
#define QAC_LIB_M8 "/system/lib/libdts_m8_wrapper.so"
@@ -1579,7 +1579,7 @@
} while (1);
wait_for_eos:
- if (stream_info->sec_input && !stream_info->aac_fmt_type) {
+ if (stream_info->sec_input) {
pthread_mutex_lock(&sec_eos_lock);
pthread_cond_wait(&sec_eos_cond, &sec_eos_lock);
pthread_mutex_unlock(&sec_eos_lock);