ffAudio · himwho · Mar 12, 2021 · Mar 12, 2021 · Mar 12, 2021 · Mar 24, 2021
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,11 @@
 **/.DS*
 **/Builds/
+**/Cache/
 **/JuceLibraryCode/
 **/!JuceLibraryCode/AppConfig.h
+
+# ingore ffmpeg lib folder contents
 libs/
+ffmpeg/
+# except for the .gitkeep(s)
+!.gitkeep
diff --git a/Basics/foleys_AudioFifo.cpp b/Basics/foleys_AudioFifo.cpp
@@ -45,7 +45,7 @@ void AudioFifo::pushSamples (const juce::AudioBuffer<float>& samples)
 void AudioFifo::setNumSamples (int samples)
 {
     audioFifo.setTotalSize (samples);
-    audioBuffer.setSize (2, samples);
+    audioBuffer.setSize (audioBuffer.getNumChannels(), samples);
 }
 
 void AudioFifo::pullSamples (const juce::AudioSourceChannelInfo& info)

diff --git a/Basics/foleys_VideoEngine.h b/Basics/foleys_VideoEngine.h
@@ -133,7 +133,7 @@ class VideoEngine  : private juce::Timer
 
     juce::OptionalScopedPointer<juce::UndoManager> undoManager { new juce::UndoManager(), true };
 
-    juce::ThreadPool jobThreads { std::max (4, juce::SystemStats::getNumCpus()) };
+    juce::ThreadPool jobThreads{ (std::max)(4, juce::SystemStats::getNumCpus()) };
     std::vector<std::unique_ptr<juce::TimeSliceThread>> readingThreads;
 
     std::vector<std::shared_ptr<AVClip>> releasePool;

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,77 @@
+cmake_minimum_required (VERSION 3.15 FATAL_ERROR)
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    project (FoleysVideoEngine 
+            VERSION 0.2.0 
+            LANGUAGES CXX OBJC C
+            DESCRIPTION "A video engine module for JUCE"
+            HOMEPAGE_URL "https://foleysfinest.com/foleys_video_engine/")
+else()
+    project (FoleysVideoEngine 
+            VERSION 0.2.0 
+            LANGUAGES CXX C
+            DESCRIPTION "A video engine module for JUCE"
+            HOMEPAGE_URL "https://foleysfinest.com/foleys_video_engine/")
+endif()
+
+list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+
+if(NOT ffmpeg_FOUND)
+    find_package (ffmpeg REQUIRED)
+endif()
+
+if(PROJECT_IS_TOP_LEVEL)
+    message(STATUS "No parent project found, requiring JUCE")
+    find_package (JUCE 6 REQUIRED)
+endif()
+
+juce_add_module ("${CMAKE_CURRENT_LIST_DIR}" ALIAS_NAMESPACE Foleys)
+
+target_compile_definitions (foleys_video_engine INTERFACE 
+                JUCE_MODAL_LOOPS_PERMITTED=1 
+                JUCE_STRICT_REFCOUNTEDPOINTER=1 
+                JUCE_PLUGINHOST_AU=1 
+                JUCE_PLUGINHOST_VST3=1 
+                JUCE_PLUGINHOST_LADSPA=1)
+
+target_link_libraries (foleys_video_engine INTERFACE FFmpeg::FFmpeg)
+
+#
+
+set (FVE_INSTALL_DEST "${CMAKE_INSTALL_LIBDIR}/cmake/foleys_video_engine"
+        CACHE STRING
+        "Directory below INSTALL_PREFIX where the foleys_video_engine CMake package files will be installed to")
+
+install (DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
+         DESTINATION "${FVE_INSTALL_DEST}/.."
+         COMPONENT foleys_video_engine
+         PATTERN *.md EXCLUDE
+         PATTERN .git/* EXCLUDE
+         PATTERN .github/* EXCLUDE
+         PATTERN *.json EXCLUDE
+         PATTERN CMakeLists.txt EXCLUDE 
+         PATTERN "${CMAKE_CURRENT_BINARY_DIR}/" EXCLUDE)
+
+include (CPackComponent)
+
+cpack_add_component (foleys_video_engine
+            GROUP Foleys 
+            INSTALL_TYPES Developer)
+
+include (CMakePackageConfigHelpers)
+
+write_basic_package_version_file (foleys_video_engine-config-version.cmake 
+                                  VERSION "${PROJECT_VERSION}"
+                                  COMPATIBILITY SameMajorVersion
+                                  ARCH_INDEPENDENT)
+
+configure_package_config_file (cmake/config.cmake foleys_video_engine-config.cmake
+                               INSTALL_DESTINATION "${FVE_INSTALL_DEST}" 
+                               NO_SET_AND_CHECK_MACRO)
+
+install (FILES "${CMAKE_CURRENT_BINARY_DIR}/foleys_video_engine-config-version.cmake"
+               "${CMAKE_CURRENT_BINARY_DIR}/foleys_video_engine-config.cmake" 
+        DESTINATION "${FVE_INSTALL_DEST}"
+        COMPONENT foleys_video_engine)
+
+export (PACKAGE foleys_video_engine)
diff --git a/Clips/foleys_AVClip.h b/Clips/foleys_AVClip.h
@@ -97,6 +97,8 @@ class AVClip  : public juce::PositionableAudioSource,
     /** Returns true, if this clip will produce audio */
     virtual bool hasAudio() const = 0;
 
+    virtual int getNumChannels() const = 0;
+
     /**
      This is the samplerate supplied from prepareToPlay and the sample rate
      this clip will produce audio and use as clock source. */

diff --git a/Clips/foleys_AudioClip.h b/Clips/foleys_AudioClip.h
@@ -86,6 +86,8 @@ class AudioClip : public AVClip
 
     std::shared_ptr<AVClip> createCopy (StreamTypes types) override;
 
+    int getNumChannels() const override { return reader.get() ? reader->numChannels : 0; }
+
     double getSampleRate() const override { return sampleRate; }
 
 private:

diff --git a/Clips/foleys_ComposedClip.cpp b/Clips/foleys_ComposedClip.cpp
@@ -356,6 +356,11 @@ std::shared_ptr<AVClip> ComposedClip::createCopy (StreamTypes)
     return clipCopy;
 }
 
