From 9ea9d845c7faa2a612acd87bf8caf096d8c440a4 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 25 Sep 2021 17:02:03 +0100 Subject: [PATCH] Update version CI config and README --- .github/workflows/build.yaml | 13 ++++--------- .travis.yml | 2 +- README.md | 8 ++++---- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 72ab300..4505423 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,9 +1,9 @@ -name: Build and Test +name: Build on: push: branches: - - devel + - master jobs: @@ -17,15 +17,10 @@ jobs: uses: ashutoshvarma/action-cmake-build@v1 with: build-dir: ${{ runner.workspace }}/build - # will set the CC & CXX for cmake - cc: gcc - cxx: g++ build-type: Release # Extra options pass to cmake while configuring project - configure-options: -DBUILD_TESTS=ON -DUSE_WERROR=ON - run-test: true - #ctest-options: -R mytest + configure-options: -DUSE_WERROR=OFF # install the build using cmake --install install-build: true # run build using '-j [parallel]' to use multiple threads to build - parallel: 14 \ No newline at end of file + parallel: 8 \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 0f29597..6237571 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: cpp -dist: xenial +dist: bionic 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 diff --git a/README.md b/README.md index 3615c4f..f06cd8d 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Master branch | Development branch - Constant growing libs for stream and frame processing (CalypStream and CalypFrame) - Advanced API for frame/video processing algorithms - Frame level quality measurement API based on the CalypFrame class -- Powefull command-line tool for quality and frame processing algorithms (uses the referred APIs) +- Powerful command-line tool for quality and frame processing algorithms (uses the referred APIs) ## Modules - CalypLib: Low level library @@ -30,7 +30,7 @@ Master branch | Development branch ## Supported Quality Metrics - Peak Signal-to-Noise Ratio (PSNR) -- Structural SIMilarity (SSIM) +- Structural SIMilarity (SSIM) - Mean Square Error (MSE) - Weighted Spherical PSNR (WS-PSNR) @@ -73,13 +73,13 @@ Master branch | Development branch * **Dependencies** 1. an ordinary C++ development environment (g++, make, C++ libraries and headers, ...) 2. cmake - 3. a Qt development environment: QtCore, QtGui, QtWidgets, QtPrintSupport and QtConcurrent (version 4 or higher) + 3. a Qt development environment: QtCore, QtGui, QtWidgets, QtPrintSupport and QtConcurrent (version 5 or higher) 4. Optional: QtDBus, OpenCV, FFmpeg * **List of required commands** ``` mkdir build cd build -cmake -DUSE_QT4=OFF -DUSE_FFMPEG=ON -DUSE_OPENCV=ON .. (for FFmpeg and OpenCV support) +cmake -DUSE_FFMPEG=ON -DUSE_OPENCV=ON .. (for FFmpeg and OpenCV support) make make install ```