Adding fixes to support ios camera

mfrr · Feb 21, 2019 · 543ebd8 · 543ebd8
1 parent c92e27a
commit 543ebd8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/kivy/core/camera/__init__.py b/kivy/core/camera/__init__.py
@@ -136,7 +136,7 @@ def on_load(self):
 # Load the appropriate providers
 providers = ()
 
-if platform == 'macosx':
+if platform in ['macosx', 'ios']:
     providers += (('avfoundation', 'camera_avfoundation',
                    'CameraAVFoundation'), )
 elif platform == 'android':

diff --git a/kivy/core/camera/camera_avfoundation.pyx b/kivy/core/camera/camera_avfoundation.pyx
@@ -62,7 +62,7 @@ class CameraAVFoundation(CameraBase):
         self._resolution = (width, height)
 
         if self._texture is None or self._texture.size != self._resolution:
-            self._texture = Texture.create(self._resolution)
+            self._texture = Texture.create(self._resolution, colorfmt='bgra')
             self._texture.flip_vertical()
             self.dispatch('on_load')
 

diff --git a/setup.py b/setup.py
@@ -168,7 +168,7 @@ def pkgconfig(*packages, **kw):
 c_options['use_x11'] = False
 c_options['use_wayland'] = False
 c_options['use_gstreamer'] = None
-c_options['use_avfoundation'] = platform == 'darwin'
+c_options['use_avfoundation'] = platform in ['darwin', 'ios']
 c_options['use_osx_frameworks'] = platform == 'darwin'
 c_options['debug_gl'] = False
 
@@ -863,7 +863,7 @@ def determine_sdl2():
 if c_options['use_avfoundation']:
     import platform as _platform
     mac_ver = [int(x) for x in _platform.mac_ver()[0].split('.')[:2]]
-    if mac_ver >= [10, 7]:
+    if mac_ver >= [10, 7] or platform == 'ios':
         osx_flags = {
             'extra_link_args': ['-framework', 'AVFoundation'],
             'extra_compile_args': ['-ObjC++'],