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
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
From: Dan Minor <dminor@mozilla.com>
|
|
Date: Fri, 29 Mar 2019 18:43:00 +0000
|
|
Subject: Bug 1539220 - Prefer non-RGB24 capabilities when available;
|
|
r=pehrsons
|
|
|
|
We've hit a number of problems with handling of RGB24 video capture on
|
|
Windows. This adds a check that will ignore any RGB24 capture capabilities
|
|
when determining a best match if there are other capabilities available to
|
|
workaround the problems.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D25449
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/c12307f3817bec87712ab5930493c3135c76b0a0
|
|
---
|
|
modules/video_capture/device_info_impl.cc | 13 +++++++++++++
|
|
1 file changed, 13 insertions(+)
|
|
|
|
diff --git a/modules/video_capture/device_info_impl.cc b/modules/video_capture/device_info_impl.cc
|
|
index 82f8a2db81..95059abc07 100644
|
|
--- a/modules/video_capture/device_info_impl.cc
|
|
+++ b/modules/video_capture/device_info_impl.cc
|
|
@@ -100,10 +100,23 @@ int32_t DeviceInfoImpl::GetBestMatchedCapability(
|
|
const int32_t numberOfCapabilies =
|
|
static_cast<int32_t>(_captureCapabilities.size());
|
|
|
|
+ bool hasNonRGB24Capability = false;
|
|
for (int32_t tmp = 0; tmp < numberOfCapabilies;
|
|
++tmp) // Loop through all capabilities
|
|
{
|
|
VideoCaptureCapability& capability = _captureCapabilities[tmp];
|
|
+ if (capability.videoType != VideoType::kRGB24) {
|
|
+ hasNonRGB24Capability = true;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ for (int32_t tmp = 0; tmp < numberOfCapabilies;
|
|
+ ++tmp) // Loop through all capabilities
|
|
+ {
|
|
+ VideoCaptureCapability& capability = _captureCapabilities[tmp];
|
|
+ if (hasNonRGB24Capability && capability.videoType == VideoType::kRGB24) {
|
|
+ continue;
|
|
+ }
|
|
|
|
const int32_t diffWidth = capability.width - requested.width;
|
|
const int32_t diffHeight = capability.height - requested.height;
|