Skip to content

Update WebCamSource.cs #1050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update WebCamSource.cs #1050

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1c32f1
Update WebCamSource.cs
Thaina Nov 23, 2023
01a8a49
Update WebCamSource.cs
Thaina Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions Assets/MediaPipeUnity/Samples/Common/Scripts/ImageSource/WebCamSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ public override ResolutionStruct[] availableResolutions
{
get
{
#if (UNITY_ANDROID || UNITY_IOS) && !UNITY_EDITOR
if (webCamDevice is WebCamDevice valueOfWebCamDevice) {
#if (UNITY_ANDROID || UNITY_IOS || UNITY_STANDALONE_OSX) && !UNITY_EDITOR
if (webCamDevice is WebCamDevice valueOfWebCamDevice && valueOfWebCamDevice.availableResolutions != null) {
return valueOfWebCamDevice.availableResolutions.Select(resolution => new ResolutionStruct(resolution)).ToArray();
}
#endif
Expand Down Expand Up @@ -146,19 +146,17 @@ private IEnumerator GetPermission()
Permission.RequestUserPermission(Permission.Camera);
yield return new WaitForSeconds(0.1f);
}
#elif UNITY_IOS
if (!Application.HasUserAuthorization(UserAuthorization.WebCam)) {
yield return Application.RequestUserAuthorization(UserAuthorization.WebCam);
}
#endif

#if UNITY_ANDROID

if (!Permission.HasUserAuthorizedPermission(Permission.Camera))
{
Debug.LogWarning("Not permitted to use Camera");
yield break;
}
#elif UNITY_IOS
#elif UNITY_IOS || UNITY_STANDALONE_OSX
if (!Application.HasUserAuthorization(UserAuthorization.WebCam)) {
yield return Application.RequestUserAuthorization(UserAuthorization.WebCam);
}

if (!Application.HasUserAuthorization(UserAuthorization.WebCam)) {
Debug.LogWarning("Not permitted to use WebCam");
yield break;
Expand Down