commit 4c038b46a4344e19b7ac15d0a6f8488a78a27ef8
author Manish Dewangan <manish@codeaurora.org> Tue Jun 20 17:57:11 2017 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Aug 09 23:45:04 2017 -0700
tree 783ca07bf6d0ce9b102bace3eada971c61adde2e
parent 1138048e29f8eb31d84a2236117400d7c53fc6ef

hal: test: Fix crash issue during multistream playback

- At EOS crash is seen during multi stream(Main and Assoc) playback.
  This happens if Main stream ends before Assoc stream.
  Here Main stream thread force closes Associated stream in
  Main stream thread context while Associated thread is still
  accessing resorces.

-Fix this by avoiding force close of assoc stream in main thread context.

CRs-Fixed: 2061208
Change-Id: Ib6e6ce763187eef48ae54a1e33ce898712a2c289

qahw_api/test/qahw_playback_test.c

diff --git a/qahw_api/test/qahw_playback_test.c b/qahw_api/test/qahw_playback_test.c
index cc0a6e2..d8634a4 100644
--- a/qahw_api/test/qahw_playback_test.c
+++ b/qahw_api/test/qahw_playback_test.c
@@ -865,9 +865,10 @@
         fprintf(log_file, "stream %d: writing to hal %zd bytes, offset %d, write length %zd\n",
                 params->stream_index, bytes_remaining, offset, write_length);
         bytes_written = write_to_hal(params->out_handle, data_ptr+offset, bytes_remaining, params);
-        if (bytes_written == -1) {
-            fprintf(stderr, "proxy_write failed in usb hal");
-            break;
+        if (bytes_written < 0) {
+            fprintf(stderr, "write failed %d", bytes_written);
+            exit = true;
+            continue;
         }
         bytes_remaining -= bytes_written;
 
@@ -926,12 +927,9 @@
         pthread_join(drift_query_thread, NULL);
     }
     if ((params->flags & AUDIO_OUTPUT_FLAG_MAIN) && is_assoc_active()) {
-        fprintf(log_file, "Closing Associated as Main Stream reached EOF %d \n", params->stream_index, rc);
-        rc = qahw_close_output_stream(stream_param[get_assoc_index()].out_handle);
-        if (rc) {
-            fprintf(log_file, "stream %d: could not close output stream, error - %d \n", params->stream_index, rc);
-            fprintf(stderr, "stream %d: could not close output stream, error - %d \n", params->stream_index, rc);
-        }
+        fprintf(log_file, "Closing Associated as Main Stream reached EOF %d \n",
+                params->stream_index, rc);
+        stop_playback = true;
     }
     rc = qahw_out_standby(params->out_handle);
     if (rc) {