Byron Campen
704f30f181
Upstream commit: https://webrtc.googlesource.com/src/+/df1d02d83f6c34699ff047dfc104fc30773623dc [v4l2] Ensure deviceUniqueIdUTF8 is initialized Bug: chromium:506921095 Change-Id: I66dd7d5ec700224f0e19fed2d89812806a6a6964 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/468600 Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org> Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> Auto-Submit: Evan Shrubsole <eshr@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47585}
74 lines
2.4 KiB
Diff
74 lines
2.4 KiB
Diff
From: Michael Froman <mjfroman@mac.com>
|
|
Date: Thu, 19 May 2022 15:32:32 -0500
|
|
Subject: Bug 1772380 - Build 1766646 - (fix-c89fdd716c) fixes for the
|
|
refactored PlatformThread API;r?mjf
|
|
|
|
---
|
|
.../video_capture/linux/device_info_v4l2.cc | 20 ++++++-------------
|
|
.../video_capture/linux/device_info_v4l2.h | 3 +--
|
|
2 files changed, 7 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/modules/video_capture/linux/device_info_v4l2.cc b/modules/video_capture/linux/device_info_v4l2.cc
|
|
index 31f5e50cec..45de4c8a03 100644
|
|
--- a/modules/video_capture/linux/device_info_v4l2.cc
|
|
+++ b/modules/video_capture/linux/device_info_v4l2.cc
|
|
@@ -151,11 +151,6 @@ int DeviceInfoV4l2::ProcessInotifyEvents()
|
|
return 0;
|
|
}
|
|
|
|
-void DeviceInfoV4l2::InotifyEventThread(void* obj)
|
|
-{
|
|
- static_cast<DeviceInfoLinux*> (obj)->InotifyProcess();
|
|
-}
|
|
-
|
|
void DeviceInfoV4l2::InotifyProcess()
|
|
{
|
|
_fd_v4l = inotify_init();
|
|
@@ -181,16 +176,14 @@ void DeviceInfoV4l2::InotifyProcess()
|
|
|
|
DeviceInfoV4l2::DeviceInfoV4l2() : DeviceInfoImpl()
|
|
#ifdef WEBRTC_LINUX
|
|
- , _inotifyEventThread(new rtc::PlatformThread(
|
|
- InotifyEventThread, this, "InotifyEventThread"))
|
|
, _isShutdown(false)
|
|
#endif
|
|
{
|
|
#ifdef WEBRTC_LINUX
|
|
- if (_inotifyEventThread)
|
|
- {
|
|
- _inotifyEventThread->Start();
|
|
- }
|
|
+ _inotifyEventThread = PlatformThread::SpawnJoinable(
|
|
+ [this] {
|
|
+ InotifyProcess();
|
|
+ }, "InotifyEventThread");
|
|
#endif
|
|
}
|
|
|
|
@@ -202,9 +195,8 @@ DeviceInfoV4l2::~DeviceInfoV4l2() {
|
|
#ifdef WEBRTC_LINUX
|
|
_isShutdown = true;
|
|
|
|
- if (_inotifyEventThread) {
|
|
- _inotifyEventThread->Stop();
|
|
- _inotifyEventThread = nullptr;
|
|
+ if (!_inotifyEventThread.empty()) {
|
|
+ _inotifyEventThread.Finalize();
|
|
}
|
|
#endif
|
|
}
|
|
diff --git a/modules/video_capture/linux/device_info_v4l2.h b/modules/video_capture/linux/device_info_v4l2.h
|
|
index 74dd7e5818..db98a62bcc 100644
|
|
--- a/modules/video_capture/linux/device_info_v4l2.h
|
|
+++ b/modules/video_capture/linux/device_info_v4l2.h
|
|
@@ -61,8 +61,7 @@ class DeviceInfoV4l2 : public DeviceInfoImpl {
|
|
int EventCheck(int fd);
|
|
int HandleEvents(int fd);
|
|
int ProcessInotifyEvents();
|
|
- std::unique_ptr<rtc::PlatformThread> _inotifyEventThread;
|
|
- static void InotifyEventThread(void*);
|
|
+ PlatformThread _inotifyEventThread;
|
|
void InotifyProcess();
|
|
int _fd_v4l, _fd_dev, _wd_v4l, _wd_dev; /* accessed on InotifyEventThread thread */
|
|
std::atomic<bool> _isShutdown;
|