ffpyplayer 4.5.1__tar.gz → 4.5.3__tar.gz

{ffpyplayer-4.5.1 → ffpyplayer-4.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ffpyplayer
-Version: 4.5.1
+Version: 4.5.3
 Summary: A cython implementation of an ffmpeg based player.
 Home-page: https://matham.github.io/ffpyplayer/
 Author: Matthew Einhorn
@@ -17,12 +17,21 @@ Classifier: Programming Language :: Python :: 3.9
 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: 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.

{ffpyplayer-4.5.1 → ffpyplayer-4.5.3}/ffpyplayer/__init__.py

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

{ffpyplayer-4.5.1 → ffpyplayer-4.5.3}/ffpyplayer/player/core.pyx

@@ -1616,7 +1616,7 @@ cdef class VideoState(object):
             if self.audio_dev == -1:
                 return -1
 
-            if not Mix_RegisterEffect(self.audio_dev, <void (*)(int, void *, int, void *) nogil>sdl_mixer_callback, NULL, self.self_id):
+            if not Mix_RegisterEffect(self.audio_dev, <void (*)(int, void *, int, void *) noexcept nogil>sdl_mixer_callback, NULL, self.self_id):
                 return -1
 
         ELSE:
@@ -1654,7 +1654,7 @@ cdef class VideoState(object):
         wanted_spec.format = AUDIO_S16SYS
         wanted_spec.silence = 0
         wanted_spec.samples = FFMAX(AUDIO_MIN_BUFFER_SIZE, 2 << av_log2(wanted_spec.freq // AUDIO_MAX_CALLBACKS_PER_SEC))
-        wanted_spec.callback = <void (*)(void *, uint8_t *, int) nogil>self.sdl_audio_callback
+        wanted_spec.callback = <void (*)(void *, uint8_t *, int) noexcept nogil>self.sdl_audio_callback
         wanted_spec.userdata = self.self_id
 
         error = self.open_audio_device(&wanted_spec, &spec)
@@ -1869,7 +1869,7 @@ cdef class VideoState(object):
         if codecpar.codec_type == AVMEDIA_TYPE_AUDIO:
             self.auddec.decoder_abort(self.sampq)
             IF USE_SDL2_MIXER:
-                Mix_UnregisterEffect(self.audio_dev, <void (*)(int, void *, int, void *) nogil>sdl_mixer_callback)
+                Mix_UnregisterEffect(self.audio_dev, <void (*)(int, void *, int, void *) noexcept nogil>sdl_mixer_callback)
                 Mix_HaltChannel(self.audio_dev)
                 Mix_FreeChunk(self.chunk)
                 self.chunk = NULL
@@ -1942,7 +1942,7 @@ cdef class VideoState(object):
                 av_log(NULL, AV_LOG_FATAL, b"Could not allocate context.\n");
             return self.failed(AVERROR(ENOMEM), ic, &pkt)
         #av_opt_set_int(ic, b"threads", 1, 0)
-        ic.interrupt_callback.callback = <int (*)(void *)>self.decode_interrupt_cb
+        ic.interrupt_callback.callback = <int (*)(void *) noexcept>self.decode_interrupt_cb
         ic.interrupt_callback.opaque = self.self_id
 
         if not av_dict_get(self.player.format_opts, b"scan_all_pmts", NULL, AV_DICT_MATCH_CASE):

{ffpyplayer-4.5.1 → ffpyplayer-4.5.3}/ffpyplayer/tools.pyx

@@ -78,17 +78,6 @@ the log.
 '''
 _loglevel_inverse = {v:k for k, v in loglevels.iteritems()}
 
-codecs_enc = get_codecs(encode=True, video=True)
-'''A list of all the codecs available for encoding video. '''
-codecs_dec = get_codecs(decode=True, video=True, audio=True)
-'''A list of all the codecs available for decoding video and audio. '''
-pix_fmts = list_pixfmts()
-'''A list of all the pixel formats available to ffmpeg. '''
-formats_in = get_fmts(input=True)[0]
-'''A list of all the formats (e.g. file formats) available for reading. '''
-formats_out = get_fmts(output=True)[0]
-'''A list of all the formats (e.g. file formats) available for writing. '''
-
 cdef object _log_callback = None
 cdef MTMutex _log_mutex= MTMutex(SDL_MT)
 cdef int log_level = AV_LOG_WARNING
@@ -105,7 +94,7 @@ cdef void call_callback(char *line, int level) nogil:
     with gil:
         gil_call_callback(line, level)
 
-cdef void _log_callback_func(void* ptr, int level, const char* fmt, va_list vl) nogil:
+cdef void _log_callback_func(void* ptr, int level, const char* fmt, va_list vl) noexcept nogil:
     cdef char line[2048]
     if fmt == NULL or level > log_level:
         return
@@ -278,6 +267,11 @@ cpdef get_codecs(
         codec = av_codec_iterate(&iter_codec)
     return sorted(codecs)
 
+codecs_enc = get_codecs(encode=True, video=True)
+'''A list of all the codecs available for encoding video. '''
+codecs_dec = get_codecs(decode=True, video=True, audio=True)
+'''A list of all the codecs available for decoding video and audio. '''
+
 cdef list list_pixfmts():
     cdef list fmts = []
     cdef const AVPixFmtDescriptor *desc = NULL
@@ -288,6 +282,9 @@ cdef list list_pixfmts():
         desc = av_pix_fmt_desc_next(desc)
     return sorted(fmts)
 
+pix_fmts = list_pixfmts()
+'''A list of all the pixel formats available to ffmpeg. '''
+
 cpdef get_fmts(int input=False, int output=False):
     '''Returns the formats available in FFmpeg.
 
@@ -350,6 +347,10 @@ cpdef get_fmts(int input=False, int output=False):
     fmts = sorted(fmts)
     return fmts, full_names, exts
 
+formats_in = get_fmts(input=True)[0]
+'''A list of all the formats (e.g. file formats) available for reading. '''
+formats_out = get_fmts(output=True)[0]
+'''A list of all the formats (e.g. file formats) available for writing. '''
 
 def get_format_codec(filename=None, fmt=None):
     '''Returns the best codec associated with the file format. The format
@@ -706,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
@@ -721,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)
@@ -730,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.1 → ffpyplayer-4.5.3}/ffpyplayer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ffpyplayer
-Version: 4.5.1
+Version: 4.5.3
 Summary: A cython implementation of an ffmpeg based player.
 Home-page: https://matham.github.io/ffpyplayer/
 Author: Matthew Einhorn
@@ -17,12 +17,21 @@ Classifier: Programming Language :: Python :: 3.9
 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: 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.

{ffpyplayer-4.5.1 → ffpyplayer-4.5.3}/ffpyplayer.egg-info/SOURCES.txt

@@ -2,17 +2,17 @@ COPYING
 README.rst
 pyproject.toml
 setup.py
-D:/a/ffpyplayer/ffpyplayer/ffpyplayer/pic.pyx
-D:/a/ffpyplayer/ffpyplayer/ffpyplayer/threading.pyx
-D:/a/ffpyplayer/ffpyplayer/ffpyplayer/tools.pyx
-D:/a/ffpyplayer/ffpyplayer/ffpyplayer/writer.pyx
-D:/a/ffpyplayer/ffpyplayer/ffpyplayer/clib/misc.c
-D:/a/ffpyplayer/ffpyplayer/ffpyplayer/player/clock.pyx
-D:/a/ffpyplayer/ffpyplayer/ffpyplayer/player/core.pyx
-D:/a/ffpyplayer/ffpyplayer/ffpyplayer/player/decoder.pyx
-D:/a/ffpyplayer/ffpyplayer/ffpyplayer/player/frame_queue.pyx
-D:/a/ffpyplayer/ffpyplayer/ffpyplayer/player/player.pyx
-D:/a/ffpyplayer/ffpyplayer/ffpyplayer/player/queue.pyx
+C:/a/ffpyplayer/ffpyplayer/ffpyplayer/pic.pyx
+C:/a/ffpyplayer/ffpyplayer/ffpyplayer/threading.pyx
+C:/a/ffpyplayer/ffpyplayer/ffpyplayer/tools.pyx
+C:/a/ffpyplayer/ffpyplayer/ffpyplayer/writer.pyx
+C:/a/ffpyplayer/ffpyplayer/ffpyplayer/clib/misc.c
+C:/a/ffpyplayer/ffpyplayer/ffpyplayer/player/clock.pyx
+C:/a/ffpyplayer/ffpyplayer/ffpyplayer/player/core.pyx
+C:/a/ffpyplayer/ffpyplayer/ffpyplayer/player/decoder.pyx
+C:/a/ffpyplayer/ffpyplayer/ffpyplayer/player/frame_queue.pyx
+C:/a/ffpyplayer/ffpyplayer/ffpyplayer/player/player.pyx
+C:/a/ffpyplayer/ffpyplayer/ffpyplayer/player/queue.pyx
 ffpyplayer/__init__.py
 ffpyplayer/pic.pxd
 ffpyplayer/pic.pyx

ffpyplayer-4.5.3/pyproject.toml

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

{ffpyplayer-4.5.1 → ffpyplayer-4.5.3}/setup.py

@@ -376,7 +376,7 @@ with open('README.rst') as fh:
 
 setup_requires = []
 if declare_cython:
-    setup_requires.append('cython~=0.29.36')
+    setup_requires.append('cython~=3.0.11')
 
 setup(name='ffpyplayer',
       version=ffpyplayer.__version__,
@@ -399,6 +399,7 @@ setup(name='ffpyplayer',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
         'Operating System :: MacOS :: MacOS X',
         'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX :: BSD :: FreeBSD',

ffpyplayer-4.5.1/pyproject.toml

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