Rename getSurfaceSize to getPreviewSurfaceSize

pull/393/head
Mattia Iavarone 7 years ago
parent 632cc0f09a
commit 77ed778564
  1. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java
  2. 5
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java

@ -72,7 +72,7 @@ class Camera1 extends CameraController implements Camera.PreviewCallback, Camera
*/
@Override
public void onSurfaceAvailable() {
LOG.i("onSurfaceAvailable:", "Size is", getSurfaceSize(REF_VIEW));
LOG.i("onSurfaceAvailable:", "Size is", getPreviewSurfaceSize(REF_VIEW));
schedule(null, false, new Runnable() {
@Override
public void run() {
@ -90,7 +90,7 @@ class Camera1 extends CameraController implements Camera.PreviewCallback, Camera
*/
@Override
public void onSurfaceChanged() {
LOG.i("onSurfaceChanged, size is", getSurfaceSize(REF_VIEW));
LOG.i("onSurfaceChanged, size is", getPreviewSurfaceSize(REF_VIEW));
schedule(null, true, new Runnable() {
@Override
public void run() {

@ -511,8 +511,9 @@ abstract class CameraController implements
return flip(REF_SENSOR, reference) ? mPreviewStreamSize.flip() : mPreviewStreamSize;
}
@SuppressWarnings("SameParameterValue")
@Nullable
final Size getSurfaceSize(int reference) {
final Size getPreviewSurfaceSize(int reference) {
if (mPreview == null) return null;
return flip(REF_VIEW, reference) ? mPreview.getSurfaceSize().flip() : mPreview.getSurfaceSize();
}
@ -570,7 +571,7 @@ abstract class CameraController implements
// Create our own default selector, which will be used if the external mPreviewStreamSizeSelector
// is null, or if it fails in finding a size.
Size targetMinSize = getSurfaceSize(REF_VIEW);
Size targetMinSize = getPreviewSurfaceSize(REF_VIEW);
AspectRatio targetRatio = AspectRatio.of(mCaptureSize.getWidth(), mCaptureSize.getHeight());
if (flip) targetRatio = targetRatio.inverse();
LOG.i("size:", "computePreviewStreamSize:", "targetRatio:", targetRatio, "targetMinSize:", targetMinSize);

Loading…
Cancel
Save