commit 10e79c660583f74269cd197bc5764be80964a3fc
author The Android Automerger <android-build@google.com> Mon Sep 09 06:01:53 2013 -0700
committer The Android Automerger <android-build@google.com> Mon Sep 09 06:01:53 2013 -0700
tree b31d65c997db2f5bb16c6b8e7d1b138b7b99f7f5
parent 6e89524079e9c3a1037c57a99854820d88c9380b
parent d604d86dd53680fb3106f4d5eb99afcec6797b41

merge in klp-release history after reset to klp-dev

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 73d9a3b..852ddf6 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -740,8 +740,11 @@
         pthread_mutex_lock(&out->lock);
         out->offload_thread_blocked = false;
         pthread_cond_signal(&out->cond);
-        if (send_callback)
+        if (send_callback) {
+            if (event == STREAM_CBK_EVENT_DRAIN_READY)
+                stop_compressed_output_l(out);
             out->offload_callback(event, NULL, out->offload_cookie);
+        }
         free(cmd);
     }
 
@@ -1268,7 +1271,7 @@
 {
     struct stream_out *out = (struct stream_out *)stream;
     struct audio_device *adev = out->dev;
-    size_t ret = 0;
+    ssize_t ret = 0;
 
     pthread_mutex_lock(&out->lock);
     if (out->standby) {
@@ -1285,7 +1288,8 @@
 
     if (out->usecase == USECASE_AUDIO_PLAYBACK_OFFLOAD) {
         ret = compress_write(out->compr, buffer, bytes);
-        if (ret < bytes) {
+        ALOGVV("%s: writing buffer (%d bytes) to pcm device returned %d", __func__, bytes, ret);
+        if (ret >= 0 && ret < (ssize_t)bytes) {
             send_offload_cmd_l(out, OFFLOAD_CMD_WAIT_FOR_BUFFER);
         }
         if (!out->playback_started) {