Merge "SnapdragonCamera: Update preview UI when recording rest time was zero" into camera.lnx.1.0-dev.1.0

1 files changed, 21 insertions, 1 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 6e30abaa2..e10847bab 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -114,7 +114,8 @@ import java.lang.reflect.Method;
 public class CaptureModule implements CameraModule, PhotoController,
         MediaSaveService.Listener, ClearSightImageProcessor.Callback,
         SettingsManager.Listener, LocationManager.Listener,
-        CountDownView.OnCountDownFinishedListener {
+        CountDownView.OnCountDownFinishedListener,
+        MediaRecorder.OnInfoListener{
     public static final int DUAL_MODE = 0;
     public static final int BAYER_MODE = 1;
     public static final int MONO_MODE = 2;
@@ -2806,6 +2807,7 @@ public class CaptureModule implements CameraModule, PhotoController,
         closePreviewSession();
         mMediaRecorder.stop();
         mMediaRecorder.reset();
+        mMediaRecorder.setOnInfoListener(null);
         saveVideo();
         mUI.showRecordingUI(false, false);
         mUI.enableShutter(true);
@@ -2976,6 +2978,7 @@ public class CaptureModule implements CameraModule, PhotoController,
             mMediaRecorder.setOrientationHint(rotation);
         }
         mMediaRecorder.prepare();
+        mMediaRecorder.setOnInfoListener(this);
     }
 
     public void onVideoButtonClick() {
@@ -3794,6 +3797,23 @@ public class CaptureModule implements CameraModule, PhotoController,
         enableRecordingLocation(false);
     }
 
+    // from MediaRecorder.OnInfoListener
+    @Override
+    public void onInfo(MediaRecorder mr, int what, int extra) {
+        if (what == MediaRecorder.MEDIA_RECORDER_INFO_MAX_DURATION_REACHED) {
+            if (mIsRecordingVideo) {
+                stopRecordingVideo(getMainCameraId());
+            }
+        } else if (what == MediaRecorder.MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED) {
+           if (mIsRecordingVideo) {
+               stopRecordingVideo(getMainCameraId());
+           }
+            // Show the toast.
+            RotateTextToast.makeText(mActivity, R.string.video_reach_size_limit,
+                    Toast.LENGTH_LONG).show();
+        }
+    }
+
     private byte[] getJpegData(Image image) {
         ByteBuffer buffer = image.getPlanes()[0].getBuffer();
         byte[] bytes = new byte[buffer.remaining()];