pull/54/head
Mattia Iavarone 8 years ago
parent 00dcc76196
commit 227b94f599
  1. 1
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java
  2. 2
      cameraview/src/main/views/com/otaliastudios/cameraview/Preview.java
  3. 4
      cameraview/src/main/views/com/otaliastudios/cameraview/SurfaceViewPreview.java

@ -161,6 +161,7 @@ public class CameraView extends FrameLayout {
protected Preview instantiatePreview(Context context, ViewGroup container) { protected Preview instantiatePreview(Context context, ViewGroup container) {
// TextureView is not supported without hardware acceleration. // TextureView is not supported without hardware acceleration.
LOG.i("preview:", "isHardwareAccelerated:", isHardwareAccelerated());
return isHardwareAccelerated() ? return isHardwareAccelerated() ?
new TextureViewPreview(context, container, null) : new TextureViewPreview(context, container, null) :
new SurfaceViewPreview(context, container, null); new SurfaceViewPreview(context, container, null);

@ -8,7 +8,7 @@ import android.view.ViewGroup;
abstract class Preview<T extends View, Output> { abstract class Preview<T extends View, Output> {
protected final static CameraLogger LOG = CameraLogger.create(Preview.class.getSimpleName()); private final static CameraLogger LOG = CameraLogger.create(Preview.class.getSimpleName());
// Used for testing. // Used for testing.
Task<Void> mCropTask = new Task<>(); Task<Void> mCropTask = new Task<>();

@ -11,6 +11,7 @@ import android.view.ViewGroup;
// Fallback preview when hardware acceleration is off. // Fallback preview when hardware acceleration is off.
class SurfaceViewPreview extends Preview<SurfaceView, SurfaceHolder> { class SurfaceViewPreview extends Preview<SurfaceView, SurfaceHolder> {
private final static CameraLogger LOG = CameraLogger.create(SurfaceViewPreview.class.getSimpleName());
SurfaceViewPreview(Context context, ViewGroup parent, SurfaceCallback callback) { SurfaceViewPreview(Context context, ViewGroup parent, SurfaceCallback callback) {
super(context, parent, callback); super(context, parent, callback);
@ -29,12 +30,14 @@ class SurfaceViewPreview extends Preview<SurfaceView, SurfaceHolder> {
@Override @Override
public void surfaceCreated(SurfaceHolder holder) { public void surfaceCreated(SurfaceHolder holder) {
LOG.i("callback:", "surfaceCreated");
// Looks like this is too early to call anything. // Looks like this is too early to call anything.
// onSurfaceAvailable(getView().getWidth(), getView().getHeight()); // onSurfaceAvailable(getView().getWidth(), getView().getHeight());
} }
@Override @Override
public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
LOG.i("callback:", "surfaceChanged", "w:", width, "h:", height, "firstTime:", mFirstTime);
if (mFirstTime) { if (mFirstTime) {
onSurfaceAvailable(width, height); onSurfaceAvailable(width, height);
mFirstTime = false; mFirstTime = false;
@ -45,6 +48,7 @@ class SurfaceViewPreview extends Preview<SurfaceView, SurfaceHolder> {
@Override @Override
public void surfaceDestroyed(SurfaceHolder holder) { public void surfaceDestroyed(SurfaceHolder holder) {
LOG.i("callback:", "surfaceDestroyed");
onSurfaceDestroyed(); onSurfaceDestroyed();
mFirstTime = true; mFirstTime = true;
} }

Loading…
Cancel
Save