From 7262eae1402f3256606ad1776e35c4a08ed267c3 Mon Sep 17 00:00:00 2001
From: Dhananjay Kumar <dhakumar@codeaurora.org>
Date: Thu, 25 Feb 2016 13:48:33 +0530
Subject: nuplayer: ignore openAudioSink while waiting for teardown completion

- AudioSink is reopened on AudioTearDown event as well as on
  decoder output format change. These events are from different
  contexts, independent of each other and can occur concurrently,
  doing set of thread-unsafe operations on audioSink, which
  sometimes may result in fatal error.

- Any request to openSink, after teardown event is received but
  before its completed, is redundant since once teardown is
  completed sink is anyway going to be opened again. Also
  ignoring sink reopen while in teardown would avoid concurrent
  processing of thread-unsafe operations on audioSink.

- Update nuplayer to prevent reopening of sink while teardown is
  still going on.

CRs-Fixed: 978013
Change-Id: Ieb3825f133c2099e07d6e92ef101dd5156af8a20
---
 media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h')

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
index e872227..a84e673 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
@@ -83,6 +83,7 @@ struct NuPlayer::Renderer : public AHandler {
             bool *isOffloaded,
             bool isStreaming);
     void closeAudioSink();
+    void signalAudioTearDownComplete();
 
     enum {
         kWhatEOS                      = 'eos ',
@@ -92,6 +93,7 @@ struct NuPlayer::Renderer : public AHandler {
         kWhatMediaRenderingStart      = 'mdrd',
         kWhatAudioTearDown            = 'adTD',
         kWhatAudioOffloadPauseTimeout = 'aOPT',
+        kWhatAudioTearDownComplete    = 'aTDC',
     };
 
     enum AudioTearDownReason {
@@ -184,7 +186,7 @@ protected:
     int64_t mLastPositionUpdateUs;
 
     int32_t mAudioOffloadPauseTimeoutGeneration;
-    bool mAudioTornDown;
+    bool mAudioTearingDown;
     audio_offload_info_t mCurrentOffloadInfo;
 
     struct PcmInfo {
@@ -257,6 +259,7 @@ protected:
             uint32_t flags,
             bool isStreaming);
     void onCloseAudioSink();
+    void onAudioTearDownComplete();
 
     void notifyEOS(bool audio, status_t finalResult, int64_t delayUs = 0);
     void notifyFlushComplete(bool audio);
-- 
cgit v1.1