Update bindngs for vlc 3.0.18

Author: oaubert

generated/3.0/examples/cocoavlc.py

@@ -1,23 +1,24 @@
-#! /usr/bin/env python3
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Example of using PyCocoa <https://PyPI.org/project/PyCocoa> to create a
 # window, table and an application menu to run a video using VLC on macOS.
 # The Python-VLC binding <https://PyPI.Python.org/pypi/python-vlc> and the
 # corresponding VLC App, see <https://www.VideoLan.org/index.html>.
 
-# PyCocoa version 21.8.18 or later must be installed.
+# PyCocoa version 21.11.02 or later must be installed (on macOS Monterey)
 
-# This VLC player has been tested with VLC 3.0.10-12, 3.0.6-8, 3.0.4,
+# This VLC player has been tested with VLC 3.0.10-16, 3.0.6-8, 3.0.4,
 # 3.0.1-2, 2.2.8 and 2.2.6 and the compatible vlc.py Python-VLC binding
-# using 64-bit Python 3.10.0.rc1, 3.9.6, 3.9.0-1, 3.8.10, 3.8.6, 3.7.0-4,
-# 3.6.4-5 and 2.7.14-18 on macOS 11.5.2 Big Sur (aka 10.16), 10.15.6
-# Catalina, 10.14.6 Mojave and 10.13.4-6 High Sierra.  This player
-# does not work with PyPy <https://PyPy.org> nor with Intel(R) Python
-# <https://Software.Intel.com/en-us/distribution-for-python>.  Python
-# 3.10.0rc1, 3.9.6 and macOS' Python 2.7.16 run on Apple Silicon (C{arm64}),
-# all other Python versions run on Intel (C{x86_64}) or I{emulated} Intel
-# (C{"arm64_x86_64"}, see function C{pycocoa.machine}).
+# using 64-bit Python 3.10.0, 3.9.6, 3.9.0-1, 3.8.10, 3.8.6, 3.7.0-4,
+# 3.6.4-5 and 2.7.14-18 on macOS 12.0.1 Monterey, 11.5.2-6.1 Big Sur
+# (aka 10.16), 10.15.6 Catalina, 10.14.6 Mojave and 10.13.4-6 High Sierra.
+# This player does not work with PyPy <https://PyPy.org> nor with Intel(R)
+# Python <https://Software.Intel.com/en-us/distribution-for-python>.
+
+# Python 3.10.0, 3.9.6 and macOS' Python 2.7.16 run on Apple Silicon
+# (C{arm64} I{natively}), all other Python versions run on Intel (C{x86_64})
+# or I{emulated} Intel (C{"arm64_x86_64"}, see function C{pycocoa.machine}).
 
 # MIT License <https://OpenSource.org/licenses/MIT>
 #
@@ -45,7 +46,7 @@ def _PyPI(package):
     return 'see <https://PyPI.org/project/%s>' % (package,)
 
 __all__  = ('AppVLC',)  # PYCHOK expected
-__version__ = '21.08.18'
+__version__ = '21.11.02'
 
 try:
     import vlc
@@ -479,11 +480,16 @@ def _resizer(self):  # adjust aspect ratio and marquee height
         else:
             Thread(target=self._sizer).start()
 
-    def _sizer(self, secs=0.1):
+    def _sizer(self, secs=0.25):
         while True:
-            w, h = self.player.video_get_size(0)
+            p = self.player
+            # wiggle the video to fill the window
+            s = p.video_get_scale()
+            p.video_set_scale(0.0 if s else 1.0)
+            p.video_set_scale(s)
             # the first call(s) returns (0, 0),
             # subsequent calls return (w, h)
+            w, h = p.video_get_size(0)
             if h > 0 and w > 0:
                 # window's contents' aspect ratio
                 self.window.ratio = self.sized = w, h

generated/3.0/examples/glsurface.py

