From 5439fd1af5e88abd2657d6cf8272b1ce0586ebcd Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Wed, 7 Apr 2021 15:56:57 +0100 Subject: [PATCH 01/31] Revert changes to travis CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7cbe31e..372cfa3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ before_install: - sudo apt-get -qq update - sudo apt-get install build-essential cmake qtbase5-dev libavcodec-dev libavformat-dev libavutil-dev libopencv-dev libopencv-video-dev libopencv-contrib-dev script: - - mkdir -p build && cd build && cmake -DBUILD_TESTS=ON .. && make && && make test && cd .. + - mkdir -p build && cd build && cmake -DBUILD_TESTS=ON .. && make && cd .. From 344188234b6a5e18d89d0cedf120bc0e3b994d71 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 16 Apr 2021 22:25:40 +0100 Subject: [PATCH 02/31] Add missing dependency to gtest in travis env --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 372cfa3..881a923 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,6 @@ language: cpp dist: xenial before_install: - sudo apt-get -qq update - - sudo apt-get install build-essential cmake qtbase5-dev libavcodec-dev libavformat-dev libavutil-dev libopencv-dev libopencv-video-dev libopencv-contrib-dev + - sudo apt-get install build-essential cmake qtbase5-dev libavcodec-dev libavformat-dev libavutil-dev libopencv-dev libopencv-video-dev libopencv-contrib-dev libgtest-dev script: - mkdir -p build && cd build && cmake -DBUILD_TESTS=ON .. && make && cd .. From 847f4f06b9db5baaca4cbd0aac5037c8f9553306 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 16 Apr 2021 22:47:07 +0100 Subject: [PATCH 03/31] Remove testing from travis ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 881a923..0f29597 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ before_install: - sudo apt-get -qq update - sudo apt-get install build-essential cmake qtbase5-dev libavcodec-dev libavformat-dev libavutil-dev libopencv-dev libopencv-video-dev libopencv-contrib-dev libgtest-dev script: - - mkdir -p build && cd build && cmake -DBUILD_TESTS=ON .. && make && cd .. + - mkdir -p build && cd build && cmake .. && make && cd .. From c718d0170023092309af75ccffdfee20b2c2b1fa Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 17 Apr 2021 00:44:34 +0100 Subject: [PATCH 04/31] Complete ffmpeg def in appveyor Add missing variable definitions for avdevice and postproc library Define variable FFMPEG_DIR --- .appveyor.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index e25276f..44fdc1a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,16 +5,16 @@ platform: environment: access_token: secure: SMxOWNKN0RkPvICWhIet2FJM5g/zx5mguM/XAPjM2OrC3U2/LAqcBZw0veS9peS4 - + clone_folder: C:\Projects\calyp init: - ps: Add-Content "$HOME\.git-credentials" "https://$($env:access_token):x-oauth-basic@github.com`n" - git config --global credential.helper store - git config --global user.email "jfmcarreira@gmail.com" - - git config --global user.name "AppVeyor" + - git config --global user.name "AppVeyor" - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - + install: - '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64' - choco install nsis @@ -25,13 +25,13 @@ install: - 7z x ffmpeg.7z -y -offmpeg - git clone https://github.com/pixlra/calyp-deployment.git - CALL calyp-deployment/scripts/extract_ffmpeg.bat - - + + build_script: - mv C:\Projects\calyp C:\Projects\calyp-deployment\cmake-helper\ - mkdir C:\Projects\calyp-build - cd C:\Projects\calyp-build - - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DUSE_DYNLOAD=OFF -DOpenCV_DIR="C:/Tools/opencv/build" -DOpenCV_DLL_DIR="C:/Tools/opencv/build/x64/vc15/bin" -DOpenCV_INSTALL_MODULES="world" -DQT_DIR="C:\Qt\latest\msvc2017_64" -DQt5_DIR="C:\Qt\latest\msvc2017_64\lib\cmake\Qt5" -DUSE_QTDBUS=OFF -DAVFORMAT_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/avformat.lib -DAVFORMAT_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DAVCODEC_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/avcodec.lib -DAVCODEC_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DAVUTIL_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/avutil.lib -DAVUTIL_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DSWSCALE_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/swscale.lib -DSWSCALE_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -G "Visual Studio 15 2017 Win64" C:\Projects\calyp-deployment\cmake-helper + - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DUSE_DYNLOAD=OFF -DOpenCV_DIR="C:/Tools/opencv/build" -DOpenCV_DLL_DIR="C:/Tools/opencv/build/x64/vc15/bin" -DOpenCV_INSTALL_MODULES="world" -DQT_DIR="C:\Qt\latest\msvc2017_64" -DQt5_DIR="C:\Qt\latest\msvc2017_64\lib\cmake\Qt5" -DUSE_QTDBUS=OFF -DAVFORMAT_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/avformat.lib -DAVFORMAT_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DAVCODEC_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/avcodec.lib -DAVCODEC_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DAVUTIL_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/avutil.lib -DAVUTIL_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DSWSCALE_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/swscale.lib -DSWSCALE_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DAVDEVICE_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/avdevice.lib -DAVDEVICE_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DPOSTPROC_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/postproc.lib -DPOSTPROC_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DFFMPEG_DIR=C:\Projects\ffmpeg_libraries -G "Visual Studio 15 2017 Win64" C:\Projects\calyp-deployment\cmake-helper - cmake --build . --target ALL_BUILD -- /p:Configuration=Release > log_build - cmake --build . --target INSTALL -- /p:Configuration=Release > log_install - cmake --build . --target PACKAGE -- /p:Configuration=Release > log_pkg @@ -39,7 +39,7 @@ build_script: after_build: - IF "%APPVEYOR_REPO_BRANCH%" == "master" (CALL ..\calyp-deployment\scripts\deploy-to-github.bat) - + on_failure: - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) From 1f003ec2ac86b13e3c1face4675273b5d3281de7 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 17 Apr 2021 01:22:34 +0100 Subject: [PATCH 05/31] Add libswresample to FindFFmpeg --- cmake/FindFFmpeg.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake index c9846b4..454fd42 100644 --- a/cmake/FindFFmpeg.cmake +++ b/cmake/FindFFmpeg.cmake @@ -86,6 +86,7 @@ IF(NOT FFMPEG_LIBRARIES) FIND_COMPONENT(AVDEVICE libavdevice avdevice libavdevice/avdevice.h) FIND_COMPONENT(AVUTIL libavutil avutil libavutil/avutil.h) FIND_COMPONENT(SWSCALE libswscale swscale libswscale/swscale.h) + FIND_COMPONENT(SWRESAMPLE libswresample swresample libswresample/swresample.h) FIND_COMPONENT(POSTPROC libpostproc postproc libpostproc/postprocess.h) # Check if the required components were found and add their stuff to the FFMPEG_* vars. From beed955e3f23ac119f6e78a95a6445c7d48624c4 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 17 Apr 2021 01:57:27 +0100 Subject: [PATCH 06/31] Change ffmpeg installation on windows --- .appveyor.yml | 2 +- CMakeLists.txt | 4 ---- cmake/Win32.cmake | 6 +----- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 44fdc1a..a824f5b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -31,7 +31,7 @@ build_script: - mv C:\Projects\calyp C:\Projects\calyp-deployment\cmake-helper\ - mkdir C:\Projects\calyp-build - cd C:\Projects\calyp-build - - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DUSE_DYNLOAD=OFF -DOpenCV_DIR="C:/Tools/opencv/build" -DOpenCV_DLL_DIR="C:/Tools/opencv/build/x64/vc15/bin" -DOpenCV_INSTALL_MODULES="world" -DQT_DIR="C:\Qt\latest\msvc2017_64" -DQt5_DIR="C:\Qt\latest\msvc2017_64\lib\cmake\Qt5" -DUSE_QTDBUS=OFF -DAVFORMAT_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/avformat.lib -DAVFORMAT_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DAVCODEC_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/avcodec.lib -DAVCODEC_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DAVUTIL_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/avutil.lib -DAVUTIL_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DSWSCALE_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/swscale.lib -DSWSCALE_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DAVDEVICE_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/avdevice.lib -DAVDEVICE_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DPOSTPROC_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/postproc.lib -DPOSTPROC_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DFFMPEG_DIR=C:\Projects\ffmpeg_libraries -G "Visual Studio 15 2017 Win64" C:\Projects\calyp-deployment\cmake-helper + - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DUSE_DYNLOAD=OFF -DOpenCV_DIR="C:/Tools/opencv/build" -DOpenCV_DLL_DIR="C:/Tools/opencv/build/x64/vc15/bin" -DOpenCV_INSTALL_MODULES="world" -DQT_DIR="C:\Qt\latest\msvc2017_64" -DQt5_DIR="C:\Qt\latest\msvc2017_64\lib\cmake\Qt5" -DUSE_QTDBUS=OFF -DAVFORMAT_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/avformat.lib -DAVFORMAT_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DAVCODEC_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/avcodec.lib -DAVCODEC_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DAVUTIL_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/avutil.lib -DAVUTIL_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DSWSCALE_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/swscale.lib -DSWSCALE_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DAVDEVICE_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/avdevice.lib -DAVDEVICE_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DPOSTPROC_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/postproc.lib -DPOSTPROC_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -DFFMPEG_DIR=C:\Projects\ffmpeg_libraries -DSWRESAMPLE_LIBRARIES=C:/Projects/ffmpeg_libraries/lib/swresample.lib -DSWRESAMPLE_INCLUDE_DIRS=C:/Projects/ffmpeg_libraries/include -G "Visual Studio 15 2017 Win64" C:\Projects\calyp-deployment\cmake-helper - cmake --build . --target ALL_BUILD -- /p:Configuration=Release > log_build - cmake --build . --target INSTALL -- /p:Configuration=Release > log_install - cmake --build . --target PACKAGE -- /p:Configuration=Release > log_pkg diff --git a/CMakeLists.txt b/CMakeLists.txt index f7b9a9d..98627c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,10 +147,6 @@ SET_PACKAGE_PROPERTIES( OPTION(USE_FFMPEG "Add FFMPEG support" ON) IF(USE_FFMPEG) FIND_PACKAGE(FFmpeg COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE) - IF("${AVCODEC_VERSION}" VERSION_LESS "56.0.0") - SET(FFMPEG_FOUND FALSE) - SET(FFmpeg_FOUND FALSE) - ENDIF() SET(USE_FFMPEG ${FFMPEG_FOUND}) ENDIF() SET_PACKAGE_PROPERTIES( diff --git a/cmake/Win32.cmake b/cmake/Win32.cmake index 11e43e9..de0fc0c 100644 --- a/cmake/Win32.cmake +++ b/cmake/Win32.cmake @@ -77,9 +77,5 @@ IF(USE_FFMPEG) "FFmpeg-Dir" CACHE PATH "Where to find FFmpeg Lib on Windows" ) - INSTALL(FILES ${FFMPEG_DIR}/bin/avcodec-${AVCODEC_VERSION}.dll DESTINATION bin) - INSTALL(FILES ${FFMPEG_DIR}/bin/avformat-${AVFORMAT_VERSION}.dll DESTINATION bin) - INSTALL(FILES ${FFMPEG_DIR}/bin/avutil-${AVUTIL_VERSION}.dll DESTINATION bin) - INSTALL(FILES ${FFMPEG_DIR}/bin/swscale-${SWSCALE_VERSION}.dll DESTINATION bin) - INSTALL(FILES ${FFMPEG_DIR}/bin/swresample-${SWRESAMPLE_VERSION}.dll DESTINATION bin) + INSTALL(DIRECTORY ${FFMPEG_DIR}/bin/ DESTINATION bin) ENDIF() From c6b43ac7fa313e2dde66a488c5a96e2282f54f40 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 17 Apr 2021 02:09:27 +0100 Subject: [PATCH 07/31] Remove ffmpeg exe before building against it --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index a824f5b..2a6e579 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -25,6 +25,7 @@ install: - 7z x ffmpeg.7z -y -offmpeg - git clone https://github.com/pixlra/calyp-deployment.git - CALL calyp-deployment/scripts/extract_ffmpeg.bat + - rm C:\Projects\ffmpeg_libraries\bin\*.exe build_script: From 31092504718a0f46969fda7b57b012e32bf4a73c Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 17 Apr 2021 02:19:07 +0100 Subject: [PATCH 08/31] Update last commit --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 2a6e579..17f369f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -25,7 +25,7 @@ install: - 7z x ffmpeg.7z -y -offmpeg - git clone https://github.com/pixlra/calyp-deployment.git - CALL calyp-deployment/scripts/extract_ffmpeg.bat - - rm C:\Projects\ffmpeg_libraries\bin\*.exe + - ps: rm C:\Projects\ffmpeg_libraries\bin\*.exe build_script: From b830b700ca25f7f24aaca510726074bde1690baf Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 17 Apr 2021 12:59:55 +0100 Subject: [PATCH 09/31] Define style on windows --- app/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/main.cpp b/app/main.cpp index d32f49d..969a4d3 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -51,6 +51,10 @@ int main( int argc, char* argv[] ) QApplication::setApplicationVersion( QStringLiteral( CALYP_VERSION_STRING ) ); QApplication::setOrganizationName( QStringLiteral( "PixLRA" ) ); +#if _WIN32 + application->setStyle( "fusion" ); +#endif + #ifdef USE_QTDBUS /** * use dbus, if available From 12bd1a4c2c58c914d93cf9e3404b854db34209ea Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 17 Apr 2021 18:27:47 +0100 Subject: [PATCH 10/31] Add details to about dialog and change theme for windows --- app/dialog/AboutDialog.cpp | 13 ++++++++++--- app/main.cpp | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/dialog/AboutDialog.cpp b/app/dialog/AboutDialog.cpp index e7cf2c2..c6a6177 100644 --- a/app/dialog/AboutDialog.cpp +++ b/app/dialog/AboutDialog.cpp @@ -49,7 +49,7 @@ AboutDialog::AboutDialog( QWidget* parent ) .arg( QApplication::applicationVersion() ) ); label->setWordWrap( false ); - QString featuresList = QStringLiteral( "

Features: