|
|
|
@ -1088,7 +1088,6 @@ public abstract class CameraEngine implements |
|
|
|
|
public void run() { |
|
|
|
|
LOG.v("takePicture", "performing. BindState:", getBindState(), "isTakingPicture:", isTakingPicture()); |
|
|
|
|
if (mMode == Mode.VIDEO) { |
|
|
|
|
// Could redirect to takePictureSnapshot, but it's better if people know what they are doing.
|
|
|
|
|
throw new IllegalStateException("Can't take hq pictures while in VIDEO mode"); |
|
|
|
|
} |
|
|
|
|
if (getBindState() < STATE_STARTED) return; |
|
|
|
@ -1096,7 +1095,7 @@ public abstract class CameraEngine implements |
|
|
|
|
stub.isSnapshot = false; |
|
|
|
|
stub.location = mLocation; |
|
|
|
|
stub.facing = mFacing; |
|
|
|
|
onTakePicture(stub); |
|
|
|
|
onTakePicture(stub, mPictureMetering); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
@ -1120,7 +1119,7 @@ public abstract class CameraEngine implements |
|
|
|
|
// Leave the other parameters to subclasses.
|
|
|
|
|
//noinspection ConstantConditions
|
|
|
|
|
AspectRatio ratio = AspectRatio.of(getPreviewSurfaceSize(Reference.OUTPUT)); |
|
|
|
|
onTakePictureSnapshot(stub, ratio); |
|
|
|
|
onTakePictureSnapshot(stub, ratio, mPictureSnapshotMetering); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
@ -1241,10 +1240,10 @@ public abstract class CameraEngine implements |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@WorkerThread |
|
|
|
|
protected abstract void onTakePicture(@NonNull PictureResult.Stub stub); |
|
|
|
|
protected abstract void onTakePicture(@NonNull PictureResult.Stub stub, boolean doMetering); |
|
|
|
|
|
|
|
|
|
@WorkerThread |
|
|
|
|
protected abstract void onTakePictureSnapshot(@NonNull PictureResult.Stub stub, @NonNull AspectRatio outputRatio); |
|
|
|
|
protected abstract void onTakePictureSnapshot(@NonNull PictureResult.Stub stub, @NonNull AspectRatio outputRatio, boolean doMetering); |
|
|
|
|
|
|
|
|
|
@WorkerThread |
|
|
|
|
protected abstract void onTakeVideoSnapshot(@NonNull VideoResult.Stub stub, @NonNull AspectRatio outputRatio); |
|
|
|
|