-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
android: disable UVC enumerator on Android 14
- Loading branch information
Showing
2 changed files
with
123 additions
and
113 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
233 changes: 122 additions & 111 deletions
233
android/src/main/java/com/oney/WebRTCModule/UVCCamera2Enumerator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,111 +1,122 @@ | ||
| package com.oney.WebRTCModule; | ||
|
|
||
| import android.content.Context; | ||
| import android.hardware.usb.UsbDevice; | ||
| import android.util.Log; | ||
|
|
||
| import androidx.annotation.Nullable; | ||
|
|
||
| import com.jiangdg.ausbc.camera.CameraUvcStrategy; | ||
| import com.jiangdg.ausbc.camera.bean.PreviewSize; | ||
|
|
||
| import org.webrtc.Camera2Enumerator; | ||
| import org.webrtc.CameraEnumerationAndroid; | ||
| import org.webrtc.CameraVideoCapturer; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| /** | ||
| * Camera2Enumerator with UVC Camera support. | ||
| * <p/> | ||
| * This implementation only adds support for UVC camera devices. | ||
| * Ie. Device's (back and/or front) cameras will use the basic implementation of {@link Camera2Enumerator}. | ||
| */ | ||
| public class UVCCamera2Enumerator extends Camera2Enumerator { | ||
| /** | ||
| * UVC camera names will be prefix with this value. Currently, there is no other way to | ||
| * easily distinguish between device's own and external uvc cameras in JS-side. | ||
| */ | ||
| public static final String UVC_PREFIX = "uvc-camera:"; | ||
| private final Context context; | ||
|
|
||
| public UVCCamera2Enumerator(Context context) { | ||
| super(context); | ||
| this.context = context; | ||
| } | ||
|
|
||
| @Override | ||
| public String[] getDeviceNames() { | ||
| ArrayList<String> devicesNames = new ArrayList<>(Arrays.asList(super.getDeviceNames())); | ||
|
|
||
| try { | ||
| CameraUvcStrategy uvcStrategy = new CameraUvcStrategy(context); | ||
| List<UsbDevice> uvcCameras = uvcStrategy.getUsbDeviceList(null); // null := no filtering | ||
| if (uvcCameras != null) { | ||
| uvcCameras.forEach(camera -> devicesNames.add(UVC_PREFIX + camera.getDeviceName())); | ||
| } | ||
| uvcStrategy.unRegister(); | ||
| } catch (Exception e) { | ||
| Log.e(WebRTCModule.TAG, "Error in uvc camera enumeration", e); | ||
| } | ||
|
|
||
| return devicesNames.toArray(new String[0]); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isFrontFacing(String deviceName) { | ||
| if (isUvcCamera(deviceName)) { | ||
| return true; | ||
| } | ||
|
|
||
| return super.isFrontFacing(deviceName); | ||
| } | ||
|
|
||
| public boolean isBackFacing(String deviceName) { | ||
| if (isUvcCamera(deviceName)) { | ||
| return false; | ||
| } | ||
|
|
||
| return super.isBackFacing(deviceName); | ||
| } | ||
|
|
||
| @Nullable | ||
| public List<CameraEnumerationAndroid.CaptureFormat> getSupportedFormats(String deviceName) { | ||
| if (isUvcCamera(deviceName)) { | ||
| CameraUvcStrategy cameraUvcStrategy = new CameraUvcStrategy(this.context); | ||
| List<PreviewSize> sizes = | ||
| cameraUvcStrategy.getAllPreviewSizes(null); // null := Ask all sizes for all aspect ratios. | ||
| cameraUvcStrategy.unRegister(); | ||
| if (sizes == null) { | ||
| return null; | ||
| } | ||
|
|
||
| int minFps = 1; | ||
| int maxFps = 30; | ||
| return sizes.stream() | ||
| .map(size | ||
| -> new CameraEnumerationAndroid.CaptureFormat( | ||
| size.getWidth(), size.getHeight(), minFps, maxFps)) | ||
| .collect(Collectors.toList()); | ||
| } | ||
|
|
||
| return super.getSupportedFormats(deviceName); | ||
| } | ||
|
|
||
| @Override | ||
| public CameraVideoCapturer createCapturer( | ||
| String cameraName, CameraVideoCapturer.CameraEventsHandler eventsHandler) { | ||
| if (isUvcCamera(cameraName)) { | ||
| return new UVCVideoCapturer(); | ||
| } | ||
|
|
||
| return super.createCapturer(cameraName, eventsHandler); | ||
| } | ||
|
|
||
| public static boolean isUvcCamera(String deviceName) { | ||
| return deviceName != null && deviceName.startsWith(UVC_PREFIX); | ||
| } | ||
| } | ||
| package com.oney.WebRTCModule; | ||
|
|
||
| import android.content.Context; | ||
| import android.content.pm.PackageManager; | ||
| import android.hardware.usb.UsbDevice; | ||
| import android.os.Build; | ||
| import android.util.Log; | ||
|
|
||
| import androidx.annotation.Nullable; | ||
|
|
||
| import com.jiangdg.ausbc.camera.CameraUvcStrategy; | ||
| import com.jiangdg.ausbc.camera.bean.PreviewSize; | ||
|
|
||
| import org.webrtc.Camera2Enumerator; | ||
| import org.webrtc.CameraEnumerationAndroid; | ||
| import org.webrtc.CameraVideoCapturer; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| /** | ||
| * Camera2Enumerator with UVC Camera support. | ||
| * <p/> | ||
| * This implementation only adds support for UVC camera devices. | ||
| * Ie. Device's (back and/or front) cameras will use the basic implementation of {@link Camera2Enumerator}. | ||
| */ | ||
| public class UVCCamera2Enumerator extends Camera2Enumerator { | ||
| /** | ||
| * UVC camera names will be prefix with this value. Currently, there is no other way to | ||
| * easily distinguish between device's own and external uvc cameras in JS-side. | ||
| */ | ||
| public static final String UVC_PREFIX = "uvc-camera:"; | ||
| private final Context context; | ||
|
|
||
| public UVCCamera2Enumerator(Context context) { | ||
| super(context); | ||
| this.context = context; | ||
| } | ||
|
|
||
| public static boolean isSupported(Context context) { | ||
| // Disable for Android 14 because of: https://github.com/jiangdongguo/AndroidUSBCamera/pull/647 | ||
| if (Build.VERSION.SDK_INT < 34) { | ||
| return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_USB_HOST); | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public String[] getDeviceNames() { | ||
| ArrayList<String> devicesNames = new ArrayList<>(Arrays.asList(super.getDeviceNames())); | ||
|
|
||
| try { | ||
| CameraUvcStrategy uvcStrategy = new CameraUvcStrategy(context); | ||
| List<UsbDevice> uvcCameras = uvcStrategy.getUsbDeviceList(null); // null := no filtering | ||
| if (uvcCameras != null) { | ||
| uvcCameras.forEach(camera -> devicesNames.add(UVC_PREFIX + camera.getDeviceName())); | ||
| } | ||
| uvcStrategy.unRegister(); | ||
| } catch (Exception e) { | ||
| Log.e(WebRTCModule.TAG, "Error in uvc camera enumeration", e); | ||
| } | ||
|
|
||
| return devicesNames.toArray(new String[0]); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isFrontFacing(String deviceName) { | ||
| if (isUvcCamera(deviceName)) { | ||
| return true; | ||
| } | ||
|
|
||
| return super.isFrontFacing(deviceName); | ||
| } | ||
|
|
||
| public boolean isBackFacing(String deviceName) { | ||
| if (isUvcCamera(deviceName)) { | ||
| return false; | ||
| } | ||
|
|
||
| return super.isBackFacing(deviceName); | ||
| } | ||
|
|
||
| @Nullable | ||
| public List<CameraEnumerationAndroid.CaptureFormat> getSupportedFormats(String deviceName) { | ||
| if (isUvcCamera(deviceName)) { | ||
| CameraUvcStrategy cameraUvcStrategy = new CameraUvcStrategy(this.context); | ||
| List<PreviewSize> sizes = | ||
| cameraUvcStrategy.getAllPreviewSizes(null); // null := Ask all sizes for all aspect ratios. | ||
| cameraUvcStrategy.unRegister(); | ||
| if (sizes == null) { | ||
| return null; | ||
| } | ||
|
|
||
| int minFps = 1; | ||
| int maxFps = 30; | ||
| return sizes.stream() | ||
| .map(size | ||
| -> new CameraEnumerationAndroid.CaptureFormat( | ||
| size.getWidth(), size.getHeight(), minFps, maxFps)) | ||
| .collect(Collectors.toList()); | ||
| } | ||
|
|
||
| return super.getSupportedFormats(deviceName); | ||
| } | ||
|
|
||
| @Override | ||
| public CameraVideoCapturer createCapturer( | ||
| String cameraName, CameraVideoCapturer.CameraEventsHandler eventsHandler) { | ||
| if (isUvcCamera(cameraName)) { | ||
| return new UVCVideoCapturer(); | ||
| } | ||
|
|
||
| return super.createCapturer(cameraName, eventsHandler); | ||
| } | ||
|
|
||
| public static boolean isUvcCamera(String deviceName) { | ||
| return deviceName != null && deviceName.startsWith(UVC_PREFIX); | ||
| } | ||
| } |