Skip to content
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

updated to most recent QtAVPlayer #823

Merged
merged 3 commits into from
Apr 12, 2024
Merged

updated to most recent QtAVPlayer #823

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
c5b55dc
updated to most recent QtAVPlayer
ElderOrb Apr 8, 2024
c1339a3
CI: Pin to ffmpeg release 6.1 for Windows CI
ElderOrb Apr 9, 2024
2dbf12e
sync with dvrescue
ElderOrb Apr 12, 2024
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
98 changes: 37 additions & 61 deletions .github/workflows/qctools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

- name: Set Qt5 environment path
run: |
echo "/usr/local/opt/qt5/bin" >> $GITHUB_PATH
echo "/usr/local/opt/qt@5/bin" >> $GITHUB_PATH

- name: Build QCTools
env:
Expand All @@ -63,7 +63,7 @@ jobs:
compiler: ['clang-9']
include:
- compiler: clang-9
packages: llvm@9
packages: llvm@13
env: { 'CC': 'clang-9', 'CXX': 'clang++-9', 'HOMEBREW_NO_INSTALL_CLEANUP': '1', 'HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK': '1' }
- qt_version: "6.3.0"
qt_modules: "qtmultimedia"
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:

- name: Set Qt5 environment path
run: |
echo "/usr/local/opt/qt5/bin" >> $GITHUB_PATH
echo "/usr/local/opt/qt@5/bin" >> $GITHUB_PATH

- name: Build qwt
run: |
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
compiler: ['clang-9']
include:
- compiler: clang-9
packages: llvm@9
packages: llvm@13
env: { 'CC': 'clang-9', 'CXX': 'clang++-9', 'HOMEBREW_NO_INSTALL_CLEANUP': '1', 'HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK': '1' }
- qt_version: "6.3.0"
qt_modules: "qtmultimedia"
Expand Down Expand Up @@ -491,22 +491,16 @@ jobs:
arch: win64_mingw81
version: ${{ matrix.qt_version }}

- name: Install wget & unzip
run: |
choco install wget unzip xidel

- name: Install FFmpeg
shell: cmd
shell: pwsh
run: |
cd ..
xidel https://github.com/BtbN/FFmpeg-Builds/releases -e "//a[contains(@href, '-gpl-shared.zip')]/@href[1]" --silent > ffmpeg.url
xidel https://github.com/BtbN/FFmpeg-Builds/releases -e "(//a[contains(@href, '-gpl-shared.zip')])[1]/substring(., 0, string-length(.) - 3)" --silent > ffmpeg.name
set /P FFMPEG_URL=< ffmpeg.url
set /P FFMPEG_NAME=< ffmpeg.name
wget https://github.com%FFMPEG_URL%
unzip %FFMPEG_NAME%.zip
ren %FFMPEG_NAME% ffmpeg
dir ffmpeg
Set-Location ..
$json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest)
$ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")')
$ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).browser_download_url')
Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip"
Expand-Archive -Path "$ffmpeg_name.zip" -DestinationPath .
Rename-Item -Path "$ffmpeg_name" -NewName "ffmpeg"

- name: Download and configure qwt
run: |
Expand Down Expand Up @@ -579,22 +573,16 @@ jobs:
version: ${{ matrix.qt_version }}
modules: ${{ matrix.qt_modules }}

- name: Install wget & unzip
run: |
choco install wget unzip xidel

- name: Install FFmpeg
shell: cmd
shell: pwsh
run: |
cd ..
xidel https://github.com/BtbN/FFmpeg-Builds/releases -e "//a[contains(@href, '-gpl-shared.zip')]/@href[1]" --silent > ffmpeg.url
xidel https://github.com/BtbN/FFmpeg-Builds/releases -e "(//a[contains(@href, '-gpl-shared.zip')])[1]/substring(., 0, string-length(.) - 3)" --silent > ffmpeg.name
set /P FFMPEG_URL=< ffmpeg.url
set /P FFMPEG_NAME=< ffmpeg.name
wget https://github.com%FFMPEG_URL%
unzip %FFMPEG_NAME%.zip
ren %FFMPEG_NAME% ffmpeg
dir ffmpeg
Set-Location ..
$json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest)
$ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")')
$ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).browser_download_url')
Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip"
Expand-Archive -Path "$ffmpeg_name.zip" -DestinationPath .
Rename-Item -Path "$ffmpeg_name" -NewName "ffmpeg"

- name: Download and configure qwt
run: |
Expand Down Expand Up @@ -668,22 +656,16 @@ jobs:
with:
version: ${{ matrix.qt_version }}

- name: Install wget & unzip
run: |
choco install wget unzip xidel

