audio: Multizone: Refactor stream resume/idle

Refactor the resume (leaving standby on first read/write) and
idle (entering standby) in preparation for voice call support.

JAMR3 outputs have mixer controls that do not need to change
dynamically, so they are moved to the default routes section
of the dra7evm paths.

Change-Id: I432a69ca67eff0e276ce90170dff4a5201ac181a
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>

3 files changed, 69 insertions, 50 deletions

diff --git a/audio/multizone/AudioHw.cpp b/audio/multizone/AudioHw.cpp
index 78caf77..9b432e9 100644
--- a/audio/multizone/AudioHw.cpp
+++ b/audio/multizone/AudioHw.cpp
@@ -131,6 +131,31 @@ int AudioStreamOut::setFormat(audio_format_t format)
     return 0;
 }
 
+/* must be called with mLock */
+int AudioStreamOut::resume()
+{
+    int ret = mWriter->registerStream(mStream);
+    if (ret) {
+        ALOGE("AudioStreamOut: failed to register stream %d", ret);
+        return ret;
+    }
+
+    ret = mStream->start();
+    if (ret) {
+        ALOGE("AudioStreamOut: failed to start stream %d", ret);
+        mWriter->unregisterStream(mStream);
+    }
+
+    return ret;
+}
+
+/* must be called with mLock */
+void AudioStreamOut::idle()
+{
+    mStream->stop();
+    mWriter->unregisterStream(mStream);
+}
+
 int AudioStreamOut::standby()
 {
     ALOGV("AudioStreamOut: standby()");
@@ -138,9 +163,7 @@ int AudioStreamOut::standby()
     AutoMutex lock(mLock);
 
     if (!mStandby) {
-        mStream->stop();
-        mWriter->unregisterStream(mStream);
-        mHwDev->mMixer.setPath(mDevices, false);
+        idle();
         mStandby = true;
     }
 
@@ -229,20 +252,12 @@ ssize_t AudioStreamOut::write(const void* buffer, size_t bytes)
     AutoMutex lock(mLock);
 
     if (mStandby) {
-        mHwDev->mMixer.setPath(mDevices, true);
-        ret = mWriter->registerStream(mStream);
+        ret = resume();
         if (ret) {
-            ALOGE("AudioStreamOut: failed to register stream %d", ret);
-            return ret;
-        }
-        ret = mStream->start();
-        if (ret) {
-            ALOGE("AudioStreamOut: failed to start stream %d", ret);
-            mWriter->unregisterStream(mStream);
+            ALOGE("AudioStreamOut: failed to resume stream %d", ret);
             usleep(usecs); /* limits the rate of error messages */
             return ret;
         }
-
         mStandby = false;
     }
 
@@ -361,6 +376,34 @@ int AudioStreamIn::setFormat(audio_format_t format)
     return 0;
 }
 