@@ -0,0 +1,145 @@
+#! /usr/bin/env python3
+
+#
+# GlSurface example code for VLC Python bindings
+# Copyright (C) 2020 Daniël van Adrichem <daniel5gh@spiet.nl>
+
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+#
+
+"""VLC GlSurface example
+"""
+
+import time
+import ctypes
+from threading import Lock
+
+import numpy as np
+from OpenGL.GL import (GL_TEXTURE_2D, glTexSubImage2D, glTexImage2D,
+                       GL_BGR, GL_RGB,
+                       GL_UNSIGNED_BYTE)
+import vlc
+
+class Surface(object):
+    """A lockable image buffer
+    """
+    def __init__(self, w, h):
+        self._width = w
+        self._height = h
+
+        # size in bytes when RV32 *4 or RV24 * 3
+        self._row_size = self._width * 3
+        self._buf_size = self._height * self._row_size
+        # allocate buffer
+        self._buf1 = np.zeros(self._buf_size, dtype=np.ubyte)
+        # get pointer to buffer
+        self._buf_p = self._buf1.ctypes.data_as(ctypes.c_void_p)
+        self._lock = Lock()
+
+    def update_gl(self):
+        # with self._lock:
+        glTexSubImage2D(GL_TEXTURE_2D,
+                        0, 0, 0,
+                        self._width,
+                        self._height,
+                        GL_BGR,
+                        GL_UNSIGNED_BYTE,
+                        self._buf1)
+
+    def create_texture_gl(self):
+        glTexImage2D(GL_TEXTURE_2D,
+                     0,
+                     GL_RGB,
+                     self._width,  # width
+                     self._height,  # height
+                     0,
+                     GL_BGR,
+                     GL_UNSIGNED_BYTE,
+                     None)
+
+    @property
+    def width(self):
+        return self._width
+
+    @property
+    def height(self):
+        return self._height
+
+    @property
+    def row_size(self):
+        return self._row_size
+
+    @property
+    def buf(self):
+        return self._buf1
+
+    @property
+    def buf_pointer(self):
+        return self._buf_p
+
+    def lock(self):
+        self._lock.acquire()
+
+    def unlock(self):
+        self._lock.release()
+
+    def __enter__(self, *args):
+        return self._lock.__enter__(*args)
+
+    def __exit__(self, *args):
+        return self._lock.__exit__(*args)
+
+    def get_libvlc_lock_callback(self):
+        @vlc.VideoLockCb
+        def _cb(opaque, planes):
+            self._lock.acquire()
+            planes[0] = self._buf_p
+
+        return _cb
+
+    def get_libvlc_unlock_callback(self):
+        @vlc.VideoUnlockCb
+        def _cb(opaque, picta, planes):
+            self._lock.release()
+
+        return _cb
+
+if __name__ == '__main__':
+    import sys
+    player = vlc.MediaPlayer(sys.argv[1])
+    # play and stop so video_get_size gets a correct value
+    # setting all callbacks to None prevents a window being created on play
+    player.video_set_callbacks(None, None, None, None)
+    # play and stop so video_get_size gets a correct value
+    player.play()
+    time.sleep(1)
+    player.stop()
+    w, h = player.video_get_size()
+    surface = Surface(w, h)
+    # need to keep a reference to the CFUNCTYPEs or else it will get GCed
+    _lock_cb = surface.get_libvlc_lock_callback()
+    _unlock_cb = surface.get_libvlc_unlock_callback()
+    player.video_set_callbacks(_lock_cb, _unlock_cb, None, None)
+    player.video_set_format(
+        "RV24",
+        surface.width,
+        surface.height,
+        surface.row_size)
+    # this starts populating the surface's buf with pixels, from another thread
+    player.play()
+    # in main thread, where gl context is current:
+    # FIXME: add some code to embed the surface + a mainloop
+    # v.surface.update_gl()

generated/3.0/examples/psgvlc.py

