Merge branch 'master' of https://github.com/olive-editor/olive into ci-update-2022-12-11

Author: Simran-B

.github/workflows/ci.yml

@@ -56,6 +56,8 @@ jobs:
     steps:
       - name: Checkout Source Code
         uses: actions/checkout@v3
+        with:
+          submodules: 'true'
 
       - name: Generate Patreon List
         env:
@@ -156,6 +158,8 @@ jobs:
     steps:
       - name: Checkout Source Code
         uses: actions/checkout@v3
+        with:
+          submodules: 'true'
 
       - name: Automatically Generate Package Name
         shell: bash
@@ -176,10 +180,10 @@ jobs:
         shell: bash
         working-directory: ${{ runner.workspace }}
         run: |
-          $DOWNLOAD_TOOL https://github.com/olive-editor/vcpkg-registry/releases/download/continuous/olive-dep-x64-windows.zip
-          7z x olive-dep-x64-windows.zip
-          VCPKG_DIR=(vcpkg-export-*)
-          echo "VCPKG_ROOT=$(pwd -W)/$VCPKG_DIR" >> $GITHUB_ENV
+          $DOWNLOAD_TOOL https://github.com/olive-editor/dependencies/releases/download/continuous/olive-dep-win32-Release.tar.gz
+          tar xzf olive-dep-win32-Release.tar.gz
+          echo "$(pwd -W)/install" >> $GITHUB_PATH
+          echo "$(pwd -W)/install/bin" >> $GITHUB_PATH
 
       - name: Acquire Google Crashpad
         shell: bash
@@ -207,7 +211,6 @@ jobs:
         working-directory: ${{ runner.workspace }}/build
         run: |
           cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" \
-            -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \
             $CMAKE_ARGS
 
       - name: Build
@@ -216,11 +219,11 @@ jobs:
         run: |
           cmake --build .
 
-      - name: Test
-        working-directory: ${{ runner.workspace }}/build
-        shell: bash
-        run: |
-          PATH=$PATH:$VCPKG_ROOT/installed/x64-windows/bin ctest -C ${{ matrix.build-type }} -V
+      #- name: Test
+      #  working-directory: ${{ runner.workspace }}/build
+      #  shell: bash
+      #  run: |
+      #    ctest -C ${{ matrix.build-type }} -V
 
       - name: Create Package
         working-directory: ${{ runner.workspace }}/build
@@ -232,9 +235,8 @@ jobs:
           cp app/olive-editor.exe olive-editor
           cp app/crashhandler/olive-crashhandler.exe olive-editor
           cp app/olive-editor.pdb olive-editor