+/* must be called with mLock */
+int AudioStreamIn::resume()
+{
+    mHwDev->mMixer.setPath(mDevices, true);
+
+    int ret = mReader->registerStream(mStream);
+    if (ret) {
+        ALOGE("AudioStreamIn: failed to register Dest %d", ret);
+        return ret;
+    }
+
+    ret = mStream->start();
+    if (ret) {
+        ALOGE("AudioStreamIn: failed to start stream %d", ret);
+        mReader->unregisterStream(mStream);
+    }
+
+    return ret;
+}
+
+/* must be called with mLock */
+void AudioStreamIn::idle()
+{
+    mStream->stop();
+    mReader->unregisterStream(mStream);
+    mHwDev->mMixer.setPath(mDevices, false);
+}
+
 int AudioStreamIn::standby()
 {
     ALOGV("AudioStreamIn: standby()");
@@ -368,9 +411,7 @@ int AudioStreamIn::standby()
     AutoMutex lock(mLock);
 
     if (!mStandby) {
-        mStream->stop();
-        mReader->unregisterStream(mStream);
-        mHwDev->mMixer.setPath(mDevices, false);
+        idle();
         mStandby = true;
     }
 
@@ -473,27 +514,18 @@ ssize_t AudioStreamIn::read(void* buffer, size_t bytes)
     AutoMutex lock(mLock);
 
     if (mStandby) {
-        mHwDev->mMixer.setPath(mDevices, true);
-        ret = mReader->registerStream(mStream);
+        ret = resume();
         if (ret) {
-            ALOGE("AudioStreamIn: failed to register Dest %d", ret);
-            return ret;
-        }
-        ret = mStream->start();
-        if (ret) {
-            ALOGE("AudioStreamIn: failed to start stream %d", ret);
-            mReader->unregisterStream(mStream);
+            ALOGE("AudioStreamIn: failed to resume stream %d", ret);
             usleep(usecs); /* limits the rate of error messages */
             return ret;
         }
-
         mStandby = false;
     }
 
     ret = mStream->read(buffer, frames);
     if (ret < 0) {
         ALOGE("AudioStreamIn: failed to read data %d", ret);
-        uint32_t usecs = (frames * 1000000) / mParams.sampleRate;
         usleep(usecs);
         bytes = ret;
     } else {
diff --git a/audio/multizone/AudioHw.h b/audio/multizone/AudioHw.h
index 2a5e296..a0973ad 100644
--- a/audio/multizone/AudioHw.h
+++ b/audio/multizone/AudioHw.h
@@ -53,10 +53,6 @@ class AudioStream {
     virtual char *getParameters(const char *keys) const = 0;
     virtual int addAudioEffect(effect_handle_t effect) const = 0;
     virtual int removeAudioEffect(effect_handle_t effect) const = 0;
-
-    // FIXME not used
-    static const uint32_t kDefaultSampleRate = 44100;
-    static const uint32_t kDefaultBufferSize = 4096;
 };
 
 class AudioStreamOut : public RefBase, public AudioStream {
@@ -92,6 +88,9 @@ class AudioStreamOut : public RefBase, public AudioStream {
     int getNextWriteTimestamp(int64_t *timestamp) const;
 
  protected:
+    int resume();
+    void idle();
+
     AudioHwDevice *mHwDev;
     PcmWriter *mWriter;
     PcmParams mParams;
@@ -132,6 +131,9 @@ class AudioStreamIn : public RefBase, public AudioStream {
     uint32_t getInputFramesLost();
 
  protected:
+    int resume();
+    void idle();
+
     AudioHwDevice *mHwDev;
     PcmReader *mReader;
     PcmParams mParams;
diff --git a/audio/multizone/dra7evm_paths.xml b/audio/multizone/dra7evm_paths.xml
index a64ea4c..7b5f057 100644
--- a/audio/multizone/dra7evm_paths.xml
+++ b/audio/multizone/dra7evm_paths.xml
@@ -31,7 +31,7 @@
 <!-- JAMR3 board, codec-A input: Line-In -->
 <ctl name="J3A Left PGA Mixer Line1L Switch" value="1" />
 <ctl name="J3A Right PGA Mixer Line1R Switch" value="1" />
-<ctl name="J3A PGA Capture Switch" value="0" />
+<ctl name="J3A PGA Capture Switch" value="1" />
 <ctl name="J3A PGA Capture Volume" value="0" />
 <ctl name="J3A Left Line1L Mux" value="differential" />
 <ctl name="J3A Right Line1L Mux" value="differential" />
@@ -53,7 +53,7 @@
 <ctl name="J3A Right DAC Mux" value="DAC_R1" />
 <ctl name="J3A Left Line Mixer DACL1 Switch" value="1" />
 <ctl name="J3A Right Line Mixer DACR1 Switch" value="1" />
-<ctl name="J3A Line DAC Playback Volume" value="0" />
+<ctl name="J3A Line DAC Playback Volume" value="118" />
 <ctl name="J3A Line Playback Switch" value="1" />
 <ctl name="J3A PCM Playback Volume" value="127" />
 
@@ -62,7 +62,7 @@
 <ctl name="J3B Right DAC Mux" value="DAC_R1" />
 <ctl name="J3B Left Line Mixer DACL1 Switch" value="1" />
 <ctl name="J3B Right Line Mixer DACR1 Switch" value="1" />
-<ctl name="J3B Line DAC Playback Volume" value="0" />
+<ctl name="J3B Line DAC Playback Volume" value="118" />
 <ctl name="J3B Line Playback Switch" value="1" />
 <ctl name="J3B PCM Playback Volume" value="127" />
 
@@ -71,7 +71,7 @@
 <ctl name="J3C Right DAC Mux" value="DAC_R1" />
 <ctl name="J3C Left Line Mixer DACL1 Switch" value="1" />
 <ctl name="J3C Right Line Mixer DACR1 Switch" value="1" />
-<ctl name="J3C Line DAC Playback Volume" value="0" />
+<ctl name="J3C Line DAC Playback Volume" value="118" />
 <ctl name="J3C Line Playback Switch" value="1" />
 <ctl name="J3C PCM Playback Volume" value="127" />
 
@@ -92,19 +92,4 @@
 <ctl name="J3B PGA Capture Switch" id="1" value="1" />
 </path>
 
-<!-- On-board output: Line-Out -->
-<path name="AUDIO_DEVICE_OUT_SPEAKER">
-<ctl name="Line DAC Playback Volume" value="118" />
-</path>
-
-<!-- JAMR3 codec B output: Line-Out -->
-<path name="AUDIO_DEVICE_OUT_WIRED_HEADPHONE">
-<ctl name="J3B Line DAC Playback Volume" value="118" />
-</path>
-
-<!-- JAMR3 codec C output: Line-Out -->
-<path name="AUDIO_DEVICE_OUT_WIRED_HEADPHONE2">
-<ctl name="J3C Line DAC Playback Volume" value="118" />
-</path>
-
 </mixer>