summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoModule.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
-rw-r--r--src/com/android/camera/VideoModule.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 20d1c3733..876905f93 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -28,7 +28,6 @@ import android.content.IntentFilter;
import android.content.SharedPreferences.Editor;
import android.content.res.Configuration;
import android.graphics.Bitmap;
-import android.graphics.SurfaceTexture;
import android.graphics.ImageFormat;
import android.hardware.Camera;
import android.hardware.Camera.CameraInfo;
@@ -52,6 +51,7 @@ import android.provider.MediaStore.Video;
import android.util.Log;
import android.view.KeyEvent;
import android.view.OrientationEventListener;
+import android.view.SurfaceHolder;
import android.view.View;
import android.view.WindowManager;
import android.widget.Toast;
@@ -1061,9 +1061,11 @@ public class VideoModule implements CameraModule,
Log.v(TAG, "startPreview");
mStartPrevPending = true;
- SurfaceTexture surfaceTexture = mUI.getSurfaceTexture();
- if (!mPreferenceRead || surfaceTexture == null || mPaused == true ||
- mCameraDevice == null) {
+ SurfaceHolder sh = null;
+ Log.v(TAG, "startPreview: SurfaceHolder (MDP path)");
+ sh = mUI.getSurfaceHolder();
+
+ if (!mPreferenceRead || mPaused == true || mCameraDevice == null) {
mStartPrevPending = false;
return;
}
@@ -1078,7 +1080,7 @@ public class VideoModule implements CameraModule,
setCameraParameters();
try {
- mCameraDevice.setPreviewTexture(surfaceTexture);
+ mCameraDevice.setPreviewDisplay(sh);
mCameraDevice.startPreview();
mPreviewing = true;
onPreviewStarted();