Skip to content

Commit

Permalink
Deprecate QtAVPlayer module
Browse files Browse the repository at this point in the history
Instead of building a module or a lib, suggesting to build QtAVPlayer directly to an app
using pri file.
Removed CMake support for now, since not used.
  • Loading branch information
valbok committed Aug 13, 2023
1 parent 06719dd commit 70609d3
Show file tree
Hide file tree
Showing 72 changed files with 210 additions and 920 deletions.
2 changes: 0 additions & 2 deletions .cmake.conf

This file was deleted.

111 changes: 21 additions & 90 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,41 +48,18 @@ jobs:
version: ${{ matrix.qt_version }}
modules: ${{ matrix.qt_modules }}

- name: QMake Build
if: ${{ matrix.qt_version == '5.15.2' }}
run: |
qmake
make CC=$CC CXX=$CXX
make install
- name: CMake Build
run: |
mkdir build
cd build
cmake ../ -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON
make CC=$CC CXX=$CXX CXXFLAGS='-std=c++17' VERBOSE=1
- name: QMake Test
if: ${{ matrix.qt_version == '5.15.2' }}
run: |
cd tests/
qmake
make CC=$CC CXX=$CXX CXXFLAGS='-std=c++17 -fPIC'
export QT_LOGGING_RULES="qt.QtAVPlayer.debug=true"
cd auto/integration/qavdemuxer
cd tests/auto/integration/qavdemuxer
qmake DEFINES+="multimedia"
make CC=$CC CXX=$CXX
./tst_qavdemuxer
cd ../
cd qavplayer
cd ../qavplayer
qmake DEFINES+="multimedia"
make CC=$CC CXX=$CXX
./tst_qavplayer -maxwarnings 100000
- name: CMake Test
if: ${{ matrix.qt_version == '6.5.0' }}
run: |
cd build
export QT_LOGGING_RULES="qt.QtAVPlayer.debug=true"
./tests/auto/integration/qavdemuxer/tst_qavdemuxer
./tests/auto/integration/qavplayer/tst_qavplayer -maxwarnings 100000
macos:
strategy:
matrix:
Expand All @@ -109,30 +86,15 @@ jobs:
echo "/usr/local/Cellar/ffmpeg/6.0/include" >> $GITHUB_PATH
echo "/usr/local/opt/llvm@9/bin" >> $GITHUB_PATH
- name: CMake Build
run: |
mkdir build
cd build
cmake ../ -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=/usr/local/Cellar/ffmpeg/6.0/include -DCMAKE_LIBRARY_PATH=/usr/local/Cellar/ffmpeg/6.0/lib
make CC=$CC CXX=$CXX CXXFLAGS='-std=c++17' VERBOSE=1
- name: QMake Build
run: |
ffmpeg -version
qmake
make CC=$CC CXX=$CXX CXXFLAGS="$CXXFLAGS"
make install
- name: QMake Test
run: |
cd tests/
qmake
make CC=$CC CXX=$CXX
export QT_LOGGING_RULES="qt.QtAVPlayer.debug=true"
cd auto/integration/qavdemuxer
cd tests/auto/integration/qavdemuxer
qmake DEFINES+="multimedia" INCLUDE+="/usr/local/Cellar/ffmpeg/6.0/include" LIBS="-Wl,-rpath-link,/usr/local/Cellar/ffmpeg/6.0/lib"
make CC=$CC CXX=$CXX
./tst_qavdemuxer --platform minimal
cd ../
cd qavplayer
cd ../qavplayer
qmake DEFINES+="multimedia" INCLUDE+="/usr/local/Cellar/ffmpeg/6.0/include" LIBS="-Wl,-rpath-link,/usr/local/Cellar/ffmpeg/6.0/lib"
./tst_qavplayer --platform minimal -maxwarnings 100000
windows:
Expand Down Expand Up @@ -191,67 +153,36 @@ jobs:
echo CPLUS_INCLUDE_PATH=%FFMPEG%\include;%CPLUS_INCLUDE_PATH%>>%GITHUB_ENV%
echo LIB=%FFMPEG%\lib;%FFMPEG%\bin;%LIB%>>%GITHUB_ENV%
- name: CMake Build
if: ${{ matrix.type == 'MSVC' }}
run: |
mkdir build
cd build
cmake ../ -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=D:\a\QtAVPlayer\ffmpeg\include -DCMAKE_LIBRARY_PATH=D:\a\QtAVPlayer\ffmpeg\lib -DBUILD_SHARED_LIBS=ON
cmake --build . -v
- name: CMake Build
if: ${{ matrix.type == 'MINGW' }}
run: |
mkdir build
cd build
cmake ../ -DBUILD_TESTS=ON -DBUILD_EXAMPLES=OFF -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=D:\a\QtAVPlayer\ffmpeg\include -DCMAKE_LIBRARY_PATH=D:\a\QtAVPlayer\ffmpeg\lib -DBUILD_SHARED_LIBS=OFF
cmake --build . -v
- name: QMake Build
if: ${{ matrix.type == 'MSVC' }}
shell: cmd
run: |
qmake
nmake
nmake install
- name: QMake Test
if: ${{ matrix.type == 'MSVC' }}
shell: cmd
run: |
set QT_LOGGING_RULES=qt.QtAVPlayer.debug=true
set QT_FORCE_STDERR_LOGGING=1
set QT_ASSUME_STDERR_HAS_CONSOLE=1
cd tests/
qmake
cd tests/auto/integration/qavdemuxer
qmake DEFINES+="multimedia"
nmake
cd auto/integration/qavdemuxer
release\tst_qavdemuxer.exe
cd ../
cd ../qavplayer
cd qavplayer
qmake DEFINES+="multimedia"
nmake
release\tst_qavplayer.exe -maxwarnings 100000
- name: QMake Build
if: ${{ matrix.type == 'MINGW' }}
shell: cmd
run: |
qmake
mingw32-make
mingw32-make install
- name: QMake Test
if: ${{ matrix.type == 'MINGW' }}
shell: cmd
run: |
set QT_LOGGING_RULES=qt.QtAVPlayer.debug=true
set QT_FORCE_STDERR_LOGGING=1
set QT_ASSUME_STDERR_HAS_CONSOLE=1
cd tests/
qmake
cd tests/auto/integration/qavdemuxer
qmake DEFINES+="multimedia"
mingw32-make
cd auto/integration/qavdemuxer
release\tst_qavdemuxer.exe
cd ../
cd qavplayer
cd ../qavplayer
qmake DEFINES+="multimedia"
mingw32-make
release\tst_qavplayer.exe -maxwarnings 100000
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ tmp
*.dylib
*.framework
*_wrapper.*
*-config_p.h
*-config.h
*-config.pri
*.version*

Expand Down
5 changes: 0 additions & 5 deletions .qmake.conf

This file was deleted.

118 changes: 0 additions & 118 deletions CMakeLists.txt

This file was deleted.

2 changes: 0 additions & 2 deletions QtAVPlayer.pro

This file was deleted.

5 changes: 0 additions & 5 deletions configure.json

This file was deleted.

1 change: 0 additions & 1 deletion examples/CMakeLists.txt

This file was deleted.

5 changes: 0 additions & 5 deletions examples/examples.pro

This file was deleted.

15 changes: 0 additions & 15 deletions examples/extract_frames/CMakeLists.txt

This file was deleted.

3 changes: 3 additions & 0 deletions examples/extract_frames/extract_frames.pro
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ TEMPLATE = app
TARGET = extract_frames
INCLUDEPATH += .

INCLUDEPATH += . ../../src/QtAVPlayer
include(../../src/QtAVPlayer/QtAVPlayer.pri)

QT -= gui
QT += QtAVPlayer

Expand Down
47 changes: 0 additions & 47 deletions examples/qml_video/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 70609d3

Please sign in to comment.