neoris/restreamer-ui-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/datarhei/restreamer-ui into dev

Browse Source
This commit is contained in:
Jan Stabenow 2023-10-16 13:45:25 +02:00
commit a7d2ac4ec7
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/restreamer.js
View File

@ -617,7 +617,7 @@ class Restreamer {
// Split out a Raspberry Pi camera and create a dedicated source
if (device.id === 'video4linux2') {
for (let d of device.devices) {
if (d.extra.indexOf('bcm2835-v4l2') !== -1) {
if (d.extra.match(/bcm2835[-_]v4l2/) !== null) {
if (!('raspicam' in skills.sources)) {
skills.sources['raspicam'] = [];
}

2
src/views/Edit/Sources/Raspicam.js
View File

@ -25,7 +25,7 @@ const initSettings = (initialSettings) => {
const settings = {
device: 'none',
format: 'h264',
format: 'yuv420p',
framerate: '25',
size: '1920x1080',
...initialSettings,

2
src/views/Edit/Wizard/Sources/Raspicam.js
View File

@ -43,7 +43,7 @@ function initSettings(initialSettings, knownDevices) {
}
function initDevices(initialDevices) {
const devices = initialDevices.filter((device) => device.media === 'video' && device.extra.indexOf('bcm2835-v4l2') !== -1);
const devices = initialDevices.filter((device) => device.media === 'video' && device.extra.match(/bcm2835[-_]v4l2/) !== null);
return devices;
}

2
src/views/Edit/Wizard/Sources/V4L.js
View File

@ -49,7 +49,7 @@ function initSettings(initialSettings, knownDevices) {
}
function initDevices(initialDevices) {
const devices = initialDevices.filter((device) => device.media === 'video' && device.extra.indexOf('bcm2835-v4l2') === -1);
const devices = initialDevices.filter((device) => device.media === 'video' && device.extra.match(/bcm2835[-_]v4l2/) === null);
return devices;
}