psychopy 2024.1.4__py3-none-any.whl → 2024.2.0__py3-none-any.whl

psychopy/visual/movies/players/ffpyplayer_player.py

@@ -737,6 +737,8 @@ class FFPyPlayer(BaseMoviePlayer):
 
         self._lastPlayerOpts = DEFAULT_FF_OPTS.copy()
 
+        self._lastPlayerOpts['out_fmt'] = 'bgra'
+
         # options from the parent
         if self.parent.loop:  # infinite loop
             self._lastPlayerOpts['loop'] = 0
@@ -1336,7 +1338,7 @@ class FFPyPlayer(BaseMoviePlayer):
         self._streamTime = streamStatus.streamTime  # stream time for the camera
 
         # if we have a new frame, update the frame information
-        videoBuffer = frameImage.to_bytearray()[0]
+        videoBuffer = frameImage.to_memoryview()[0].memview
         videoFrameArray = np.frombuffer(videoBuffer, dtype=np.uint8)
 
         # provide the last frame
@@ -1350,7 +1352,8 @@ class FFPyPlayer(BaseMoviePlayer):
             audioSamples=None,
             metadata=self.metadata,
             movieLib=u'ffpyplayer',
-            userData=None)
+            userData=None,
+            keepAlive=frameImage)
 
         return True
 

psychopy/visual/noise.py

@@ -15,7 +15,7 @@ These are optional components that can be obtained by installing the
 
 """
 
-import psychopy.logging as logging
+from psychopy.tools.pkgtools import PluginStub
 
 # Requires shaders if you don't have them it will just throw and error.
 # Ensure setting pyglet.options['debug_gl'] to False is done prior to any
@@ -23,12 +23,13 @@ import psychopy.logging as logging
 # up by the pyglet GL engine and have no effect.
 # Shaders will work but require OpenGL2.0 drivers AND PyOpenGL3.0+
 
-try:
-    from psychopy_visionscience import NoiseStim
-except (ModuleNotFoundError, ImportError):
-    logging.error(
-        "Support for `NoiseStim` is not available this session. Please install "
-        "`psychopy-visionscience` and restart the session to enable support.")
+class NoiseStim(
+    PluginStub,
+    plugin="psychopy-visionscience",
+    doclink="https://psychopy.github.io/psychopy-visionscience/coder/NoiseStim/"
+):
+    pass
+
 
 
 class NoiseStim:

psychopy/visual/patch.py

@@ -9,21 +9,12 @@ or the :class:`~psychopy.visual.ImageStim` classes.'''
 # Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
-from psychopy.visual.grating import GratingStim
+from psychopy.tools.pkgtools import PluginStub
 
 
-class PatchStim(GratingStim):
-
-    def __init__(self, *args, **kwargs):
-        """
-        Deprecated (as of version 1.74.00):
-        please use the :class:`~psychopy.visual.GratingStim`
-        or the :class:`~psychopy.visual.ImageStim` classes.
-
-        The GratingStim has identical abilities to the PatchStim
-        (but possibly different initial values)
-        whereas the ImageStim is designed to be use for non-cyclic images
-        (photographs, not gratings).
-        """
-        super(PatchStim, self).__init__(*args, **kwargs)
-        self.setImage = self.setTex
+class PatchStim(
+    PluginStub,
+    plugin="psychopy-legacy",
+    doclink="https://psychopy.github.io/psychopy-legacy/coder/visual/PatchStim"
+):
+    pass

psychopy/visual/radial.py

@@ -12,19 +12,21 @@ These are optional components that can be obtained by installing the
 
 """
 
-import psychopy.logging as logging
+from psychopy.tools.pkgtools import PluginStub
 
 # Ensure setting pyglet.options['debug_gl'] to False is done prior to any
 # other calls to pyglet or pyglet submodules, otherwise it may not get picked
 # up by the pyglet GL engine and have no effect.
 # Shaders will work but require OpenGL2.0 drivers AND PyOpenGL3.0+
 
-try:
-    from psychopy_visionscience import RadialStim
-except (ModuleNotFoundError, ImportError):
-    logging.error(
-        "Support for `RadialStim` is not available this session. Please install "
-        "`psychopy-visionscience` and restart the session to enable support.")
+
+class RadialStim(
+    PluginStub,
+    plugin="psychopy-visionscience",
+    doclink="https://psychopy.github.io/psychopy-visionscience/coder/RadialStim/"
+):
+    pass
+
 
 
 class RadialStim: