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}
96 lines
3.5 KiB
Diff
96 lines
3.5 KiB
Diff
From: Alex Chronopoulos <achronop@gmail.com>
|
|
Date: Wed, 18 Sep 2019 13:16:00 +0000
|
|
Subject: Bug 1572281 - Remove audio device change notifications from video
|
|
capture in Linux. r=dminor
|
|
|
|
Video capture used to provide device change notifications for audio and video devices. From now on, CubebDeviceEnumerator will provide audio device change notifications thus video capture is updated to notify only changes of the video device. This is the Linux part.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D46272
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/7bf7263db30b794139332691f4fbc98b4bfcfdd7
|
|
---
|
|
.../video_capture/linux/device_info_v4l2.cc | 28 ++-----------------
|
|
1 file changed, 3 insertions(+), 25 deletions(-)
|
|
|
|
diff --git a/modules/video_capture/linux/device_info_v4l2.cc b/modules/video_capture/linux/device_info_v4l2.cc
|
|
index 2c4a9a365a..a836c701d0 100644
|
|
--- a/modules/video_capture/linux/device_info_v4l2.cc
|
|
+++ b/modules/video_capture/linux/device_info_v4l2.cc
|
|
@@ -62,7 +62,7 @@ namespace videocapturemodule {
|
|
void DeviceInfoV4l2::HandleEvent(inotify_event* event, int fd)
|
|
{
|
|
if (event->mask & IN_CREATE) {
|
|
- if (fd == _fd_v4l || fd == _fd_snd) {
|
|
+ if (fd == _fd_v4l) {
|
|
DeviceChange();
|
|
} else if ((event->mask & IN_ISDIR) && (fd == _fd_dev)) {
|
|
if (_wd_v4l < 0) {
|
|
@@ -74,25 +74,15 @@ void DeviceInfoV4l2::HandleEvent(inotify_event* event, int fd)
|
|
DeviceChange();
|
|
}
|
|
}
|
|
- if (_wd_snd < 0) {
|
|
- usleep(5*1000);
|
|
- _wd_snd = inotify_add_watch(_fd_snd, "/dev/snd/by-path/", IN_CREATE | IN_DELETE | IN_DELETE_SELF);
|
|
- if (_wd_snd >= 0) {
|
|
- DeviceChange();
|
|
- }
|
|
- }
|
|
}
|
|
} else if (event->mask & IN_DELETE) {
|
|
- if (fd == _fd_v4l || fd == _fd_snd) {
|
|
+ if (fd == _fd_v4l) {
|
|
DeviceChange();
|
|
}
|
|
} else if (event->mask & IN_DELETE_SELF) {
|
|
if (fd == _fd_v4l) {
|
|
inotify_rm_watch(_fd_v4l, _wd_v4l);
|
|
_wd_v4l = -1;
|
|
- } else if (fd == _fd_snd) {
|
|
- inotify_rm_watch(_fd_snd, _wd_snd);
|
|
- _wd_snd = -1;
|
|
} else {
|
|
assert(false);
|
|
}
|
|
@@ -159,11 +149,6 @@ int DeviceInfoV4l2::ProcessInotifyEvents()
|
|
break;
|
|
}
|
|
}
|
|
- if (EventCheck(_fd_snd) > 0) {
|
|
- if (HandleEvents(_fd_snd) < 0) {
|
|
- break;
|
|
- }
|
|
- }
|
|
}
|
|
return 0;
|
|
}
|
|
@@ -176,11 +161,9 @@ void DeviceInfoV4l2::InotifyEventThread(void* obj)
|
|
void DeviceInfoV4l2::InotifyProcess()
|
|
{
|
|
_fd_v4l = inotify_init();
|
|
- _fd_snd = inotify_init();
|
|
_fd_dev = inotify_init();
|
|
- if (_fd_v4l >= 0 && _fd_snd >= 0 && _fd_dev >= 0) {
|
|
+ if (_fd_v4l >= 0 && _fd_dev >= 0) {
|
|
_wd_v4l = inotify_add_watch(_fd_v4l, "/dev/v4l/by-path/", IN_CREATE | IN_DELETE | IN_DELETE_SELF);
|
|
- _wd_snd = inotify_add_watch(_fd_snd, "/dev/snd/by-path/", IN_CREATE | IN_DELETE | IN_DELETE_SELF);
|
|
_wd_dev = inotify_add_watch(_fd_dev, "/dev/", IN_CREATE);
|
|
ProcessInotifyEvents();
|
|
|
|
@@ -188,16 +171,11 @@ void DeviceInfoV4l2::InotifyProcess()
|
|
inotify_rm_watch(_fd_v4l, _wd_v4l);
|
|
}
|
|
|
|
- if (_wd_snd >= 0) {
|
|
- inotify_rm_watch(_fd_snd, _wd_snd);
|
|
- }
|
|
-
|
|
if (_wd_dev >= 0) {
|
|
inotify_rm_watch(_fd_dev, _wd_dev);
|
|
}
|
|
|
|
close(_fd_v4l);
|
|
- close(_fd_snd);
|
|
close(_fd_dev);
|
|
}
|
|
}
|