-          $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-crashhandler.exe
-          $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-editor.exe
-          cp $(cygpath $VCPKG_ROOT)/installed/x64-windows/bin/*.dll olive-editor
+          windeployqt --no-angle olive-editor/olive-crashhandler.exe
+          windeployqt --no-angle olive-editor/olive-editor.exe
           cp $(cygpath $ORIGINAL_WORKSPACE)/install/bin/*.dll olive-editor
           cp $(cygpath $ORIGINAL_WORKSPACE)/install/crashpad/out/Default/crashpad_handler.exe olive-editor
           cp $(cygpath $ORIGINAL_WORKSPACE)/install/bin/minidump_stackwalk.exe olive-editor
@@ -287,7 +289,7 @@ jobs:
             compiler-name: Clang LLVM
             os-name: macOS
             os-arch: x86_64
-            os: macos-10.15
+            os: macos-11.0
             cmake-gen: Ninja
             min-deploy: 10.13
           - build-type: RelWithDebInfo
@@ -310,6 +312,8 @@ jobs:
     steps:
       - name: Checkout Source Code
         uses: actions/checkout@v3
+        with:
+          submodules: 'true'
 
       - name: Automatically Generate Package Name
         shell: bash

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "ext/core"]
+	path = ext/core
+	url = https://github.com/olive-editor/core
+[submodule "ext/KDDockWidgets"]
+	path = ext/KDDockWidgets
+	url = https://github.com/KDAB/KDDockWidgets

CMakeLists.txt

@@ -1,5 +1,5 @@
 # Olive - Non-Linear Video Editor
-# Copyright (C) 2022 Olive Team
+# Copyright (C) 2023 Olive Studios LLC
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@ cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 
 project(olive-editor VERSION 0.2.0 LANGUAGES CXX)
 
+option(BUILD_QT6 "Build with Qt 6 over 5 (experimental)" OFF)
 option(BUILD_DOXYGEN "Build Doxygen documentation" OFF)
 option(BUILD_TESTS "Build unit tests" OFF)
 option(USE_WERROR "Error on compile warning" OFF)
@@ -94,6 +95,10 @@ find_package(OpenEXR REQUIRED)
 list(APPEND OLIVE_LIBRARIES ${OPENEXR_LIBRARIES})
 list(APPEND OLIVE_INCLUDE_DIRS ${OPENEXR_INCLUDES})
 
+# Link Olive
+list(APPEND OLIVE_LIBRARIES olivecore)
+list(APPEND OLIVE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/ext/core/include)
+
 # Link Qt
 set(QT_LIBRARIES
   Core
@@ -106,10 +111,14 @@ set(QT_LIBRARIES
 if (UNIX AND NOT APPLE)
   list(APPEND QT_LIBRARIES DBus)
 endif()
+if (BUILD_QT6)
+  set(QT_NAME Qt6)
+else()
+  set(QT_NAME Qt5)
+endif()
 find_package(QT
   NAMES
-    Qt6
-    Qt5
+    ${QT_NAME}
   REQUIRED
   COMPONENTS
     ${QT_LIBRARIES}
@@ -142,8 +151,18 @@ if (${QT_VERSION_MAJOR} EQUAL "6")
   list(APPEND OLIVE_LIBRARIES
     Qt${QT_VERSION_MAJOR}::OpenGLWidgets
   )
+
+  # Link KDDockWidgets
+  #find_package(KDDockWidgets-qt6 CONFIG REQUIRED)
+else()
+  # Link KDDockWidgets
+  #find_package(KDDockWidgets CONFIG REQUIRED)
 endif()
 
+list(APPEND OLIVE_LIBRARIES
+  KDAB::kddockwidgets
+)
+
 # Link FFmpeg
 find_package(FFMPEG 3.0 REQUIRED
   COMPONENTS
@@ -233,9 +252,10 @@ endif()
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 list(APPEND OLIVE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/ext)
 
+add_subdirectory(ext)
 add_subdirectory(app)
 
 if (BUILD_TESTS)
-enable_testing()
-add_subdirectory(tests)
+  enable_testing()
+  add_subdirectory(tests)
 endif()

app/audio/audiomanager.cpp

@@ -73,7 +73,7 @@ int InputCallback(const void *input, void *output, unsigned long frameCount, con
   FFmpegEncoder *f = static_cast<FFmpegEncoder*>(userData);
 
   AudioParams our_params = f->params().audio_params();
-  our_params.set_format(AudioParams::GetPackedEquivalent(f->params().audio_params().format()));
+  our_params.set_format(f->params().audio_params().format().to_packed_equivalent());
 
   f->WriteAudioData(our_params, reinterpret_cast<const uint8_t**>(&input), frameCount);
 
@@ -119,27 +119,27 @@ void AudioManager::ClearBufferedOutput()
   output_buffer_->clear();
 }
 
-PaSampleFormat AudioManager::GetPortAudioSampleFormat(AudioParams::Format fmt)
+PaSampleFormat AudioManager::GetPortAudioSampleFormat(SampleFormat fmt)
 {
   switch (fmt) {
-  case AudioParams::kFormatUnsigned8Packed:
-  case AudioParams::kFormatUnsigned8Planar:
+  case SampleFormat::U8:
+  case SampleFormat::U8P:
     return paUInt8;
-  case AudioParams::kFormatSigned16Packed:
-  case AudioParams::kFormatSigned16Planar:
+  case SampleFormat::S16:
+  case SampleFormat::S16P:
     return paInt16;
-  case AudioParams::kFormatSigned32Packed:
-  case AudioParams::kFormatSigned32Planar:
+  case SampleFormat::S32:
+  case SampleFormat::S32P:
     return paInt32;
-  case AudioParams::kFormatFloat32Packed:
-  case AudioParams::kFormatFloat32Planar:
+  case SampleFormat::F32:
+  case SampleFormat::F32P:
     return paFloat32;
-  case AudioParams::kFormatSigned64Packed:
-  case AudioParams::kFormatSigned64Planar:
-  case AudioParams::kFormatFloat64Packed:
-  case AudioParams::kFormatFloat64Planar:
-  case AudioParams::kFormatInvalid:
-  case AudioParams::kFormatCount:
+  case SampleFormat::S64:
+  case SampleFormat::S64P:
+  case SampleFormat::F64:
+  case SampleFormat::F64P:
+  case SampleFormat::INVALID:
+  case SampleFormat::COUNT:
     break;
   }
 

app/audio/audiomanager.h

@@ -30,7 +30,6 @@
 #include "audio/audioprocessor.h"
 #include "common/define.h"
 #include "codec/ffmpeg/ffmpegencoder.h"
-#include "render/audioparams.h"
 #include "render/audioplaybackcache.h"
 #include "render/previewaudiodevice.h"
 
@@ -94,7 +93,7 @@ class AudioManager : public QObject
 
   virtual ~AudioManager() override;
 
-  static PaSampleFormat GetPortAudioSampleFormat(AudioParams::Format fmt);
+  static PaSampleFormat GetPortAudioSampleFormat(SampleFormat fmt);
 
   void CloseOutputStream();
 

app/audio/audioprocessor.cpp

@@ -25,6 +25,8 @@ extern "C" {
 #include <libavfilter/buffersink.h>
 }
 
+#include <QDebug>
+
 #include "common/ffmpegutils.h"
 
 namespace olive {
@@ -88,13 +90,13 @@ bool AudioProcessor::Open(const AudioParams &from, const AudioParams &to, double
     double speed_log = log(tempo) / log(base);
 
     // This is the number of how many 0.5 or 2.0 tempos we need to daisychain
-    int whole = qFloor(speed_log);
+    int whole = std::floor(speed_log);
 
     // Set speed_log to the remainder
     speed_log -= whole;
 
     for (int i=0;i<=whole;i++) {
-      double filter_tempo = (i == whole) ? qPow(base, speed_log) : base;
+      double filter_tempo = (i == whole) ? std::pow(base, speed_log) : base;
 
       if (qFuzzyCompare(filter_tempo, 1.0)) {
         // This filter would do nothing
@@ -115,7 +117,7 @@ bool AudioProcessor::Open(const AudioParams &from, const AudioParams &to, double
 
   // Create conversion filter
   if (from.sample_rate() != to.sample_rate() || from.channel_layout() != to.channel_layout() || from.format() != to.format()
-      || (to.FormatIsPlanar() && create_tempo)) { // Tempo processor automatically converts to packed,
+      || (to.format().is_planar() && create_tempo)) { // Tempo processor automatically converts to packed,
                                                   // so if the desired output is planar, it'll need
                                                   // to be converted
     snprintf(filter_args, 200, "sample_fmts=%s:sample_rates=%d:channel_layouts=0x%" PRIx64,
@@ -236,7 +238,7 @@ int AudioProcessor::Convert(float **in, int nb_in_samples, AudioProcessor::Buffe
   if (output) {
     int nb_channels = to_.channel_count();
 
-    if (to_.FormatIsPacked()) {
+    if (to_.format().is_packed()) {
       nb_channels = 1;
     }
 
@@ -259,7 +261,7 @@ int AudioProcessor::Convert(float **in, int nb_in_samples, AudioProcessor::Buffe
       }
 
       int nb_bytes = out_frame_->nb_samples * to_.bytes_per_sample_per_channel();
-      if (to_.FormatIsPacked()) {
+      if (to_.format().is_packed()) {
         nb_bytes *= to_.channel_count();
       }
 

app/audio/audioprocessor.h

@@ -22,15 +22,19 @@
 #define AUDIOPROCESSOR_H
 
 #include <inttypes.h>
+#include <olive/core/core.h>
+#include <QByteArray>
 
 extern "C" {
 #include <libavfilter/avfilter.h>
 }
 
-#include "render/audioparams.h"
+#include "common/define.h"
 
 namespace olive {
 
+using namespace core;
+
 class AudioProcessor
 {
 public:

app/audio/audiovisualwaveform.cpp

@@ -24,7 +24,6 @@
 #include <QtGlobal>
 
 #include "config/config.h"
-#include "common/cpuoptimize.h"
 
 namespace olive {
 
@@ -459,8 +458,8 @@ void AudioVisualWaveform::DrawWaveform(QPainter *painter, const QRect& rect, con
       break;
     }
 
-    next_sample_index = qMin(arr.size(),
-                             start_sample_index + qFloor(rate_dbl * static_cast<double>(i - rect.x() + 1) / scale) * samples.channel_count());
+    next_sample_index = std::min(arr.size(),
+                                 size_t(start_sample_index + std::floor(rate_dbl * static_cast<double>(i - rect.x() + 1) / scale) * samples.channel_count()));
 
     if (summary_index != sample_index) {
       summary = AudioVisualWaveform::ReSumSamples(&arr.at(sample_index),
@@ -480,7 +479,7 @@ size_t AudioVisualWaveform::time_to_samples(const rational &time, double sample_
 
 size_t AudioVisualWaveform::time_to_samples(const double &time, double sample_rate) const
 {
-  return qFloor(time * sample_rate) * channels_;
+  return std::floor(time * sample_rate) * channels_;
 }
 
 std::map<rational, AudioVisualWaveform::Sample>::const_iterator AudioVisualWaveform::GetMipmapForScale(double scale) const

app/audio/audiovisualwaveform.h

@@ -21,13 +21,14 @@
 #ifndef SUMSAMPLES_H
 #define SUMSAMPLES_H
 
+#include <olive/core/core.h>
 #include <QPainter>
 #include <QVector>
 
-#include "codec/samplebuffer.h"
-
 namespace olive {
 
+using namespace core;
+
 /**
  * @brief A buffer of data used to store a visual representation of audio
  *

app/codec/CMakeLists.txt

@@ -33,7 +33,5 @@ set(OLIVE_SOURCES
   codec/frame.h
   codec/planarfiledevice.cpp
   codec/planarfiledevice.h
-  codec/samplebuffer.cpp
-  codec/samplebuffer.h
   PARENT_SCOPE
 )