copilot/OpenSeeFace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed an issue where some webcams could cause broken JSON to be generated in dshowcapture.dll.

Browse source
This commit is contained in:
Emiliana 2020-10-17 12:13:47 +02:00
parent 46e26f59f6
commit ce50a23e6d
5 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Examples/OpenSeeWebcamInfo.cs
View file

@ -180,6 +180,9 @@ public class OpenSeeWebcamInfo : MonoBehaviour {
#endregion
public List<OpenSeeWebcam> cameras;
public bool dumpJson = false;
private static bool dumpJsonStatic = false;
static private string ListCameraDetails_x64() {
System.IntPtr cap = create_capture_x64();
@ -225,6 +228,11 @@ public class OpenSeeWebcamInfo : MonoBehaviour {
if (includeBlackMagic)
bmJsonData = ListBlackMagicDetails_x86();
}
if (dumpJsonStatic) {
UnityEngine.Debug.Log("Camera JSON: " + jsonData);
if (includeBlackMagic)
UnityEngine.Debug.Log("Blackmagic JSON: " + bmJsonData);
}
List<OpenSeeWebcam> details = JsonConvert.DeserializeObject<List<OpenSeeWebcam>>(jsonData);
foreach (var cam in details)
cam.type = OpenSeeWebcamType.DirectShow;
@ -242,6 +250,7 @@ public class OpenSeeWebcamInfo : MonoBehaviour {
}
public void Initialize(bool includeBlackMagic) {
dumpJsonStatic = dumpJson;
cameras = ListCameraDetails(includeBlackMagic);
foreach (var camera in cameras)
camera.GetPrettyCapabilities();