Skip to content

Commit

Permalink
Merge branch 'main' into bits_per_coded_sample
Browse files Browse the repository at this point in the history
  • Loading branch information
WyattBlue authored Mar 9, 2024
2 parents 32dc8c6 + 9ad1d91 commit e7d20c6
Show file tree
Hide file tree
Showing 175 changed files with 4,521 additions and 2,796 deletions.
16 changes: 0 additions & 16 deletions .editorconfig

This file was deleted.

2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/build-bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ I have done the following:
- [ ] Searched on [Google](https://www.google.com/search?q=pyav+how+do+I+foo)
- [ ] Searched on [Stack Overflow](https://stackoverflow.com/search?q=pyav)
- [ ] Looked through [old GitHub issues](https://github.com/PyAV-Org/PyAV/issues?&q=is%3Aissue)
- [ ] Asked on [PyAV Gitter](https://gitter.im/PyAV-Org)
- [ ] Asked on [PyAV Gitter](https://app.gitter.im/#/room/#PyAV-Org_User-Help:gitter.im)
- [ ] ... and waited 72 hours for a response.


Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/runtime-bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ I have done the following:
- [ ] Searched on [Google](https://www.google.com/search?q=pyav+how+do+I+foo)
- [ ] Searched on [Stack Overflow](https://stackoverflow.com/search?q=pyav)
- [ ] Looked through [old GitHub issues](https://github.com/PyAV-Org/PyAV/issues?&q=is%3Aissue)
- [ ] Asked on [PyAV Gitter](https://gitter.im/PyAV-Org)
- [ ] Asked on [PyAV Gitter](https://app.gitter.im/#/room/#PyAV-Org_User-Help:gitter.im)
- [ ] ... and waited 72 hours for a response.


Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/user-help.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ I have done the following:
- [ ] Searched on [Google](https://www.google.com/search?q=pyav+how+do+I+foo)
- [ ] Searched on [Stack Overflow](https://stackoverflow.com/search?q=pyav)
- [ ] Looked through [old GitHub issues](https://github.com/PyAV-Org/PyAV/issues?&q=is%3Aissue)
- [ ] Asked on [PyAV Gitter](https://gitter.im/PyAV-Org)
- [ ] Asked on [PyAV Gitter](https://app.gitter.im/#/room/#PyAV-Org_User-Help:gitter.im)
- [ ] ... and waited 72 hours for a response.


Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/issues.yml

This file was deleted.

77 changes: 25 additions & 52 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,52 +1,35 @@
name: tests
on:
push:
branches: main
paths-ignore:
- '**.md'
- '**.rst'
- '**.txt'
pull_request:
branches: main
paths-ignore:
- '**.md'
- '**.rst'
- '**.txt'
jobs:
style:
name: "${{ matrix.config.suite }}"
runs-on: ubuntu-latest
strategy:
matrix:
config:
- {suite: black}
- {suite: flake8}
- {suite: isort}

env:
PYAV_PYTHON: python3
PYAV_LIBRARY: ffmpeg-4.3 # doesn't matter

steps:
- uses: actions/checkout@v3
name: Checkout
- name: Checkout
uses: actions/checkout@v4

- name: Python
uses: actions/setup-python@v4
with:
python-version: 3.8

- name: Environment
run: env | sort

- name: Packages
run: |
. scripts/activate.sh
# A bit of a hack that we can get away with this.
python -m pip install ${{ matrix.config.suite }}
run: pip install -r tests/requirements.txt

- name: "${{ matrix.config.suite }}"
run: |
. scripts/activate.sh
./scripts/test ${{ matrix.config.suite }}
- name: Linters
run: make lint

nix:
name: "py-${{ matrix.config.python }} lib-${{ matrix.config.ffmpeg }} ${{matrix.config.os}}"
Expand All @@ -55,18 +38,19 @@ jobs:
fail-fast: false
matrix:
config:
- {os: ubuntu-latest, python: 3.8, ffmpeg: "6.0", extras: true}
- {os: ubuntu-latest, python: 3.8, ffmpeg: "6.1", extras: true}
- {os: ubuntu-latest, python: 3.8, ffmpeg: "6.0"}
- {os: ubuntu-latest, python: 3.8, ffmpeg: "5.1"}
- {os: ubuntu-latest, python: 3.8, ffmpeg: "5.0"}
- {os: ubuntu-latest, python: pypy3.9, ffmpeg: "5.0"}
- {os: macos-latest, python: 3.8, ffmpeg: "5.0"}
- {os: ubuntu-latest, python: pypy3.9, ffmpeg: "6.1"}
- {os: macos-latest, python: 3.8, ffmpeg: "6.1"}

env:
PYAV_PYTHON: python${{ matrix.config.python }}
PYAV_LIBRARY: ffmpeg-${{ matrix.config.ffmpeg }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
name: Checkout

- name: Python ${{ matrix.config.python }}
Expand Down Expand Up @@ -120,20 +104,14 @@ jobs:
if: matrix.config.extras
run: |
. scripts/activate.sh ffmpeg-${{ matrix.config.ffmpeg }}
scripts/test doctest
make -C docs test
- name: Examples
if: matrix.config.extras
run: |
. scripts/activate.sh ffmpeg-${{ matrix.config.ffmpeg }}
scripts/test examples
- name: Source Distribution
if: matrix.config.extras
run: |
. scripts/activate.sh ffmpeg-${{ matrix.config.ffmpeg }}
scripts/test sdist
windows:
name: "py-${{ matrix.config.python }} lib-${{ matrix.config.ffmpeg }} ${{matrix.config.os}}"
runs-on: ${{ matrix.config.os }}
Expand All @@ -142,12 +120,14 @@ jobs:
fail-fast: false
matrix:
config:
- {os: windows-latest, python: 3.8, ffmpeg: "6.1"}
- {os: windows-latest, python: 3.8, ffmpeg: "6.0"}
- {os: windows-latest, python: 3.8, ffmpeg: "5.1"}
- {os: windows-latest, python: 3.8, ffmpeg: "5.0"}

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Conda
shell: bash
Expand All @@ -161,21 +141,14 @@ jobs:
pillow \
python=${{ matrix.config.python }} \
setuptools
if [[ "${{ matrix.config.ffmpeg }}" == "5.1" ]]; then
curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.1.2-1/ffmpeg-win_amd64.tar.gz
elif [[ "${{ matrix.config.ffmpeg }}" == "5.0" ]]; then
curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.0.1-1/ffmpeg-win_amd64.tar.gz
else
exit 1
fi
- name: Build
shell: bash
run: |
. $CONDA/etc/profile.d/conda.sh
conda activate pyav
tar -xf ffmpeg.tar.gz -C $CONDA_PREFIX/Library/
python setup.py build_ext --inplace --ffmpeg-dir=$CONDA_PREFIX/Library
python scripts\\fetch-vendor.py --config-file scripts\\ffmpeg-${{ matrix.config.ffmpeg }}.json $CONDA_PREFIX\\Library
python setup.py build_ext --inplace --ffmpeg-dir=$CONDA_PREFIX\\Library
- name: Test
shell: bash
Expand All @@ -187,14 +160,14 @@ jobs:
package-source:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: 3.8
- name: Build source package
run: |
pip install cython
python scripts/fetch-vendor.py /tmp/vendor
python scripts/fetch-vendor.py --config-file scripts/ffmpeg-6.1.json /tmp/vendor
PKG_CONFIG_PATH=/tmp/vendor/lib/pkgconfig python setup.py sdist
- name: Upload source package
uses: actions/upload-artifact@v3
Expand All @@ -221,13 +194,13 @@ jobs:
- os: windows-latest
arch: AMD64
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: 3.8
- name: Set up QEMU
if: matrix.os == 'ubuntu-latest'
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Install packages
if: matrix.os == 'macos-latest'
run: |
Expand All @@ -237,8 +210,8 @@ jobs:
env:
CIBW_ARCHS: ${{ matrix.arch }}
CIBW_BEFORE_ALL_LINUX: yum install -y alsa-lib libxcb
CIBW_BEFORE_BUILD: pip install cython && python scripts/fetch-vendor.py /tmp/vendor
CIBW_BEFORE_BUILD_WINDOWS: pip install cython && python scripts\fetch-vendor.py C:\cibw\vendor
CIBW_BEFORE_BUILD: python scripts/fetch-vendor.py --config-file scripts/ffmpeg-6.1.json /tmp/vendor
CIBW_BEFORE_BUILD_WINDOWS: python scripts\fetch-vendor.py --config-file scripts\ffmpeg-6.1.json C:\cibw\vendor
CIBW_ENVIRONMENT_LINUX: LD_LIBRARY_PATH=/tmp/vendor/lib:$LD_LIBRARY_PATH PKG_CONFIG_PATH=/tmp/vendor/lib/pkgconfig
CIBW_ENVIRONMENT_MACOS: PKG_CONFIG_PATH=/tmp/vendor/lib/pkgconfig LDFLAGS=-headerpad_max_install_names
CIBW_ENVIRONMENT_WINDOWS: INCLUDE=C:\\cibw\\vendor\\include LIB=C:\\cibw\\vendor\\lib PYAV_SKIP_TESTS=unicode_filename
Expand All @@ -262,7 +235,7 @@ jobs:
runs-on: ubuntu-latest
needs: [package-source, package-wheel]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
with:
name: dist
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
/ipch
/msvc-projects
/src
/docs/_ffmpeg

# Testing.
*.spyderproject
.idea
/.vagrant
/sandbox
/tests/assets
/tests/samples
106 changes: 72 additions & 34 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,79 @@ All contributors (by number of commits):
- Mike Boers <[email protected]>; `@mikeboers <https://github.com/mikeboers>`_

* Jeremy Lainé <[email protected]>; `@jlaine <https://github.com/jlaine>`_
* Mark Reid <[email protected]>; `@markreidvfx <https://github.com/markreidvfx>`_

- Vidar Tonaas Fauske <[email protected]>; `@vidartf <https://github.com/vidartf>`_
- Billy Shambrook <[email protected]>; `@billyshambrook <https://github.com/billyshambrook>`_
- Casper van der Wel <[email protected]>
- Tadas Dailyda <[email protected]>
- Mark Reid <[email protected]>; `@markreidvfx <https://github.com/markreidvfx>`_

* Xinran Xu <[email protected]>; `@xxr3376 <https://github.com/xxr3376>`_
* Dan Allan <[email protected]>; `@danielballan <https://github.com/danielballan>`_
* Alireza Davoudi <[email protected]>; `@adavoudi <https://github.com/adavoudi>`_
* Moritz Kassner <[email protected]>; `@mkassner <https://github.com/mkassner>`_
* Thomas A Caswell <[email protected]>; `@tacaswell <https://github.com/tacaswell>`_
* Ulrik Mikaelsson <[email protected]>; `@rawler <https://github.com/rawler>`_
* Wel C. van der <[email protected]>
* Will Patera <[email protected]>; `@willpatera <https://github.com/willpatera>`_
* Vidar Tonaas Fauske <[email protected]>; `@vidartf <https://github.com/vidartf>`_
* Billy Shambrook <[email protected]>; `@billyshambrook <https://github.com/billyshambrook>`_
* Casper van der Wel <[email protected]>
* Philip de Nier <[email protected]>
* Tadas Dailyda <[email protected]>
* WyattBlue <[email protected]>
* Justin Wong <[email protected]>

- rutsh <[email protected]>
- Alba Mendez <[email protected]>
- Xinran Xu <[email protected]>; `@xxr3376 <https://github.com/xxr3376>`_
- Dan Allan <[email protected]>; `@danielballan <https://github.com/danielballan>`_
- Dave Johansen <[email protected]>
- Mark Harfouche <[email protected]>
- Christoph Rackwitz <[email protected]>
- Johannes Erdfelt <[email protected]>
- Karl Litterfeldt <[email protected]>; `@litterfeldt <https://github.com/litterfeldt>`_
- Martin Larralde <[email protected]>
- Miles Kaufmann <[email protected]>
- Radek Senfeld <[email protected]>; `@radek-senfeld <https://github.com/radek-senfeld>`_
- Ian Lee <[email protected]>
- Arthur Barros <[email protected]>
- Gemfield <[email protected]>
- mephi42 <[email protected]>
- Manuel Goacolou <[email protected]>
- Ömer Sezgin Uğurlu <[email protected]>
- Orivej Desh <[email protected]>
- Brendan Long <[email protected]>; `@brendanlong <https://github.com/brendanlong>`_
- Tom Flanagan <[email protected]>
- Tim O'Shea <[email protected]>
- Tim Ahpee <[email protected]>
- Jonas Tingeborn <[email protected]>
- Vasiliy Kotov <[email protected]>
- Koichi Akabe <[email protected]>
- David Joy <[email protected]>
- Alireza Davoudi <[email protected]>; `@adavoudi <https://github.com/adavoudi>`_
- Jonathan Drolet <[email protected]>
- Moritz Kassner <[email protected]>; `@mkassner <https://github.com/mkassner>`_
- Thomas A Caswell <[email protected]>; `@tacaswell <https://github.com/tacaswell>`_
- Ulrik Mikaelsson <[email protected]>; `@rawler <https://github.com/rawler>`_
- Wel C. van der <[email protected]>
- Will Patera <[email protected]>; `@willpatera <https://github.com/willpatera>`_

* rutsh <[email protected]>
* Felix Vollmer <[email protected]>
* Santiago Castro <[email protected]>
* Christian Clauss <[email protected]>
* Ihor Liubymov <[email protected]>
* Johannes Erdfelt <[email protected]>
* Karl Litterfeldt <[email protected]>; `@litterfeldt <https://github.com/litterfeldt>`_
* Martin Larralde <[email protected]>
* Simon-Martin Schröder <[email protected]>
* mephi42 <[email protected]>
* Miles Kaufmann <[email protected]>
* Pablo Prietz <[email protected]>
* Radek Senfeld <[email protected]>; `@radek-senfeld <https://github.com/radek-senfeld>`_
* Benjamin Chrétien <[email protected]>
* Marc Mueller <[email protected]>
* zzjjbb <[email protected]>
* Hanz <[email protected]>
* Ian Lee <[email protected]>
* Ryan Huang <[email protected]>
* Arthur Barros <[email protected]>
* Carlos Ruiz <[email protected]>
* David Plowman <[email protected]>
* Maxime Desroches <[email protected]>
* egao1980 <[email protected]>
* Eric Kalosa-Kenyon <[email protected]>
* Gemfield <[email protected]>
* Jonathan Martin <[email protected]>
* Johan Jeppsson Karlin <[email protected]>
* Philipp Klaus <[email protected]>
* Mattias Wadman <[email protected]>
* Manuel Goacolou <[email protected]>
* Julian Schweizer <[email protected]>
* Ömer Sezgin Uğurlu <[email protected]>
* Orivej Desh <[email protected]>
* Philipp Krähenbühl <[email protected]>
* ramoncaldeira <[email protected]>
* Santiago Castro <[email protected]>
* Kengo Sawatsu <[email protected]>
* FirefoxMetzger <[email protected]>
* Brendan Long <[email protected]>; `@brendanlong <https://github.com/brendanlong>`_
* Семён Марьясин <[email protected]>
* Stephen.Y <[email protected]>
* Tom Flanagan <[email protected]>
* Tim O'Shea <[email protected]>
* Tim Ahpee <[email protected]>
* Jonas Tingeborn <[email protected]>
* Pino Toscano <[email protected]>
* Ulrik Mikaelsson <[email protected]>
* Vasiliy Kotov <[email protected]>
* Koichi Akabe <[email protected]>
* David Joy <[email protected]>
Loading

0 comments on commit e7d20c6

Please sign in to comment.