+int ComposedClip::getNumChannels() const
+{
+    return audioSettings.numChannels;
+}
+
 double ComposedClip::getSampleRate() const
 {
     return audioSettings.timebase;

diff --git a/Clips/foleys_ComposedClip.h b/Clips/foleys_ComposedClip.h
@@ -94,6 +94,8 @@ class ComposedClip  : public AVClip,
 
     std::shared_ptr<AVClip> createCopy (StreamTypes types) override;
 
+    int getNumChannels() const override;
+
     double getSampleRate() const override;
 
     /** When rendering non realtime (bounce), use this to wait for background

diff --git a/Clips/foleys_ImageClip.cpp b/Clips/foleys_ImageClip.cpp
@@ -143,6 +143,12 @@ std::shared_ptr<AVClip> ImageClip::createCopy (StreamTypes types)
     return engine->createClipFromFile (getMediaFile(), types);
 }
 
+
+int ImageClip::getNumChannels() const
+{ 
+    return 0;
+}
+
 double ImageClip::getSampleRate() const
 {
     return sampleRate;

diff --git a/Clips/foleys_ImageClip.h b/Clips/foleys_ImageClip.h
@@ -78,6 +78,8 @@ class ImageClip : public AVClip
 
     std::shared_ptr<AVClip> createCopy (StreamTypes types) override;
 
+    int getNumChannels() const override;
+
     double getSampleRate() const override;
 
 private:

diff --git a/Clips/foleys_MovieClip.cpp b/Clips/foleys_MovieClip.cpp
@@ -245,6 +245,11 @@ double MovieClip::getSampleRate() const
     return sampleRate;
 }
 
+int MovieClip::getNumChannels() const 
+{
+    return movieReader ? movieReader->numChannels : 0;
+}
+
 void MovieClip::handleAsyncUpdate()
 {
     if (sampleRate > 0 && hasVideo())

diff --git a/Clips/foleys_MovieClip.h b/Clips/foleys_MovieClip.h
@@ -89,6 +89,8 @@ class MovieClip   : public AVClip,
 
     std::shared_ptr<AVClip> createCopy (StreamTypes types) override;
 
+    int getNumChannels() const override;
+
     double getSampleRate() const override;
 
     /** When rendering non realtime (bounce), use this to wait for background

diff --git a/Processing/foleys_ProcessorController.cpp b/Processing/foleys_ProcessorController.cpp
@@ -52,13 +52,24 @@ struct AudioProcessorAdapter : public ProcessorController::ProcessorAdapter
     public:
         PlayHead() = default;
 
-        bool getCurrentPosition (juce::AudioPlayHead::CurrentPositionInfo &result) override
+#if JUCE_VERSION > 0x70000
+		juce::Optional<PositionInfo> getPosition() const override
+		{
+			PositionInfo result; 
+			result.setTimeInSamples(timeInSamples);
+			result.setTimeInSeconds(timeInSeconds);
+			result.setFrameRate(frameRate);
+			return juce::Optional<PositionInfo>(result);
+		}
+#else
+		bool getCurrentPosition (juce::AudioPlayHead::CurrentPositionInfo &result) override
         {
             result.timeInSamples = timeInSamples;
             result.timeInSeconds = timeInSeconds;
             result.frameRate = frameRate;
             return true;
         }
+#endif
 
         bool canControlTransport() override
         {

diff --git a/README.md b/README.md
@@ -8,6 +8,35 @@ Foleys Finest Audio Ltd.
 With the module foleys_video_engine we offer a simple way to implement reading,
 writing, displaying and editing of videos using the audio framework JUCE (https://juce.com)
 
+Setup
+--------
+
+To use the video engine, add this module via Projucer or CMake to your JUCE project.
+
+In CMake, this module can be added like this:
+```cmake
+add_subdirectory (foleys_video_engine)
+```
+or like this:
+```cmake
+find_package (foleys_video_engine)
+```
+This repo's CMake scripts add JUCE by calling `find_package()`. Foleys video engine requires JUCE version 6, and may
+be incompatible with JUCE version 7.
+
+You can override the path to JUCE on the command line like so:
+```shell
+cmake -B Builds -D FETCHCONTENT_SOURCE_DIR_JUCE=<your_juce_path>
+```
+
+If you are using CMake and the CPM.cmake package manager to add this repository, be aware that:
+- JUCE's module system expects the root folder of a module to have the same name as the module
+- By default, CPM.cmake will download the source code into a nested folder named with the version, for example `foleys_video_engine/<version>/<sourcesHere>`
+This can cause the JUCE module system to get confused. If you are using CPM.cmake, we recommend you set the `CPM_USE_NAMED_CACHE_DIRECTORIES` CMake or environment variable to `ON` to prevent this issue.
+
+foleys_video_engine requires [ffmpeg](https://www.ffmpeg.org/), which is built in CMake using [this repository](https://github.com/ffAudio/FFmpegBuild). The CMake configuration should "just work" out of the box, you don't need
+to download or install anything.
+
 Features
 --------
 

diff --git a/ReadWrite/FFmpeg/foleys_FFmpegHelpers.h b/ReadWrite/FFmpeg/foleys_FFmpegHelpers.h
@@ -29,19 +29,12 @@
 #pragma clang diagnostic ignored "-Wfloat-conversion"
 #endif
 
-#if JUCE_MSVC
-#pragma comment (lib, "avformat.lib")
-#pragma comment (lib, "avutil.lib")
-#pragma comment (lib, "avcodec.lib")
-#pragma comment (lib, "swscale.lib")
-#pragma comment (lib, "swresample.lib")
-#pragma comment (lib, "avresample.lib")
-#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include <libavcodec/avcodec.h>
 #include <libavutil/pixdesc.h>
 #include <libavutil/imgutils.h>
 #include <libavutil/opt.h>

diff --git a/ReadWrite/FFmpeg/foleys_FFmpegReader.cpp b/ReadWrite/FFmpeg/foleys_FFmpegReader.cpp
@@ -21,7 +21,7 @@
 #if FOLEYS_USE_FFMPEG
 
 #include "foleys_FFmpegHelpers.h"
-
+#include <libavcodec/avcodec.h>
 
 namespace foleys
 {
@@ -353,7 +353,7 @@ class FFmpegReader::Pimpl
                           enum AVMediaType type,
                           bool refCounted)
     {
-        AVCodec *decoder = nullptr;
+        const AVCodec *decoder = nullptr;
         AVDictionary *opts = nullptr;
 
         int id = av_find_best_stream (formatContext, type, -1, -1, nullptr, 0);