xymp
/
MpPreview
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/Camera2Raw

Browse Source
main
liuguijing 8 months ago
parent 30c01a5068 afefe0027f
commit 9e530eaa75
3 changed files with 57 additions and 42 deletions
Show Stats Download Patch File Download Diff File

10
Application/src/main/java/com/xypower/mppreview/AutoFitTextureView.java
Unescape Escape View File

@ -18,6 +18,7 @@ package com.xypower.mppreview;
import android.content.Context;
import android.util.AttributeSet;
import android.util.Log;
import android.view.TextureView;
/**
@ -52,11 +53,15 @@ public class AutoFitTextureView extends TextureView {
if (width < 0 || height < 0) {
throw new IllegalArgumentException("Size cannot be negative.");
}
Log.i("AutoFit", "setAspectRatio Width=" + width + " Height=" + height);
if (mRatioWidth == width && mRatioHeight == height) {
return;
}
mRatioWidth = width;
mRatioHeight = height;
requestLayout();
}
@ -65,12 +70,17 @@ public class AutoFitTextureView extends TextureView {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
int width = MeasureSpec.getSize(widthMeasureSpec);
int height = MeasureSpec.getSize(heightMeasureSpec);
if (0 == mRatioWidth || 0 == mRatioHeight) {
Log.i("AutoFit", "0 Width=" + width + " Height=" + height);
setMeasuredDimension(width, height);
} else {
if (width < height * mRatioWidth / mRatioHeight) {
Log.i("AutoFit", "Width=" + width + " Height=" + ((int)(width * mRatioHeight / mRatioWidth)));
setMeasuredDimension(width, width * mRatioHeight / mRatioWidth);
} else {
Log.i("AutoFit", "Width=" + ((int)height * mRatioWidth / mRatioHeight) + " Height=" + height);
setMeasuredDimension(height * mRatioWidth / mRatioHeight, height);
}
}

18
Application/src/main/java/com/xypower/mppreview/Camera2RawFragment.java
Unescape Escape View File

@ -177,7 +177,7 @@ public class Camera2RawFragment extends Fragment
/**
* Tag for the {@link Log}.
*/
private static final String TAG = "Camera2RawFragment";
private static final String TAG = "MpPreview";
/**
* Camera state: Device is closed.
@ -626,6 +626,7 @@ public class Camera2RawFragment extends Fragment
} else {
mTextureView.setSurfaceTextureListener(mSurfaceTextureListener);
}
if (mOrientationListener != null && mOrientationListener.canDetectOrientation()) {
mOrientationListener.enable();
}
@ -705,9 +706,11 @@ public class Camera2RawFragment extends Fragment
CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
// For still image captures, we use the largest available size.
Size largestJpeg = Collections.max(
Arrays.asList(map.getOutputSizes(ImageFormat.JPEG)),
new CompareSizesByArea());
Size[] resolutions = map.getHighResolutionOutputSizes(ImageFormat.JPEG);
if (resolutions == null) {
resolutions = map.getOutputSizes(ImageFormat.JPEG);
}
Size largestJpeg = Collections.max(Arrays.asList(resolutions), new CompareSizesByArea());
synchronized (mCameraStateLock) {
// Set up ImageReaders for JPEG and RAW outputs. Place these in a reference
@ -1033,7 +1036,7 @@ public class Camera2RawFragment extends Fragment
// Swap the view dimensions for calculation as needed if they are rotated relative to
// the sensor.
boolean swappedDimensions = totalRotation == 90 || totalRotation == 270;
final boolean swappedDimensions = totalRotation == 90 || totalRotation == 270;
int rotatedViewWidth = viewWidth;
int rotatedViewHeight = viewHeight;
int maxPreviewWidth = displaySize.x;
@ -1056,7 +1059,8 @@ public class Camera2RawFragment extends Fragment
}
// Find the best preview size for these view dimensions and configured JPEG size.
Size previewSize = chooseOptimalSize(map.getOutputSizes(SurfaceTexture.class),
final Size previewSize = chooseOptimalSize(map.getOutputSizes(SurfaceTexture.class),
rotatedViewWidth, rotatedViewHeight, maxPreviewWidth, maxPreviewHeight,
largestJpeg);
@ -1068,6 +1072,8 @@ public class Camera2RawFragment extends Fragment
previewSize.getWidth(), previewSize.getHeight());
}
// Find rotation of device in degrees (reverse device orientation for front-facing
// cameras).
int rotation = (mCharacteristics.get(CameraCharacteristics.LENS_FACING) ==

29
Application/src/main/res/layout-land/fragment_camera2_basic.xml
Unescape Escape View File

@ -19,19 +19,20 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#000" >
<com.xypower.mppreview.AutoFitTextureView
android:id="@+id/texture"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</FrameLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="#504285f4"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
@ -39,12 +40,13 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_marginBottom="8dp"
android:scaleType="fitXY"
app:layout_constraintBottom_toTopOf="@+id/backMain"
android:alpha="0.5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.5"
app:layout_constraintEnd_toStartOf="@id/backMain"
app:layout_constraintHorizontal_bias="0.5"
app:srcCompat="@drawable/ic_take_photo"
/>
@ -53,15 +55,12 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:scaleType="fitXY"
app:layout_constraintStart_toStartOf="parent"
android:alpha="0.5"
app:layout_constraintStart_toEndOf="@id/picture"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/picture"
app:srcCompat="@drawable/ic_back"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

Write Preview
Loading…
Cancel
Save