Compare commits
2 Commits
cameraphy
...
fix4392giz
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
37083e2392 | ||
|
|
be50f85adb |
@@ -3,19 +3,15 @@ package com.genymobile.scrcpy;
|
|||||||
import com.genymobile.scrcpy.wrappers.DisplayManager;
|
import com.genymobile.scrcpy.wrappers.DisplayManager;
|
||||||
import com.genymobile.scrcpy.wrappers.ServiceManager;
|
import com.genymobile.scrcpy.wrappers.ServiceManager;
|
||||||
|
|
||||||
import android.annotation.TargetApi;
|
|
||||||
import android.graphics.Rect;
|
import android.graphics.Rect;
|
||||||
import android.hardware.camera2.CameraAccessException;
|
import android.hardware.camera2.CameraAccessException;
|
||||||
import android.hardware.camera2.CameraCharacteristics;
|
import android.hardware.camera2.CameraCharacteristics;
|
||||||
import android.hardware.camera2.CameraManager;
|
import android.hardware.camera2.CameraManager;
|
||||||
import android.hardware.camera2.params.StreamConfigurationMap;
|
import android.hardware.camera2.params.StreamConfigurationMap;
|
||||||
import android.media.MediaCodec;
|
import android.media.MediaCodec;
|
||||||
import android.os.Build;
|
|
||||||
import android.util.Range;
|
import android.util.Range;
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
|
||||||
import java.util.SortedSet;
|
import java.util.SortedSet;
|
||||||
import java.util.TreeSet;
|
import java.util.TreeSet;
|
||||||
|
|
||||||
@@ -88,7 +84,6 @@ public final class LogUtils {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@TargetApi(Build.VERSION_CODES.P)
|
|
||||||
public static String buildCameraListMessage(boolean includeSizes) {
|
public static String buildCameraListMessage(boolean includeSizes) {
|
||||||
StringBuilder builder = new StringBuilder("List of cameras:");
|
StringBuilder builder = new StringBuilder("List of cameras:");
|
||||||
CameraManager cameraManager = ServiceManager.getCameraManager();
|
CameraManager cameraManager = ServiceManager.getCameraManager();
|
||||||
@@ -112,12 +107,6 @@ public final class LogUtils {
|
|||||||
SortedSet<Integer> uniqueLowFps = getUniqueSet(lowFpsRanges);
|
SortedSet<Integer> uniqueLowFps = getUniqueSet(lowFpsRanges);
|
||||||
builder.append("fps=").append(uniqueLowFps).append(')');
|
builder.append("fps=").append(uniqueLowFps).append(')');
|
||||||
|
|
||||||
int[] capabilities = characteristics.get(CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES);
|
|
||||||
if (Arrays.asList(capabilities).contains(CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA)) {
|
|
||||||
Set<String> phy = characteristics.getPhysicalCameraIds();
|
|
||||||
builder.append("\n PHYSICAL: ").append(phy);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (includeSizes) {
|
if (includeSizes) {
|
||||||
StreamConfigurationMap configs = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
|
StreamConfigurationMap configs = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user