Skip to content

Fix directshow device discovery and drop EOL 3.7/3.8 #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matham merged 3 commits into from
Mar 23, 2025
Merged

Fix directshow device discovery and drop EOL 3.7/3.8 #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87c9fe0
Begin new primary device after potential secondary.
matham Mar 22, 2025
e5528cb
Drop EOL 3.7 and 3.8.
matham Mar 22, 2025
009d297
Bump actions version.
matham Mar 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 40 additions & 46 deletions .github/workflows/pythonapp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:
FFMPEG_ROOT: ~/ff_deps/ffmpeg
strategy:
matrix:
python: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
python: [ '3.9', '3.10', '3.11', '3.12', '3.13']
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.2.2
- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5.4.0
with:
python-version: ${{ matrix.python }}
- name: Get dependencies
Expand Down Expand Up @@ -71,12 +71,12 @@ jobs:
$env:FFMPEG_ROOT=(get-item $env:FFMPEG_ROOT).FullName
python setup.py bdist_wheel
- name: Upload wheel
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.6.2
with:
name: py_wheel
name: py_wheel-win-${{ matrix.python }}
path: dist
- name: Upload to GitHub Release
uses: softprops/action-gh-release@v0.1.15
uses: softprops/action-gh-release@v2.2.1
if: startsWith(github.ref, 'refs/tags/')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -124,14 +124,15 @@ jobs:
runs-on: ubuntu-latest
needs: windows_wheels_tests
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.2.2
- name: Set up Python 3.x
uses: actions/setup-python@v4
uses: actions/setup-python@v5.4.0
with:
python-version: 3.x
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4.2.1
with:
name: py_wheel
pattern: py_wheel-*
merge-multiple: true
path: dist
- name: Install
run: |
Expand All @@ -158,14 +159,15 @@ jobs:
runs-on: ubuntu-latest
needs: linux_wheels
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.2.2
- name: Set up Python 3.x
uses: actions/setup-python@v4
uses: actions/setup-python@v5.4.0
with:
python-version: 3.x
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4.2.1
with:
name: py_wheel
pattern: py_wheel-*
merge-multiple: true
path: dist
- name: Install
run: |
Expand Down Expand Up @@ -197,26 +199,17 @@ jobs:
matrix:
os: [ ubuntu-latest ]
cibw_archs: [ x86_64 ]
cibw_build: [ 'cp37-manylinux_x86_64 cp38-manylinux_x86_64 cp39-manylinux_x86_64 cp310-manylinux_x86_64 cp311-manylinux_x86_64 cp312-manylinux_x86_64 cp313-manylinux_x86_64' ]
# include:
# - cibw_archs: aarch64
# cibw_build: cp37-manylinux_aarch64
# - cibw_archs: aarch64
# cibw_build: cp38-manylinux_aarch64
# - cibw_archs: aarch64
# cibw_build: cp39-manylinux_aarch64
# - cibw_archs: aarch64
# cibw_build: cp310-manylinux_aarch64
cibw_build: [ 'cp39-manylinux_x86_64 cp310-manylinux_x86_64 cp311-manylinux_x86_64 cp312-manylinux_x86_64 cp313-manylinux_x86_64' ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.2.2
- name: Set up Python 3.x
uses: actions/setup-python@v4
uses: actions/setup-python@v5.4.0
with:
python-version: 3.x
- name: Set up QEMU
if: ${{ matrix.cibw_archs == 'aarch64' }}
uses: docker/setup-qemu-action@v1
- uses: actions/cache@v3
uses: docker/setup-qemu-action@v3.6.0
- uses: actions/cache@v4.2.3
id: deps-cache
with:
path: ffmpeg_build
Expand All @@ -233,12 +226,12 @@ jobs:
run: |
python -m cibuildwheel --output-dir dist
- name: Upload wheel
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.6.2
with:
name: py_wheel
name: py_wheel-linux-${{ matrix.os }}-${{ matrix.cibw_archs }}
path: dist
- name: Upload to GitHub Release
uses: softprops/action-gh-release@v0.1.15
uses: softprops/action-gh-release@v2.2.1
if: startsWith(github.ref, 'refs/tags/')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -259,7 +252,7 @@ jobs:
USE_SDL2_MIXER: 0
FFMPEG_BUILD_PATH: "ffmpeg_build"
CIBW_BUILD_VERBOSITY: 3
CIBW_BUILD: "cp37-* cp38-* cp39-* cp310-* cp311-* cp312-* cp313-*"
CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* cp313-*"
CIBW_ARCHS_MACOS: ${{ matrix.arch }}
CIBW_REPAIR_WHEEL_COMMAND_MACOS: >
DYLD_FALLBACK_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} &&
Expand All @@ -268,15 +261,15 @@ jobs:
matrix:
arch: [ "x86_64", "arm64" ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.2.2
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5.4.0
with:
python-version: 3.x

- name: Cache ffmpeg
id: cache-ffmpeg
uses: actions/cache@v3
uses: actions/cache@v4.2.3
with:
path: ~/${{ env.FFMPEG_BUILD_PATH }}_${{ matrix.arch }}
key: ${{ runner.os }}-ffmpeg-${{ matrix.arch }}-${{ env.MACOSX_DEPLOYMENT_TARGET }}-${{ env.MACOSX_DEPLOYMENT_TARGET_ARM }}-${{ hashFiles('.ci/build_wheels_osx.sh') }}
Expand All @@ -294,24 +287,25 @@ jobs:
python -m cibuildwheel --output-dir dist

- name: Upload wheel
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.6.2
with:
name: py_wheel
name: py_wheel-osx-${{ matrix.arch }}
path: dist

osx_wheels_fuse_test_upload:
runs-on: macos-13
needs: osx_wheels_create
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.2.2
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5.4.0
with:
python-version: 3.x

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4.2.1
with:
name: py_wheel
pattern: py_wheel-*
merge-multiple: true
path: dist

- name: Fuse FFmpeg arm64/x86
Expand All @@ -321,13 +315,13 @@ jobs:
bash ../.ci/merge_osx_deps.sh

- name: Upload wheel
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.6.2
with:
name: py_wheel
name: py_wheel-osx-fused
path: dist

- name: Upload to GitHub Release
uses: softprops/action-gh-release@v0.1.15
uses: softprops/action-gh-release@v2.2.1
if: startsWith(github.ref, 'refs/tags/')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -356,9 +350,9 @@ jobs:
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.2.2
- name: Set up Python 3.x
uses: actions/setup-python@v4
uses: actions/setup-python@v5.4.0
with:
python-version: 3.x
- name: Install
Expand Down
6 changes: 6 additions & 0 deletions ffpyplayer/tools.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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+).*')
Expand Down
Loading