mirror of https://github.com/kivy/kivy.git
Merge pull request #4877 from FeralBytes/remove_depreciated_camera
Remove depreciated camera providers.
This commit is contained in:
dessant
GitHub
commit
3d47c390a7
|
|
@ -133,10 +133,7 @@ class CameraBase(EventDispatcher):
|
|||
# Load the appropriate providers
|
||||
providers = ()
|
||||
|
||||
if platform == 'win':
|
||||
providers += (('videocapture', 'camera_videocapture',
|
||||
'CameraVideoCapture'), )
|
||||
elif platform == 'macosx':
|
||||
if platform == 'macosx':
|
||||
providers += (('avfoundation', 'camera_avfoundation',
|
||||
'CameraAVFoundation'), )
|
||||
elif platform == 'android':
|
||||
|
|
|
|||
|
|
@ -1,103 +0,0 @@
|
|||
'''
|
||||
GStreamer Camera
|
||||
================
|
||||
|
||||
Implement CameraBase with GStreamer, based on PyGST
|
||||
'''
|
||||
|
||||
__all__ = ('CameraPyGst', )
|
||||
|
||||
from kivy.clock import Clock
|
||||
from kivy.graphics.texture import Texture
|
||||
from kivy.core.camera import CameraBase
|
||||
|
||||
try:
|
||||
import pygst
|
||||
if not hasattr(pygst, '_gst_already_checked'):
|
||||
pygst.require('0.10')
|
||||
pygst._gst_already_checked = True
|
||||
import gst
|
||||
except:
|
||||
raise
|
||||
|
||||
# install the gobject iteration
|
||||
from kivy.support import install_gobject_iteration
|
||||
install_gobject_iteration()
|
||||
|
||||
|
||||
class CameraPyGst(CameraBase):
|
||||
'''Implementation of CameraBase using GStreamer
|
||||
|
||||
:Parameters:
|
||||
`video_src`: str, default is 'v4l2src'
|
||||
Other tested options are: 'dc1394src' for firewire
|
||||
dc camera (e.g. firefly MV). Any gstreamer video source
|
||||
should potentially work.
|
||||
Theoretically a longer string using "!" can be used
|
||||
describing the first part of a gstreamer pipeline.
|
||||
'''
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
self._pipeline = None
|
||||
self._camerasink = None
|
||||
self._decodebin = None
|
||||
self._texturesize = None
|
||||
self._video_src = kwargs.get('video_src', 'v4l2src')
|
||||
super(CameraPyGst, self).__init__(**kwargs)
|
||||
|
||||
def init_camera(self):
|
||||
# TODO: This doesn't work when camera resolution is resized at runtime.
|
||||
# There must be some other way to release the camera?
|
||||
if self._pipeline:
|
||||
self._pipeline = None
|
||||
|
||||
video_src = self._video_src
|
||||
if video_src == 'v4l2src':
|
||||
video_src += ' device=/dev/video%d' % self._index
|
||||
elif video_src == 'dc1394src':
|
||||
video_src += ' camera-number=%d' % self._index
|
||||
|
||||
GL_CAPS = 'video/x-raw-rgb,red_mask=(int)0xff0000,' + \
|
||||
'green_mask=(int)0x00ff00,blue_mask=(int)0x0000ff'
|
||||
pl = '%s ! decodebin name=decoder ! ffmpegcolorspace ! appsink ' + \
|
||||
'name=camerasink emit-signals=True caps=%s'
|
||||
self._pipeline = gst.parse_launch(pl % (video_src, GL_CAPS))
|
||||
self._camerasink = self._pipeline.get_by_name('camerasink')
|
||||
self._camerasink.connect('new-buffer', self._gst_new_buffer)
|
||||
self._decodebin = self._pipeline.get_by_name('decoder')
|
||||
|
||||
if self._camerasink and not self.stopped:
|
||||
self.start()
|
||||
|
||||
def _gst_new_buffer(self, *largs):
|
||||
self._format = 'rgb'
|
||||
frame = self._camerasink.emit('pull-buffer')
|
||||
if frame is None:
|
||||
return
|
||||
self._buffer = frame.data
|
||||
if self._texturesize is None:
|
||||
# try to get the camera image size
|
||||
for x in self._decodebin.src_pads():
|
||||
for cap in x.get_caps():
|
||||
self._texturesize = (cap['width'], cap['height'])
|
||||
Clock.schedule_once(self._update)
|
||||
return
|
||||
Clock.schedule_once(self._update)
|
||||
|
||||
def start(self):
|
||||
super(CameraPyGst, self).start()
|
||||
self._pipeline.set_state(gst.STATE_PLAYING)
|
||||
|
||||
def stop(self):
|
||||
super(CameraPyGst, self).stop()
|
||||
self._pipeline.set_state(gst.STATE_PAUSED)
|
||||
|
||||
def _update(self, dt):
|
||||
if self._buffer is None:
|
||||
return
|
||||
if self._texture is None and self._texturesize is not None:
|
||||
self._texture = Texture.create(
|
||||
size=self._texturesize, colorfmt='rgb')
|
||||
self._texture.flip_vertical()
|
||||
self.dispatch('on_load')
|
||||
self._copy_to_gpu()
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
'''
|
||||
VideoCapture Camera: Implement CameraBase with VideoCapture
|
||||
'''
|
||||
|
||||
#
|
||||
# TODO: make usage of thread or multiprocess
|
||||
#
|
||||
|
||||
__all__ = ('CameraVideoCapture', )
|
||||
|
||||
from kivy.core.camera import CameraBase
|
||||
from kivy.clock import Clock
|
||||
|
||||
try:
|
||||
from VideoCapture import Device
|
||||
except:
|
||||
raise
|
||||
|
||||
|
||||
class CameraVideoCapture(CameraBase):
|
||||
'''Implementation of CameraBase using VideoCapture
|
||||
'''
|
||||
_update_ev = None
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
self._device = None
|
||||
super(CameraVideoCapture, self).__init__(**kwargs)
|
||||
self._format = 'bgr'
|
||||
|
||||
def init_camera(self):
|
||||
# create the device
|
||||
self._device = Device(devnum=self._index, showVideoWindow=0)
|
||||
# set resolution
|
||||
try:
|
||||
self._device.setResolution(self.resolution[0], self.resolution[1])
|
||||
except:
|
||||
raise Exception('VideoCapture: Resolution not supported')
|
||||
self.fps = 1 / 30.
|
||||
|
||||
def _update(self, dt):
|
||||
data, camera_width, camera_height = self._device.getBuffer()
|
||||
if self._texture is None:
|
||||
# first update, resize if necessary
|
||||
self.size = camera_width, camera_height
|
||||
# and create texture
|
||||
from kivy.graphics.texture import Texture
|
||||
self._texture = Texture.create(size=self.size, colorfmt='rgb')
|
||||
self.dispatch('on_load')
|
||||
|
||||
# update buffer
|
||||
self._buffer = data
|
||||
self._copy_to_gpu()
|
||||
|
||||
def start(self):
|
||||
super(CameraVideoCapture, self).start()
|
||||
if self._update_ev is not None:
|
||||
self._update_ev.cancel()
|
||||
self._update_ev = Clock.schedule_interval(self._update, self.fps)
|
||||
|
||||
def stop(self):
|
||||
super(CameraVideoCapture, self).stop()
|
||||
if self._update_ev is not None:
|
||||
self._update_ev.cancel()
|
||||
self._update_ev = None
|
||||
Loading…
Reference in New Issue