diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:47:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:47:29 +0000 |
| commit | 0ebf5bdf043a27fd3dfb7f92e0cb63d88954c44d (patch) | |
| tree | a31f07c9bcca9d56ce61e9a1ffd30ef350d513aa /third_party/libwebrtc/moz-patch-stack/0044.patch | |
| parent | Initial commit. (diff) | |
| download | firefox-esr-0ebf5bdf043a27fd3dfb7f92e0cb63d88954c44d.tar.xz firefox-esr-0ebf5bdf043a27fd3dfb7f92e0cb63d88954c44d.zip | |
Adding upstream version 115.8.0esr.upstream/115.8.0esr
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'third_party/libwebrtc/moz-patch-stack/0044.patch')
| -rw-r--r-- | third_party/libwebrtc/moz-patch-stack/0044.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/third_party/libwebrtc/moz-patch-stack/0044.patch b/third_party/libwebrtc/moz-patch-stack/0044.patch new file mode 100644 index 0000000000..3052fbef40 --- /dev/null +++ b/third_party/libwebrtc/moz-patch-stack/0044.patch @@ -0,0 +1,63 @@ +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 | 4 +++- + rtc_base/system/warn_current_thread_is_deadlocked.h | 2 +- + sdk/android/api/org/webrtc/VideoCodecInfo.java | 2 +- + 3 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 f874580471..b9af5f2441 100644 +--- a/modules/video_capture/video_capture_impl.h ++++ b/modules/video_capture/video_capture_impl.h +@@ -81,6 +81,9 @@ class VideoCaptureImpl : public VideoCaptureModule { + VideoCaptureImpl(); + ~VideoCaptureImpl() override; + ++ // moved DeliverCapturedFrame to protected for VideoCaptureAndroid (mjf) ++ int32_t DeliverCapturedFrame(VideoFrame& captureFrame); ++ + char* _deviceUniqueId; // current Device unique name; + Mutex api_lock_; + VideoCaptureCapability _requestedCapability; // Should be set by platform +@@ -89,7 +92,6 @@ class VideoCaptureImpl : public VideoCaptureModule { + private: + void UpdateFrameCount(); + uint32_t CalculateFrameRate(int64_t now_ns); +- int32_t DeliverCapturedFrame(VideoFrame& captureFrame); + 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() {} +diff --git a/sdk/android/api/org/webrtc/VideoCodecInfo.java b/sdk/android/api/org/webrtc/VideoCodecInfo.java +index 4f97cf74cf..363be347b5 100644 +--- a/sdk/android/api/org/webrtc/VideoCodecInfo.java ++++ b/sdk/android/api/org/webrtc/VideoCodecInfo.java +@@ -80,7 +80,7 @@ public class VideoCodecInfo { + } + + @CalledByNative +- Map getParams() { ++ Map<String, String> getParams() { + return params; + } + } +-- +2.34.1 + |