Byron Campen
a64125f1aa
Upstream commit: https://webrtc.googlesource.com/src/+/12edcab31901642a7bd43ca4c10b05caf037ddc7 Fix getParams return type. jni zero became more strict with https://chromium-review.git.corp.google.com/c/chromium/src/+/7697400 which breaks the Chromium roll in WebRTC: https://ci.chromium.org/ui/p/webrtc/builders/try/android_compile_x64_dbg/87719/overview Change-Id: I59f14149818f1cab45836cc1a9b385f204430f48 Bug: None Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/462140 Reviewed-by: Evan Shrubsole <eshr@webrtc.org> Commit-Queue: Jeremy Leconte <jleconte@google.com> Cr-Commit-Position: refs/heads/main@{#47351}
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 80d961c84c..3e77b262c7 100644
|
|
--- a/modules/video_capture/video_capture_impl.h
|
|
+++ b/modules/video_capture/video_capture_impl.h
|
|
@@ -98,6 +98,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_);
|
|
@@ -105,8 +109,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() {}
|