Merge branch 'afiqhamzah-fix-marhun-camera-not-detecting-camera-with-label' into 'main'

Update marhun camera

See merge request online-sistem1/lelong!354
This commit is contained in:
Muhamad Amir Hassan Hamzan
2023-01-03 03:18:38 +00:00
2 changed files with 31 additions and 4 deletions
+19 -2
View File
@@ -13,9 +13,26 @@ function marhunPhotoCapturerDebugger() {
const generateCameraListing = (cameras) => {
let title = "Available cameras: ";
let content = cameras.map((camera, index) => {
let mapCameraWithDeviceId = (index, camera) => {
index = index + 1;
return `${index}. ${camera.label}\n`;
return `${index}. deviceLabel : ${camera.label}\n`;
}
let mapCameraWithGroupId = (index, camera) => {
index = index + 1;
return `${index}. groupId : ${camera.groupId}\n`;
}
let content = cameras.map((camera, index) => {
if(camera.deviceId !== ''){
return mapCameraWithDeviceId(index, camera);
}
if(camera.groupId !== ''){
return mapCameraWithGroupId(index, camera);
}
});
return `${title}\n${content.join('')}`;
+12 -2
View File
@@ -117,8 +117,18 @@ function marhunPhotoCapturerFactory(modal_selector) {
}
function composeConstraint(camera) {
var constraints = { deviceId: { exact: camera.deviceId } };
return navigator.mediaDevices.getUserMedia({ video: constraints });
if(camera.deviceId !== ''){
constraints = { deviceId: { exact: camera.deviceId } };
return navigator.mediaDevices.getUserMedia({ video: constraints });
}
if(camera.groupId !== ''){
constraints= { groupId: { exact: camera.groupId } };
return navigator.mediaDevices.getUserMedia({ video: constraints });
}
}
return getCameraList()