Merge "st-hal: restart session if buffering stopped early"
diff --git a/st_session.c b/st_session.c
index 9bb1c09..0ccdeaf 100644
--- a/st_session.c
+++ b/st_session.c
@@ -4801,18 +4801,34 @@
* Note: It is possible that detection event is not sent to
* client if second stage is not yet detected during internal
* buffering stop, in which case restart is posted from second
- * stage thread for further detections.
+ * stage thread for further detections. Only if the second
+ * stage detection hasn't be started due to internal buffering
+ * stop too early, restart session should be explictily issued.
*/
- if ((st_ses->current_state == buffering_state_fn) &&
- !stc_ses->pending_stop && stc_ses->detection_sent) {
- ALOGD("%s:[%d] buffering stopped internally, post c%d stop",
- __func__, st_ses->sm_handle,
- st_ses->det_stc_ses->sm_handle);
- status = hw_session_notifier_enqueue(stc_ses->sm_handle,
- ST_SES_EV_DEFERRED_STOP,
- ST_SES_DEFERRED_STOP_SS_DELAY_MS);
- if (!status)
- stc_ses->pending_stop = true;
+ if (st_ses->current_state == buffering_state_fn) {
+ if (stc_ses->detection_sent) {
+ if (!stc_ses->pending_stop) {
+ ALOGD("%s:[%d] buffering stopped internally, post c%d stop",
+ __func__, st_ses->sm_handle,
+ st_ses->det_stc_ses->sm_handle);
+ status = hw_session_notifier_enqueue(stc_ses->sm_handle,
+ ST_SES_EV_DEFERRED_STOP,
+ ST_SES_DEFERRED_STOP_SS_DELAY_MS);
+ if (!status)
+ stc_ses->pending_stop = true;
+ }
+ } else {
+ list_for_each(node, &stc_ses->second_stage_list) {
+ st_sec_stage = node_to_item(node, st_arm_second_stage_t,
+ list_node);
+ if (!st_sec_stage->ss_session->start_processing) {
+ st_session_ev_t ev = {.ev_id = ST_SES_EV_RESTART,
+ .stc_ses = stc_ses};
+ DISPATCH_EVENT(st_ses, ev, status);
+ break;
+ }
+ }
+ }
}
pthread_mutex_unlock(&st_ses->lock);
}