From 88c5224ac29c5d5d67dba18cf29d5678d2f6bf22 Mon Sep 17 00:00:00 2001 From: iperov Date: Sun, 20 Mar 2022 19:29:12 +0400 Subject: [PATCH] CameraSource: added 'Compatible' driver --- apps/DeepFaceLive/backend/CameraSource.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/apps/DeepFaceLive/backend/CameraSource.py b/apps/DeepFaceLive/backend/CameraSource.py index cf65c64..c03d93b 100644 --- a/apps/DeepFaceLive/backend/CameraSource.py +++ b/apps/DeepFaceLive/backend/CameraSource.py @@ -52,18 +52,17 @@ _ResolutionType_wh = {_ResolutionType.RES_320x240: (320,240), _ResolutionType.RES_1920x1080: (1920,1080), } class _DriverType(IntEnum): - DSHOW = 0 - MSMF = 1 - GSTREAMER = 2 - OPENCV = 3 + COMPATIBLE = 0 + DSHOW = 1 + MSMF = 2 + GSTREAMER = 3 -_DriverType_names = { _DriverType.DSHOW : 'DirectShow', +_DriverType_names = { _DriverType.COMPATIBLE : 'Compatible', + _DriverType.DSHOW : 'DirectShow', _DriverType.MSMF : 'Microsoft Media Foundation', _DriverType.GSTREAMER : 'GStreamer', - _DriverType.OPENCV : 'OpenCV', } - class _RotationType(IntEnum): ROTATION_0 = 0 ROTATION_90 = 1 @@ -112,10 +111,10 @@ class CameraSourceWorker(BackendWorker): if state.device_idx is not None and \ state.driver is not None: - cv_api = {_DriverType.DSHOW: cv2.CAP_DSHOW, + cv_api = {_DriverType.COMPATIBLE: cv2.CAP_ANY, + _DriverType.DSHOW: cv2.CAP_DSHOW, _DriverType.MSMF: cv2.CAP_MSMF, _DriverType.GSTREAMER: cv2.CAP_GSTREAMER, - _DriverType.OPENCV: 0, }[state.driver] vcap = cv2.VideoCapture(state.device_idx, cv_api)