Merge branch 'master' of https://github.com/qt-autumn/OpenSeeFace
This commit is contained in:
commit
d89e8dacda
5 changed files with 14 additions and 19 deletions
|
|
@ -36,7 +36,7 @@ class EscapiReader(VideoReader):
|
|||
self.fps = fps
|
||||
self.device = capture
|
||||
escapi.count_capture_devices()
|
||||
self.name = str(escapi.device_name(self.device).decode('utf8'))
|
||||
self.name = str(escapi.device_name(self.device).decode('utf8', 'surrogateescape'))
|
||||
self.buffer = escapi.init_camera(self.device, self.width, self.height, self.fps)
|
||||
escapi.do_capture(self.device)
|
||||
def is_open(self):
|
||||
|
|
@ -213,7 +213,7 @@ class InputReader():
|
|||
devices = escapi.count_capture_devices()
|
||||
found = None
|
||||
for i in range(devices):
|
||||
escapi_name = str(escapi.device_name(i).decode('utf8'))
|
||||
escapi_name = str(escapi.device_name(i).decode('utf8', 'surrogateescape'))
|
||||
if name == escapi_name:
|
||||
found = i
|
||||
if found is None:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue