Michael Froman
6d038c44c4
We cherry-picked this in bug 2056029. Upstream commit: https://webrtc.googlesource.com/src/+/5da5a6e4e00c69ef60c7643e99ef34f65f7af51a video_capture: Implement buffer stride support for Pipewire Add optional buffer stride support to VideoCaptureImpl and use it in VideoCaptureModulePipeWire, allowing us to drop the requirement for unpadded buffers. This notably improves compatibility with libcamera, which supports a wider range of devices than the V4L2 backend - some having hardware requirements for stride-alignment. Extending `ConvertToI420()` in libyuv was rejected on the grounds that there are various approaches to stride handling - using a single stride value for multiple planes, having explicit values for each one etc. - as well as the fact that we might well want to extend the helper further in the future - e.g. in order to better handle color spaces such as BT709 (instead of always assuming BT601). Thus this patch now adds a local copy of `ConvertToI420()`, supporting implicit and a single explicit stride value for now. libyuv CL for context: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/8146821 Bug: chromium:538875176 Change-Id: Ic5781709cf5f20e8c75b9ad09d7052a355fcbec7 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/491680 Reviewed-by: Stefan Holmer <stefan@webrtc.org> Reviewed-by: Jan Grulich <grulja@gmail.com> Commit-Queue: Stefan Holmer <stefan@webrtc.org> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#48353}
49 lines
2.3 KiB
Diff
49 lines
2.3 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Fri, 16 Apr 2021 17:35:00 -0500
|
|
Subject: Bug 1654112 - General build fixes for paths and naming changes. r=ng
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D113438
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/99b99cca6b7b2c2ebffb5472457a4f927bda11c4
|
|
---
|
|
modules/video_capture/video_capture_impl.h | 6 ++++--
|
|
rtc_base/system/warn_current_thread_is_deadlocked.h | 2 +-
|
|
2 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/modules/video_capture/video_capture_impl.h b/modules/video_capture/video_capture_impl.h
|
|
index a0addc53c0..53666101e8 100644
|
|
--- a/modules/video_capture/video_capture_impl.h
|
|
+++ b/modules/video_capture/video_capture_impl.h
|
|
@@ -100,6 +100,10 @@ class RTC_EXPORT VideoCaptureImpl : public VideoCaptureModule {
|
|
RaceChecker capture_checker_;
|
|
// current Device unique name;
|
|
char* _deviceUniqueId RTC_GUARDED_BY(api_checker_);
|
|
+
|
|
+ // moved DeliverCapturedFrame to protected for VideoCaptureAndroid (mjf)
|
|
+ int32_t DeliverCapturedFrame(VideoFrame& captureFrame)
|
|
+ RTC_EXCLUSIVE_LOCKS_REQUIRED(api_lock_);
|
|
Mutex api_lock_;
|
|
// Should be set by platform dependent code in StartCapture.
|
|
VideoCaptureCapability _requestedCapability RTC_GUARDED_BY(api_checker_);
|
|
@@ -107,8 +111,6 @@ class RTC_EXPORT VideoCaptureImpl : public VideoCaptureModule {
|
|
private:
|
|
void UpdateFrameCount();
|
|
uint32_t CalculateFrameRate(int64_t now_ns);
|
|
- int32_t DeliverCapturedFrame(VideoFrame& captureFrame)
|
|
- RTC_EXCLUSIVE_LOCKS_REQUIRED(api_lock_);
|
|
void DeliverRawFrame(uint8_t* videoFrame,
|
|
size_t videoFrameLength,
|
|
const VideoCaptureCapability& frameInfo,
|
|
diff --git a/rtc_base/system/warn_current_thread_is_deadlocked.h b/rtc_base/system/warn_current_thread_is_deadlocked.h
|
|
index 4a0ba9dc09..eac12022ed 100644
|
|
--- a/rtc_base/system/warn_current_thread_is_deadlocked.h
|
|
+++ b/rtc_base/system/warn_current_thread_is_deadlocked.h
|
|
@@ -13,7 +13,7 @@
|
|
|
|
namespace webrtc {
|
|
|
|
-#if defined(WEBRTC_ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD)
|
|
+#if defined(WEBRTC_ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD) && !defined(MOZ_WIDGET_ANDROID)
|
|
void WarnThatTheCurrentThreadIsProbablyDeadlocked();
|
|
#else
|
|
inline void WarnThatTheCurrentThreadIsProbablyDeadlocked() {}
|