ffpyplayer 4.5.2__tar.gz → 4.5.4__tar.gz

{ffpyplayer-4.5.2 → ffpyplayer-4.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ffpyplayer
-Version: 4.5.2
+Version: 4.5.4
 Summary: A cython implementation of an ffmpeg based player.
 Home-page: https://matham.github.io/ffpyplayer/
 Author: Matthew Einhorn
@@ -18,12 +18,21 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: BSD :: FreeBSD
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Intended Audience :: Developers
 License-File: COPYING
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: summary
 
 FFPyPlayer is a python binding for the FFmpeg library for playing and writing
 media files.
@@ -115,5 +124,5 @@ Converting images:
     >>> img2.get_pixel_format()
     'yuv420p'
     >>> planes = img2.to_bytearray()
-    >>> map(len, planes)
+    >>> [len(plane) for plane in planes]
     [50000, 12500, 12500, 0]

{ffpyplayer-4.5.2 → ffpyplayer-4.5.4}/README.rst

@@ -88,5 +88,5 @@ Converting images:
     >>> img2.get_pixel_format()
     'yuv420p'
     >>> planes = img2.to_bytearray()
-    >>> map(len, planes)
+    >>> [len(plane) for plane in planes]
     [50000, 12500, 12500, 0]

{ffpyplayer-4.5.2 → ffpyplayer-4.5.4}/ffpyplayer/__init__.py

@@ -10,7 +10,7 @@ import platform
 
 __all__ = ('dep_bins', )
 
-__version__ = '4.5.2'
+__version__ = '4.5.4'
 version = __version__
 
 # the ffmpeg src git version tested and upto date with,

{ffpyplayer-4.5.2 → ffpyplayer-4.5.4}/ffpyplayer/player/frame_queue.pyx

@@ -162,7 +162,7 @@ cdef class FrameQueue(object):
             if player.img_convert_ctx == NULL:
                 av_log(NULL, AV_LOG_FATAL, b"Cannot initialize the conversion context\n")
                 raise_py_exception(b'Cannot initialize the conversion context.')
-            sws_scale(player.img_convert_ctx, src_frame.data, src_frame.linesize,
+            sws_scale(player.img_convert_ctx, <const unsigned char* const*>src_frame.data, src_frame.linesize,
                       0, vp.height, vp.frame.data, vp.frame.linesize)
             av_frame_unref(src_frame)
         return 0

{ffpyplayer-4.5.2 → ffpyplayer-4.5.4}/ffpyplayer/tools.pyx

@@ -707,12 +707,15 @@ def list_dshow_devices():
 
     # list devices
     list_dshow_opts(res, b'dummy', b'list_devices')
+    # primary dev name
     pname = re.compile(' *\[dshow *@ *[\w]+\] *"(.+)" *\\((video|audio)\\) *')
+    # alternate dev name
     apname = re.compile(' *\[dshow *@ *[\w]+\] *Alternative name *"(.+)" *')
     m = None
     for msg, level in res:
         message = msg.decode('utf8')
 
+        # do we match a primary name - i.e. next device
         m_temp = pname.match(message)
         if m_temp:
             m = m_temp
@@ -722,6 +725,7 @@ def list_dshow_devices():
             continue
 
         m_temp = apname.match(message)
+        # if we match alternate name and already have primary, then we're adding it
         if m_temp and m:
             curr[m_temp.group(1)] = []
             name_map[m_temp.group(1)] = m.group(1)
@@ -731,6 +735,8 @@ def list_dshow_devices():
             msg2 = message.encode('utf8')
             av_log(NULL, loglevels[level], '%s', msg2)
 
+        m = None
+
     # list video devices options
     vid_opts = re.compile(' *\[dshow *@ *[\w]+\] +(pixel_format|vcodec)=([\w]+) +min +s=\d+x\d+ +fps=(\d+)\
  +max +s=(\d+)x(\d+) +fps=(\d+).*')

{ffpyplayer-4.5.2 → ffpyplayer-4.5.4}/ffpyplayer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ffpyplayer
-Version: 4.5.2
+Version: 4.5.4
 Summary: A cython implementation of an ffmpeg based player.
 Home-page: https://matham.github.io/ffpyplayer/
 Author: Matthew Einhorn
@@ -18,12 +18,21 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: BSD :: FreeBSD
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Intended Audience :: Developers
 License-File: COPYING
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: summary
 
 FFPyPlayer is a python binding for the FFmpeg library for playing and writing
 media files.
@@ -115,5 +124,5 @@ Converting images:
     >>> img2.get_pixel_format()
     'yuv420p'
     >>> planes = img2.to_bytearray()
-    >>> map(len, planes)
+    >>> [len(plane) for plane in planes]
     [50000, 12500, 12500, 0]

ffpyplayer-4.5.4/pyproject.toml

@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+    "setuptools", "wheel",
+    "cython~=3.0.11; python_version < '3.14'",
+    "cython~=3.1.8; python_version >= '3.14'",
+]

{ffpyplayer-4.5.2 → ffpyplayer-4.5.4}/setup.py

@@ -376,7 +376,10 @@ with open('README.rst') as fh:
 
 setup_requires = []
 if declare_cython:
-    setup_requires.append('cython~=3.0.11')
+    if sys.version_info < (3, 14):
+        setup_requires.append('cython~=3.0.11')
+    else:
+        setup_requires.append('cython~=3.1.8')
 
 setup(name='ffpyplayer',
       version=ffpyplayer.__version__,
@@ -400,6 +403,7 @@ setup(name='ffpyplayer',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
         'Programming Language :: Python :: 3.13',
+        'Programming Language :: Python :: 3.14',
         'Operating System :: MacOS :: MacOS X',
         'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX :: BSD :: FreeBSD',

ffpyplayer-4.5.2/pyproject.toml

@@ -1,4 +0,0 @@
-[build-system]
-requires = [
-    "setuptools", "wheel", "cython~=3.0.11",
-]