@@ -0,0 +1,156 @@
+#! /usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+u'''Bare Bones VLC Media Player Demo with Playlist.
+
+1 - Originally the  Demo_Media_Player_VLC_Based.py  duplicated from
+    <https://GitHub.com/PySimpleGUI/PySimpleGUI/blob/master/DemoPrograms>
+    and modified to work and showing videos on recent macOS versions.
+
+2 - This script uses PySimpleGUI under its LGPL3+ stipulations.
+
+3 - You will need to install the Python bindings for VLC, for example
+    using pip:  python3 -m pip install python-vlc
+
+4 - You need the VLC player itself from <https://www.VideoLan.org>.
+
+5 - On macOS, you also need to get tkvlc.py from this location
+    <https://GitHub.com/oaubert/python-vlc/tree/master/examples>
+    to get video and audio.
+
+6 - On macOS, the video plays full-frame, overwriting the buttons.
+
+7 - Original <https://GitHub.com/israel-dryer/Media-Player> by Israel
+    Dryer, modified to be a PySimpleGUI Demo Program and a python-vlc
+    example for you to customize.  Uses the VLC player to playback
+    local media files (and YouTube streams).
+'''
+import sys
+if sys.version_info[0] < 3:  # Python 3.4+ only
+    sys.exit('%s requires Python 3.4 or later' % (sys.argv[0],))
+    # import Tkinter as tk
+import PySimpleGUI as sg
+import vlc
+
+__all__ = ('libtk',)
+__version__ = '22.11.07'  # mrJean1 at Gmail
+
+_Load_  = 'Load'
+_Next_  = 'Next'
+_Path_  = 'Media URL or local path:'
+_Pause_ = 'Pause'
+_Play_  = 'Play'
+_Prev_  = 'Previous'
+_Stop_  = 'Stop'
+
+# GUI definition & setup
+sg.theme('DarkBlue')
+
+def Bn(name):  # a PySimpleGUI "User Defined Element" (see docs)
+    return sg.Button(name, size=(8, 1), pad=(1, 1))
+
+layout = [[sg.Input(default_text=_Path_, size=(40, 1), key='-VIDEO_PATH-'), sg.Button(_Load_)],
+          [sg.Frame('', [], size=(300, 170), key='-VID_OUT-')],  # was [sg.Image('', ...)],
+          [Bn(_Prev_), Bn(_Play_), Bn(_Next_), Bn(_Pause_), Bn(_Stop_)],
+          [sg.Text('Load media to start', key='-MESSAGE_AREA-')]]
+
+window = sg.Window('PySimpleGUI VLC Player', layout, element_justification='center', finalize=True, resizable=True)
+
+window['-VID_OUT-'].expand(True, True)  # type: sg.Element
+
+# Media Player Setup
+inst = vlc.Instance()
+list_player = inst.media_list_player_new()
+media_list = inst.media_list_new([])
+list_player.set_media_list(media_list)
+player = list_player.get_media_player()
+# tell VLC where to render the video(s)
+tk_id = window['-VID_OUT-'].Widget.winfo_id()
+libtk = ''
+if sg.running_linux():
+    player.set_xwindow(tk_id)
+elif sg.running_windows():
+    player.set_hwnd(tk_id)
+elif sg.running_mac():
+    try:
+        from tkvlc import _GetNSView, libtk
+        ns = _GetNSView(tk_id)
+    except ImportError:
+        ns = None
+        libtk = 'none, install tkvlc.py from <https://GitHub.com/oaubert/python-vlc> examples'
+    if ns:  # drawable NSview
+        player.set_nsobject(ns)
+    else:  # no video, only audio
+        player.set_xwindow(tk_id)
+else:  # running trinket, etc.
+    player.set_hwnd(tk_id)  # TBD
+
+if __name__ == '__main__':  # MCCABE 20
+
+    if len(sys.argv) > 1:
+        if sys.argv[1].lower() in ('-v', '--version'):
+            # show all versions, this vlc.py, libvlc, etc. (sample output on macOS):
+            # ...
+            # % python3 ./psgvlc.py -v
+            # psgvlc.py: 22.11.06
+            # tkinter: 8.6
+            # libTk: /Library/Frameworks/Python.framework/Versions/3.11/lib/libtk8.6.dylib
+            # vlc.py: 3.0.12119 (Mon May 31 18:25:17 2021 3.0.12)
+            # libVLC: 3.0.16 Vetinari (0x3001000)
+            # plugins: /Applications/VLC.app/Contents/MacOS/plugins
+            # Python: 3.11.0 (64bit) macOS 13.0 arm64
+            for t in ((sys.argv[0], __version__), (sg.tk.__name__, sg.tk.TkVersion), ('libTk', libtk)):
+                print('{}: {}'.format(*t))
+            try:
+                vlc.print_version()
+                vlc.print_python()
+            except AttributeError:
+                pass
+            sys.exit(0)
+
+        if sys.argv[1]:
+            media_list.add_media(sys.argv[1])
+            list_player.set_media_list(media_list)
+
+    # The Event Loop
+    while True:
+        # run with a timeout so that current location can be updated
+        event, values = window.read(timeout=1000)
+
+        if event == sg.WIN_CLOSED:
+            break
+
+        if event == _Pause_:
+            list_player.pause()
+        elif event == _Stop_:
+            list_player.stop()
+        elif event == _Next_:
+            list_player.next()
+            list_player.play()
+        elif event == _Prev_:
+            list_player.previous()  # first call causes current video to start over
+            list_player.previous()  # second call moves back 1 video from current
+            list_player.play()
+        elif event == _Play_:
+            list_player.play()
+        elif event == _Load_:
+            path = values['-VIDEO_PATH-']
+            if path and _Path_ not in path:
+                media_list.add_media(path)
+                list_player.set_media_list(media_list)
+                window['-VIDEO_PATH-'].update(_Path_)  # only add a legit submit
+
+        # update elapsed time if a video loaded and playing
+        if player.is_playing():
+            text = '{:02d}:{:02d}'.format(*divmod(player.get_time()   // 1000, 60)) + ' / ' + \
+                   '{:02d}:{:02d}'.format(*divmod(player.get_length() // 1000, 60))
+            if sg.running_mac():
+                print('{}: {}'.format(sys.argv[0], text))
+
+        elif not media_list.count():
+            text = 'Load media to start'
+        else:
+            text = 'Ready to play media'
+        window['-MESSAGE_AREA-'].update(text)
+
+    window.close()