From e79ee6494c2a1f2d3b1f1b1393ca85beee41a29d Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Fri, 31 Jan 2014 22:08:54 +0800
Subject: stagefright: Squashed commit of pause/resume features

Add 2 APIs (suspend/resume) in MediaPlayer

- API:suspend() will just pause the player and release all the decoders
  to replace release() which will release the whole player
- API:resume() will just init the decoders again,
  then start() will be called to restart streaming playback
- Add a check in AwesomePlayer::onVideoEvent()
  to make sure the first seek operation will always seek to the next
  i-frame

Change-Id: Ie4c82906a2a056378119921a656128ebdc1007c4

audio: Add pause support for hardware omx component

- ADSP doesn't enter sleep state after wma playback is paused
  and power suspended.
- No support for NT session pause in case of hardware component.
  NT session need to be paused to put ADSP into power collapse.
- Add support of pause in stagefright to ensure device enters
  suspend mode. Also add intermediate states to avoid concurrency
  issues between read and pause.

Change-Id: I41b946b8c8805e6ee303646b63513b5b16514ef6

libstagefright: Drain input buffer on resume

- Buffers returned from codec in paused state are not drained. When
codec is resumed these buffers are not drained until the next flush,
and may cause timed out issue.
- Added change to drain input buffers for sw decoders when resuming.

Change-Id: Ida2ab1d5dc3a1910accdd6fb89548262a912d8e7
CRs-Fixed: 569585, 574967

libstagefright: camcorder pause-resume implementation

- Add pause resume feature in camcorder app. So that
  user can pause recording and resume later which results
  in a single recorded clip.

Change-Id: Id19c45ae5bb85265aa4d5304b160ebf119d9575a

libstagefright: support pause/resume for timelapse recording

  Modify the timestamp calculation mechanism in CameraSourceTimeLapse
  in order to support pause/resume.

Change-Id: Icb02ea798b0b807ffb7ada2d1ef5b2414b74edfb
---
 media/libmedia/mediarecorder.cpp | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 media/libmedia/mediarecorder.cpp

(limited to 'media/libmedia/mediarecorder.cpp')

diff --git a/media/libmedia/mediarecorder.cpp b/media/libmedia/mediarecorder.cpp
old mode 100644
new mode 100755
index 8bbd8f1..8b7b171
--- a/media/libmedia/mediarecorder.cpp
+++ b/media/libmedia/mediarecorder.cpp
@@ -482,7 +482,7 @@ status_t MediaRecorder::start()
         ALOGE("media recorder is not initialized yet");
         return INVALID_OPERATION;
     }
-    if (!(mCurrentState & MEDIA_RECORDER_PREPARED)) {
+    if (!(mCurrentState & (MEDIA_RECORDER_PREPARED | MEDIA_RECORDER_PAUSED))) {
         ALOGE("start called in an invalid state: %d", mCurrentState);
         return INVALID_OPERATION;
     }
@@ -497,6 +497,29 @@ status_t MediaRecorder::start()
     return ret;
 }
 
+status_t MediaRecorder::pause()
+{
+    ALOGV("pause");
+    if (mMediaRecorder == NULL) {
+        ALOGE("media recorder is not initialized yet");
+        return INVALID_OPERATION;
+    }
+    if (!(mCurrentState & MEDIA_RECORDER_RECORDING)) {
+        ALOGE("pause called in an invalid state: %d", mCurrentState);
+        return INVALID_OPERATION;
+    }
+
+    status_t ret = mMediaRecorder->pause();
+    if (OK != ret) {
+        ALOGE("pause failed: %d", ret);
+        mCurrentState = MEDIA_RECORDER_ERROR;
+        return ret;
+    }
+
+    mCurrentState = MEDIA_RECORDER_PAUSED;
+    return ret;
+}
+
 status_t MediaRecorder::stop()
 {
     ALOGV("stop");
@@ -504,7 +527,7 @@ status_t MediaRecorder::stop()
         ALOGE("media recorder is not initialized yet");
         return INVALID_OPERATION;
     }
-    if (!(mCurrentState & MEDIA_RECORDER_RECORDING)) {
+    if (!(mCurrentState & (MEDIA_RECORDER_RECORDING | MEDIA_RECORDER_PAUSED))) {
         ALOGE("stop called in an invalid state: %d", mCurrentState);
         return INVALID_OPERATION;
     }
@@ -540,6 +563,7 @@ status_t MediaRecorder::reset()
             ret = OK;
             break;
 
+        case MEDIA_RECORDER_PAUSED:
         case MEDIA_RECORDER_RECORDING:
         case MEDIA_RECORDER_DATASOURCE_CONFIGURED:
         case MEDIA_RECORDER_PREPARED:
-- 
cgit v1.1