commit bbce432b67f41703d8e15518ba86c6f4827929fa
author Ashish Jain <ashishj@codeaurora.org> Tue Feb 16 13:25:27 2016 +0530
committer Ashish Jain <ashishj@codeaurora.org> Mon Feb 22 11:36:08 2016 +0530
tree f5739814a5aefa9c2605b6743715b12148d789c5
parent aee4fddb773e9b5e8838e24489b3eb45c1820c3d

hal: Ensure that stream is not started during Sub system restart.

-out_write is suppose to simulate the write to hardware
and drop the data during SSR (non compress offload usecases),
and the time taken up by out_write should be equal to time
required to render the same data.
-Current implementation ends up calling start_output_stream,
where as part of error handling out_write sleeps for 50ms.
- Hence the total time taken by out_write during SSR exceeds the
total buffer duration by almost 2 times, this results in
incorrect update of timeStamp values in the player.
-Ensure that out_write/in_read returns without starting a stream
during SSR.
-During SSR, return correct number of frames written to HAL
in case of non compress offload sessions.

Change-Id: Ib0d59b91af053da70a2eb844841d10b39c74bf18
CRs-Fixed: 968276

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index f8b9652..e4b8a37 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1997,7 +1997,7 @@
         pthread_mutex_unlock(&adev->lock);
     }
     pthread_mutex_unlock(&out->lock);
-    ALOGV("%s: exit", __func__);
+    ALOGD("%s: exit", __func__);
     return 0;
 }
 
@@ -2311,20 +2311,20 @@
     lock_output_stream(out);
 
     if (SND_CARD_STATE_OFFLINE == snd_scard_state) {
-        // increase written size during SSR to avoid mismatch
-        // with the written frames count in AF
-        if (!is_offload_usecase(out->usecase))
-            out->written += bytes / (out->config.channels * sizeof(short));
 
-        if (out->pcm) {
-            ALOGD(" %s: sound card is not active/SSR state", __func__);
-            ret= -EIO;
-            goto exit;
-        } else if (is_offload_usecase(out->usecase)) {
-            //during SSR for compress usecase we should return error to flinger
+        if (is_offload_usecase(out->usecase)) {
+            /*during SSR for compress usecase we should return error to flinger*/
             ALOGD(" copl %s: sound card is not active/SSR state", __func__);
             pthread_mutex_unlock(&out->lock);
             return -ENETRESET;
+        } else {
+            /* increase written size during SSR to avoid mismatch
+             * with the written frames count in AF
+             */
+            out->written += bytes / (out->config.channels * sizeof(short));
+            ALOGD(" %s: sound card is not active/SSR state", __func__);
+            ret= -EIO;
+            goto exit;
         }
     }
 
@@ -2434,9 +2434,8 @@
             out->standby = true;
         }
         out_standby(&out->stream.common);
-        usleep(bytes * 1000000 / audio_stream_out_frame_size(stream) /
+        usleep((uint64_t)bytes * 1000000 / audio_stream_out_frame_size(stream) /
                         out_get_sample_rate(&out->stream.common));
-
     }
     return bytes;
 }
@@ -2550,11 +2549,13 @@
                     ret = 0;
                 }
             }
+        } else if (adev->snd_card_status.state == SND_CARD_STATE_OFFLINE) {
+            *frames = out->written;
+            clock_gettime(CLOCK_MONOTONIC, timestamp);
+            ret = 0;
         }
     }
-
     pthread_mutex_unlock(&out->lock);
-
     return ret;
 }
 
@@ -2864,7 +2865,7 @@
         return bytes;
     }
 
-    if (in->pcm && (SND_CARD_STATE_OFFLINE == snd_scard_state)) {
+    if (SND_CARD_STATE_OFFLINE == snd_scard_state) {
         ALOGD(" %s: sound card is not active/SSR state", __func__);
         ret= -EIO;;
         goto exit;
@@ -2930,7 +2931,7 @@
         memset(buffer, 0, bytes);
         in_standby(&in->stream.common);
         ALOGV("%s: read failed status %d- sleeping for buffer duration", __func__, ret);
-        usleep(bytes * 1000000 / audio_stream_in_frame_size(stream) /
+        usleep((uint64_t)bytes * 1000000 / audio_stream_in_frame_size(stream) /
                                    in_get_sample_rate(&in->stream.common));
     }
     return bytes;