🔀 Merge pull request #95 from CoolLibs/ffmpeg

Ffmpeg
CoolLibs · May 15, 2024 · e42b2bc · e42b2bc
2 parents 8c325c9 + b3238a2
commit e42b2bc
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 11 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -3,11 +3,12 @@ Checks: '
   *,
   -readability-convert-member-functions-to-static,
   -misc-non-private-member-variables-in-classes,
-  -*braces-around-statements
-  -readability-implicit-bool-conversion
+  -*braces-around-statements,
+  -readability-implicit-bool-conversion,
   -readability-identifier-length,
   -cppcoreguidelines-avoid-magic-numbers,
   -readability-magic-numbers,
+  -readability-redundant-member-init,
   -readability-redundant-access-specifiers,
   -readability-redundant-string-init,
   -misc-use-anonymous-namespace,
@@ -34,4 +35,4 @@ Checks: '
   -objc-*,
   -openmp-*,
   -zircon-*,
-  '
+'
diff --git a/.github/workflows/build_and_run_tests.yml b/.github/workflows/build_and_run_tests.yml
@@ -68,6 +68,11 @@ jobs:
           sudo apt-get install -y libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev mesa-common-dev build-essential libgtk-3-dev
           sudo apt-get install -y libssl-dev
           sudo apt-get install -y libpulse-dev libasound2-dev
+          sudo apt-get install -y libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev libpostproc-dev libswresample-dev libswscale-dev
+
+      - name: Install MacOS dependencies
+        if: runner.os == 'MacOS'
+        run: brew install ffmpeg
 
       - name: ccache
         uses: hendrikmuhs/ccache-action@main

diff --git a/.github/workflows/create_release_executables.yml b/.github/workflows/create_release_executables.yml
@@ -60,6 +60,12 @@ jobs:
           sudo apt-get install -y libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev mesa-common-dev build-essential libgtk-3-dev
           sudo apt-get install -y libssl-dev
           sudo apt-get install -y libpulse-dev libasound2-dev
+          sudo apt-get install -y libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev libpostproc-dev libswresample-dev libswscale-dev
+
+      - name: Install MacOS dependencies
+        if: runner.os == 'MacOS'
+        run: |
+          brew install ffmpeg
 
       - name: ccache
         uses: hendrikmuhs/ccache-action@main

diff --git a/Cool b/Cool
diff --git a/changelog.md b/changelog.md
@@ -21,6 +21,14 @@
 
 ## 🐣beta-17 WIP
 
+TODO gif exploding head
+
+- ✨ Greatly improved video import: we now support videos with transparency, and GIFs
+- ⚡ The performance of playing a video has been greatly improved
+- 🐛 Video import now also works on Linux and MacOS
+- 🐛 Many bug fixes around the video import and playback
+- ✨ Improved MIDI
+
 ## 🐣beta-16
 
 - ✨ You can now import video files! Using the "Video from File" node.

diff --git a/src/App.cpp b/src/App.cpp
@@ -127,12 +127,11 @@ void App::update()
 
     _project.audio.set_force_mute(_project.exporter.is_exporting());
     _project.audio.sync_with_clock(
-        _project.exporter.is_exporting()
-            ? _project.exporter.clock()
-            : _project.clock,
+        _project.current_clock(),
         _project.exporter.is_exporting() /* force_sync_time */
     );
-    Cool::hack_get_global_time_in_seconds() = _project.clock.time_in_seconds();
+    Cool::hack_get_global_time_in_seconds() = _project.current_clock().time_in_seconds();
+    Cool::hack_get_is_exporting()           = _project.exporter.is_exporting();
     _project.audio.update(/*on_audio_data_changed = */ [&]() {
         _project.modules_graph->on_audio_changed();
     });

diff --git a/src/Project.h b/src/Project.h
@@ -28,6 +28,7 @@ struct Project {
     std::string debug_info_coollab_version{}; // Only used to generate an error message when deserialization fails.
 
     [[nodiscard]] auto is_empty() const -> bool;
+    [[nodiscard]] auto current_clock() const -> Cool::Clock const& { return exporter.is_exporting() ? exporter.clock() : clock; }
 
 private:
     // Serialization

diff --git a/tooling b/tooling
diff --git a/website/src/components/_Download.md b/website/src/components/_Download.md
@@ -1,7 +1,7 @@
 :::info Download
 [**Download Coollab for Windows**](/Coollab-Windows.exe)<br/>
-[**Download Coollab for Linux**](/Coollab-Linux.sh)<br/>
-[**Download Coollab for MacOS**](/Coollab-Mac.dmg)
+[**Download Coollab for Linux**](/Coollab-Linux.sh) ⚠ You also need to install FFmpeg: `sudo apt-get install ffmpeg` <br/>
+[**Download Coollab for MacOS**](/Coollab-Mac.dmg) ⚠ You also need to install FFmpeg: [open a terminal](https://support.apple.com/guide/terminal/open-or-quit-terminal-apd5265185d-f365-44cb-8b09-71a064a42125/mac), install [Homebrew](https://brew.sh/) by typing `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"`, and then install FFmpeg by typing `brew install ffmpeg`. If you need help [feel free to reach out on any of our social media](https://linktr.ee/coollab_art).
 
 🌱 **This is the _beta-16_ release** 🌱<br/>
 Coollab is already usable and powerful, but many things are still to be improved.<br/>
+4 −3		.clang-tidy
+5 −0		.github/workflows/build_and_run_tests.yml
+3 −0		.gitmodules
+6 −0		CMakeLists.txt
+1 −1		lib/algorithms
+1 −0		lib/easy_ffmpeg
+2 −3		lib/opencv_build_options.cmake
+1 −1		lib/smart
+16 −0		src/Cool/AppManager/AppManager.cpp
+4 −0		src/Cool/AppManager/AppManager.h
+4 −0		src/Cool/DebugOptions/debug_options_windows.cpp
+1 −1		src/Cool/Gpu/TextureLibrary_FromFile.cpp
+119 −0		src/Cool/Gpu/TextureLibrary_VideoFile.cpp
+51 −0		src/Cool/Gpu/TextureLibrary_VideoFile.h
+6 −4		src/Cool/Gpu/TextureSource_VideoFile.cpp
+6 −8		src/Cool/Gpu/TextureSource_VideoFile.h
+6 −6		src/Cool/ImGui/ImGuiExtras.cpp
+8 −1		src/Cool/ImGui/ImGuiExtras.h
+1 −0		src/Cool/Log/MessageConsole.h
+31 −1		src/Cool/TextureSource/set_texture_from_image.cpp
+16 −0		src/Cool/TextureSource/set_texture_from_image.h
+0 −9		src/Cool/TextureSource/set_texture_from_opencv_image.h
+42 −0		src/Cool/Video/VideoDescriptor.cpp
+55 −0		src/Cool/Video/VideoDescriptor.h
+44 −91		src/Cool/Video/VideoPlayer.cpp
+22 −55		src/Cool/Video/VideoPlayer.h
+6 −1		src/Cool/Video/hack_get_global_time_in_seconds.h
+1 −1		src/Cool/Webcam/internal/WebcamCapture.cpp
+1 −1		tooling