commit 7b3e377e7167f8b5fdb5c7097c19cdafbe1d2c8d
author Manisha Agarwal <maniagar@codeaurora.org> Wed Feb 20 14:33:45 2019 +0530
committer Manisha Agarwal <maniagar@codeaurora.org> Thu Feb 28 11:15:29 2019 +0530
tree b2b62043d1162ae383ac73f4f2c9ff5b8de7c09e
parent 41c30f7ab10acf564e926a2b179c16a38ea9160a

hal: Resolves rewound and restart issue during SSR/PDR.

Audio playback after SSR/PDR gets rewound or restarts.

The issue occurs because of two scenarios:

1.out_get_render_position returns 0 when card status goes from offline
to online and out->compr is NULL.So,getPosition returns default 0 dsp
frames and anchorTime gets updated to mAudioFirstAnchorTimeMediaUs,
making it seek to the wrong position.

2.out_get_presentation_position returns 0 when out->compr is NULL,
even for offload usecase.

To solve the first issue introduce a flag which is true if the card
was offline previously and out_get_render_position checks the flag,
which if true return invalid value.For the second issue return failure
from out_get_presentation_position when out->compr is NULL and it is
offload usecase.

CRs-Fixed: 2392929
Change-Id: Ic0718bc2d62e4b05a6166efeb33ccf658d6cad2d

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index d1a0bd4..7a01029 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -3847,6 +3847,12 @@
     if (out->flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) {
         send_offload_cmd_l(out, OFFLOAD_CMD_ERROR);
     }
+
+    if (is_offload_usecase(out->usecase) && out->card_status == CARD_STATUS_OFFLINE) {
+        ALOGD("Setting previous card status if offline");
+        out->prev_card_status_offline = true;
+    }
+
     pthread_mutex_unlock(&out->lock);
 
     return status;
@@ -5142,6 +5148,9 @@
              */
             ALOGE(" ERROR: sound card not active, return error");
             ret = -EINVAL;
+        } else if (out->prev_card_status_offline) {
+            ALOGE("ERROR: previously sound card was offline,return error");
+            ret = -EINVAL;
         } else {
             ret = 0;
             adjust_frames_for_device_delay(out, dsp_frames);
@@ -5244,7 +5253,10 @@
         } else if (out->card_status == CARD_STATUS_OFFLINE) {
             *frames = out->written;
             clock_gettime(CLOCK_MONOTONIC, timestamp);
-            ret = 0;
+            if (is_offload_usecase(out->usecase))
+                ret = -EINVAL;
+            else
+                ret = 0;
         }
     }
     pthread_mutex_unlock(&out->lock);
@@ -6379,6 +6391,7 @@
     out->hal_output_suspend_supported = 0;
     out->dynamic_pm_qos_config_supported = 0;
     out->set_dual_mono = false;
+    out->prev_card_status_offline = false;
 
     if ((flags & AUDIO_OUTPUT_FLAG_BD) &&
         (property_get_bool("vendor.audio.matrix.limiter.enable", false)))

hal/audio_hw.h

diff --git a/hal/audio_hw.h b/hal/audio_hw.h
index 23306de..fa7a325 100644
--- a/hal/audio_hw.h
+++ b/hal/audio_hw.h
@@ -371,6 +371,7 @@
     mix_matrix_params_t pan_scale_params;
     mix_matrix_params_t downmix_params;
     bool set_dual_mono;
+    bool prev_card_status_offline;
 
     error_log_t *error_log;
 };