- name: Install FFmpeg
shell: cmd
shell: pwsh
run: |
cd ..
xidel https://github.com/BtbN/FFmpeg-Builds/releases -e "//a[contains(@href, '-gpl-shared.zip')]/@href[1]" --silent > ffmpeg.url
xidel https://github.com/BtbN/FFmpeg-Builds/releases -e "(//a[contains(@href, '-gpl-shared.zip')])[1]/substring(., 0, string-length(.) - 3)" --silent > ffmpeg.name
set /P FFMPEG_URL=< ffmpeg.url
set /P FFMPEG_NAME=< ffmpeg.name
wget https://github.com%FFMPEG_URL%
unzip %FFMPEG_NAME%.zip
ren %FFMPEG_NAME% ffmpeg
dir ffmpeg
Set-Location ..
$json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest)
$ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")')
$ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).browser_download_url')
Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip"
Expand-Archive -Path "$ffmpeg_name.zip" -DestinationPath .
Rename-Item -Path "$ffmpeg_name" -NewName "ffmpeg"

- name: Download and configure qwt
run: |
Expand Down Expand Up @@ -761,22 +743,16 @@ jobs:
version: ${{ matrix.qt_version }}
modules: ${{ matrix.qt_modules }}

- name: Install wget & unzip
run: |
choco install wget unzip xidel

- name: Install FFmpeg
shell: cmd
run: |
cd ..
xidel https://github.com/BtbN/FFmpeg-Builds/releases -e "//a[contains(@href, '-gpl-shared.zip')]/@href[1]" --silent > ffmpeg.url
xidel https://github.com/BtbN/FFmpeg-Builds/releases -e "(//a[contains(@href, '-gpl-shared.zip')])[1]/substring(., 0, string-length(.) - 3)" --silent > ffmpeg.name
set /P FFMPEG_URL=< ffmpeg.url
set /P FFMPEG_NAME=< ffmpeg.name
wget https://github.com%FFMPEG_URL%
unzip %FFMPEG_NAME%.zip
ren %FFMPEG_NAME% ffmpeg
dir ffmpeg
shell: pwsh
run: |
Set-Location ..
$json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest)
$ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")')
$ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).browser_download_url')
Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip"
Expand-Archive -Path "$ffmpeg_name.zip" -DestinationPath .
Rename-Item -Path "$ffmpeg_name" -NewName "ffmpeg"

- name: Download and configure qwt
run: |
Expand Down
2 changes: 1 addition & 1 deletion Project/QtCreator/qctools-QtAVPlayer
Open in desktop
Submodule qctools-QtAVPlayer updated 32 files
+13 −12 .github/workflows/main.yaml
+9 −8 README.md
+1 −1 examples/extract_frames/extract_frames.pro
+15 −10 examples/qml_video/main.cpp
+1 −0 examples/qml_video/qml.qrc
+2 −1 examples/qml_video/qml_video.pro
+15 −6 examples/widget_video/main.cpp
+3 −1 examples/widget_video/widget_video.pro
+1 −1 src/QtAVPlayer/QtAVPlayer.pri
+1 −1 src/QtAVPlayer/qavaudiocodec.cpp
+1 −1 src/QtAVPlayer/qavaudiofilter.cpp
+5 −0 src/QtAVPlayer/qavaudioformat.h
+30 −10 src/QtAVPlayer/qavaudioframe.cpp
+2 −0 src/QtAVPlayer/qavaudioframe.h
+4 −4 src/QtAVPlayer/qavaudioinputfilter.cpp
+59 −15 src/QtAVPlayer/qavaudiooutput.cpp
+6 −0 src/QtAVPlayer/qavaudiooutput.h
+22 −4 src/QtAVPlayer/qavdemuxer.cpp
+2 −0 src/QtAVPlayer/qavdemuxer_p.h
+1 −1 src/QtAVPlayer/qavframe.cpp
+180 −3 src/QtAVPlayer/qavhwdevice_d3d11.cpp
+31 −17 src/QtAVPlayer/qaviodevice.cpp
+5 −12 src/QtAVPlayer/qaviodevice.h
+46 −42 src/QtAVPlayer/qavplayer.cpp
+2 −2 src/QtAVPlayer/qavplayer.h
+44 −8 src/QtAVPlayer/qavstream.cpp
+1 −1 src/QtAVPlayer/qavvideofilter.cpp
+1 −0 src/QtAVPlayer/qavvideoframe.cpp
+5 −5 tests/auto/integration/qavdemuxer/tst_qavdemuxer.cpp
+160 −76 tests/auto/integration/qavplayer/tst_qavplayer.cpp
+ − tests/auto/integration/testdata/rotated_90.mp4
+ − tests/auto/integration/testdata/test.mp3
2 changes: 1 addition & 1 deletion Project/QtCreator/qctools-cli/qctools-cli.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ message('entering qctools-cli.pro')
QT += core network
QT -= gui

CONFIG += c++11
CONFIG += c++1z

TARGET = qcli
CONFIG += console
Expand Down
2 changes: 1 addition & 1 deletion Project/QtCreator/qctools-gui/qctools-gui.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport qml
TARGET = QCTools
TEMPLATE = app

CONFIG += c++11 qt
CONFIG += c++1z qt

message("PWD = " $$PWD)

Expand Down
2 changes: 1 addition & 1 deletion Project/QtCreator/qctools-lib/qctools-lib.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ QT = core network multimedia concurrent

TARGET = qctools
TEMPLATE = lib
CONFIG += c++11
CONFIG += c++1z
CONFIG += staticlib

message('qctools-lib: including ffmpeg')
Expand Down
Loading