commit 9aee331b4930f7d11aa02a2dade9dc8383a0dade
author Linux Build Service Account <lnxbuild@localhost> Fri May 08 14:19:15 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri May 08 14:19:15 2015 -0700
tree c30b1ed93e977b11aa07dade75ef3f76d02d64c3
parent e003ce9ed80681c3d79da3fa7f1cdff3da4ecb0f
parent 32a556e36abfe5ac684c7c5a88c110a966c4dc08

Merge "hal: allow to get render position for non-offload use cases"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index a550ecc..4f69bd5 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2246,9 +2246,13 @@
 {
     struct stream_out *out = (struct stream_out *)stream;
     struct audio_device *adev = out->dev;
-    if (is_offload_usecase(out->usecase) && (dsp_frames != NULL)) {
+
+    if (dsp_frames == NULL)
+        return -EINVAL;
+
+    *dsp_frames = 0;
+    if (is_offload_usecase(out->usecase)) {
         ssize_t ret = 0;
-        *dsp_frames = 0;
         pthread_mutex_lock(&out->lock);
         if (out->compr != NULL) {
             ret = compress_get_tstamp(out->compr, (unsigned long *)dsp_frames,
@@ -2276,6 +2280,9 @@
         } else {
             return 0;
         }
+    } else if (audio_is_linear_pcm(out->format)) {
+        *dsp_frames = out->written;
+        return 0;
     } else
         return -EINVAL;
 }