06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
65 lines
2.8 KiB
Diff
65 lines
2.8 KiB
Diff
From: Paul Adenot <paul@paul.cx>
|
|
Date: Wed, 4 Nov 2020 13:03:00 +0000
|
|
Subject: Bug 1675042 - Put IR camera last in the device selection list, so
|
|
that they are never the default. r=dminor
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D95764
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/754900ff2a2b1c32878baf3c76d7c0e8219419ff
|
|
---
|
|
sdk/android/api/org/webrtc/Camera1Enumerator.java | 5 +++++
|
|
sdk/android/api/org/webrtc/Camera2Enumerator.java | 12 ++++++++++++
|
|
sdk/android/api/org/webrtc/CameraEnumerator.java | 1 +
|
|
3 files changed, 18 insertions(+)
|
|
|
|
diff --git a/sdk/android/api/org/webrtc/Camera1Enumerator.java b/sdk/android/api/org/webrtc/Camera1Enumerator.java
|
|
index fb1a21f323..4a1aacdb05 100644
|
|
--- a/sdk/android/api/org/webrtc/Camera1Enumerator.java
|
|
+++ b/sdk/android/api/org/webrtc/Camera1Enumerator.java
|
|
@@ -63,6 +63,11 @@ public class Camera1Enumerator implements CameraEnumerator {
|
|
return info != null && info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK;
|
|
}
|
|
|
|
+ @Override
|
|
+ public boolean isInfrared(String deviceName) {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
@Override
|
|
public List<CaptureFormat> getSupportedFormats(String deviceName) {
|
|
return getSupportedFormats(getCameraIndex(deviceName));
|
|
diff --git a/sdk/android/api/org/webrtc/Camera2Enumerator.java b/sdk/android/api/org/webrtc/Camera2Enumerator.java
|
|
index 456d8cd060..44e239ad8e 100644
|
|
--- a/sdk/android/api/org/webrtc/Camera2Enumerator.java
|
|
+++ b/sdk/android/api/org/webrtc/Camera2Enumerator.java
|
|
@@ -74,6 +74,18 @@ public class Camera2Enumerator implements CameraEnumerator {
|
|
== CameraMetadata.LENS_FACING_BACK;
|
|
}
|
|
|
|
+ @Override
|
|
+ public boolean isInfrared(String deviceName) {
|
|
+ CameraCharacteristics characteristics = getCameraCharacteristics(deviceName);
|
|
+
|
|
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
|
+ Integer colors = characteristics.get(CameraCharacteristics.SENSOR_INFO_COLOR_FILTER_ARRANGEMENT);
|
|
+ return colors != null && colors.equals(CameraCharacteristics.SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_NIR);
|
|
+ }
|
|
+
|
|
+ return false;
|
|
+ }
|
|
+
|
|
@Nullable
|
|
@Override
|
|
public List<CaptureFormat> getSupportedFormats(String deviceName) {
|
|
diff --git a/sdk/android/api/org/webrtc/CameraEnumerator.java b/sdk/android/api/org/webrtc/CameraEnumerator.java
|
|
index dc954b62e0..db34d542c8 100644
|
|
--- a/sdk/android/api/org/webrtc/CameraEnumerator.java
|
|
+++ b/sdk/android/api/org/webrtc/CameraEnumerator.java
|
|
@@ -18,6 +18,7 @@ public interface CameraEnumerator {
|
|
public String[] getDeviceNames();
|
|
public boolean isFrontFacing(String deviceName);
|
|
public boolean isBackFacing(String deviceName);
|
|
+ public boolean isInfrared(String deviceName);
|
|
public List<CaptureFormat> getSupportedFormats(String deviceName);
|
|
|
|
public CameraVideoCapturer createCapturer(
|