Sync to DNEG internal

Author: tedwaine

CMakePresets.json

@@ -7,7 +7,7 @@
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake",
-        "Qt6_DIR": "C://Qt6/6.5.3/msvc2019_64/lib/cmake/Qt6",
+        "Qt6_DIR": "/Users/tedwaine/Qt6/6.5.3/macos/lib/cmake/Qt6",
         "CMAKE_INSTALL_PREFIX": "xstudio_install",
         "X_VCPKG_APPLOCAL_DEPS_INSTALL": "ON",
         "BUILD_DOCS": "OFF",

include/xstudio/atoms.hpp

@@ -400,6 +400,7 @@ CAF_BEGIN_TYPE_ID_BLOCK(xstudio_complex_types, FIRST_CUSTOM_ID + 200)
     CAF_ADD_TYPE_ID(xstudio_complex_types, (std::pair<xstudio::utility::UuidActor, std::pair<std::string, xstudio::utility::UuidActor>>))
 
     CAF_ADD_TYPE_ID(xstudio_complex_types, (std::pair<xstudio::playhead::AutoAlignMode, xstudio::playhead::AssemblyMode>))
+    CAF_ADD_TYPE_ID(xstudio_complex_types, (std::vector<Imath::M44f>))
     CAF_ADD_TYPE_ID(xstudio_complex_types, (std::pair<float, std::vector<Imath::M44f>>))
 
     CAF_ADD_TYPE_ID(xstudio_complex_types, (std::vector<std::optional<std::pair<xstudio::timeline::Item, xstudio::utility::FrameRate>>>))

include/xstudio/audio/audio_output.hpp

@@ -31,24 +31,23 @@ struct ScrubHelper {
 
     ScrubHelper() = default;
 
-    void set_custom_duration_ms(const int ms) { 
-        scrub_window_millisecs_ = ms; 
-    }
-    void set_behaviour(const std::string &behaviour) { 
+    void set_custom_duration_ms(const int ms) { scrub_window_millisecs_ = ms; }
+    void set_behaviour(const std::string &behaviour) {
         const auto p = scrubBehaviourMap.find(behaviour);
-        if (p != scrubBehaviourMap.end()) scrub_behaviour_= p->second;
-        else scrub_behaviour_ = ScrubBehaviour::OneFrame;
+        if (p != scrubBehaviourMap.end())
+            scrub_behaviour_ = p->second;
+        else
+            scrub_behaviour_ = ScrubBehaviour::OneFrame;
     }
 
-    timebase::flicks scrub_duration(const utility::FrameRate & media_rate) const;
-    double scrub_duration_secs(const utility::FrameRate & media_rate) const {
+    timebase::flicks scrub_duration(const utility::FrameRate &media_rate) const;
+    double scrub_duration_secs(const utility::FrameRate &media_rate) const {
         return timebase::to_seconds(scrub_duration(media_rate));
     }
 
-    private:
-    int scrub_window_millisecs_        = {50};
-    ScrubBehaviour scrub_behaviour_    = {OneFrame};
-
+  private:
+    int scrub_window_millisecs_     = {50};
+    ScrubBehaviour scrub_behaviour_ = {OneFrame};
 };
 
 /**
@@ -60,8 +59,6 @@ struct ScrubHelper {
 class AudioOutputControl {
 
   public:
-
-
     /**
      *  @brief Constructor
      *
@@ -145,12 +142,12 @@ class AudioOutputControl {
         const bool muted,
         const bool audio_repitch,
         const bool audio_scrubbing,
-        const std::string & scrub_behaviour,
+        const std::string &scrub_behaviour,
         const int scrub_window_millisecs) {
-        volume_                 = volume;
-        muted_                  = muted;
-        audio_repitch_          = audio_repitch;
-        audio_scrubbing_        = audio_scrubbing;
+        volume_          = volume;
+        muted_           = muted;
+        audio_repitch_   = audio_repitch;
+        audio_scrubbing_ = audio_scrubbing;
         scrub_helper_.set_behaviour(scrub_behaviour);
         scrub_helper_.set_custom_duration_ms(scrub_window_millisecs);
     }
@@ -185,8 +182,10 @@ class AudioOutputControl {
     int fade_in_out_ = {NoFade};
 
     timebase::flicks playhead_position_;
-    timebase::flicks playhead_loop_in_ = {timebase::flicks(std::numeric_limits<timebase::flicks::rep>::lowest())};
-    timebase::flicks playhead_loop_out_ = {timebase::flicks(std::numeric_limits<timebase::flicks::rep>::max())};
+    timebase::flicks playhead_loop_in_ = {
+        timebase::flicks(std::numeric_limits<timebase::flicks::rep>::lowest())};
+    timebase::flicks playhead_loop_out_ = {
+        timebase::flicks(std::numeric_limits<timebase::flicks::rep>::max())};
     bool playing_forward_ = {true};
     utility::time_point playhead_position_update_tp_;
     timebase::flicks last_buffer_pts_;

include/xstudio/audio/enums.hpp

@@ -3,17 +3,17 @@
 
 namespace xstudio {
 namespace audio {
-// maps to options in preference /core/audio/audio_scrub_duration
-enum ScrubBehaviour { 
-    OneFrame, 
-    OnePt25Frames,
-    OnePt5Frames,
-    TwoFrames,
-    ThreeFrames,
-    OneFrameAt24Fps,
-    OneFrameAt30Fps,
-    OneFrameAt60Fps,
-    Custom
- };
+    // maps to options in preference /core/audio/audio_scrub_duration
+    enum ScrubBehaviour {
+        OneFrame,
+        OnePt25Frames,
+        OnePt5Frames,
+        TwoFrames,
+        ThreeFrames,
+        OneFrameAt24Fps,
+        OneFrameAt30Fps,
+        OneFrameAt60Fps,
+        Custom
+    };
 } // namespace audio
 } // namespace xstudio

include/xstudio/bookmark/bookmark.hpp

@@ -31,7 +31,7 @@ namespace bookmark {
         }
         utility::Uuid bookmark_uuid_;
 
-        virtual const void * user_data() const { return nullptr; }
+        virtual const void *user_data() const { return nullptr; }
 
         virtual size_t hash() const { return 0; }
 

include/xstudio/media_reader/image_buffer.hpp

@@ -188,7 +188,8 @@ namespace media_reader {
             return utility::BlindDataObjectPtr();
         }
 
-        template <typename T> [[nodiscard]] const T * plugin_blind_data(const utility::Uuid &plugin_uuid) const {
+        template <typename T>
+        [[nodiscard]] const T *plugin_blind_data(const utility::Uuid &plugin_uuid) const {
             auto p = plugin_blind_data_.find(plugin_uuid);
             if (p != plugin_blind_data_.end())
                 return dynamic_cast<T *>(p->second.get());

include/xstudio/media_reader/image_buffer_set.hpp

@@ -131,7 +131,8 @@ namespace media_reader {
             plugin_blind_data_[plugin_uuid] = data;
         }
 
-        template <typename T> [[nodiscard]] const T * plugin_blind_data(const utility::Uuid &plugin_uuid) const {
+        template <typename T>
+        [[nodiscard]] const T *plugin_blind_data(const utility::Uuid &plugin_uuid) const {
             auto p = plugin_blind_data_.find(plugin_uuid);
             if (p != plugin_blind_data_.end())
                 return dynamic_cast<T *>(p->second.get());

include/xstudio/playhead/sub_playhead.hpp

@@ -67,10 +67,14 @@ namespace playhead {
         void broadcast_audio_samples();
 
         std::vector<timebase::flicks> get_lookahead_frame_pointers(
-            media::AVFrameIDsAndTimePoints &result, const int max_num_frames, const bool use_headroom);
+            media::AVFrameIDsAndTimePoints &result,
+            const int max_num_frames,
+            const bool use_headroom);
 
         std::vector<timebase::flicks> get_lookahead_frame_pointers(
-            media::AVFrameIDsAndTimePoints &result, const timebase::flicks lookahead, const timebase::flicks headroom);
+            media::AVFrameIDsAndTimePoints &result,
+            const timebase::flicks lookahead,
+            const timebase::flicks headroom);
 
         void request_future_frames();
 
@@ -132,7 +136,6 @@ namespace playhead {
         void check_if_media_changed(const media::AVFrameID *frame_id);
 
       protected:
-
         media::FrameTimeMap::iterator current_frame_iterator();
         media::FrameTimeMap::iterator current_frame_iterator(const timebase::flicks t);
         utility::FrameRate current_frame_rate() const;

include/xstudio/plugin_manager/hud_plugin.hpp

@@ -52,7 +52,7 @@ namespace plugin {
         /**
          *  @brief Provide a description for the HUD plugin
          *
-         *  @details The string passed into this function will be displayed at the 
+         *  @details The string passed into this function will be displayed at the
          *  top of the settings panel for this HUD Plugin
          */
         void add_hud_description(const std::string &description);
@@ -87,7 +87,7 @@ namespace plugin {
 
         module::BooleanAttribute *hud_data_;
         module::StringChoiceAttribute *hud_item_position_ = {nullptr};
-        module::StringAttribute *description_ = {nullptr};
+        module::StringAttribute *description_             = {nullptr};
         bool globally_enabled_                            = {false};
         std::string plugin_underscore_name_;
 

include/xstudio/plugin_manager/plugin_base.hpp

@@ -73,7 +73,7 @@ namespace plugin {
             const Imath::M44f &transform_viewport_to_normalised_coords,
             const media_reader::ImageBufDisplaySetPtr &on_screen_frames,
             const float viewport_du_dpixel,
-            const float device_pixel_ratio) {};
+            const float device_pixel_ratio){};
 
         [[nodiscard]] virtual RenderPass preferred_render_pass() const { return AfterImage; }
 
@@ -129,9 +129,9 @@ namespace plugin {
         // be able to execute custom overlay render code via your custom
         // ViewportOverlayRenderer to do overlay graphics on the entire viewport.
         virtual utility::BlindDataObjectPtr onscreen_render_data(
-            const media_reader::ImageBufDisplaySetPtr &/*image_set*/,
+            const media_reader::ImageBufDisplaySetPtr & /*image_set*/,
             const std::string & /*viewport_name*/,
-            const utility::Uuid &/*playhead_uuid*/) const {
+            const utility::Uuid & /*playhead_uuid*/) const {
             return utility::BlindDataObjectPtr();
         }
 
@@ -230,7 +230,8 @@ namespace plugin {
         void update_bookmark_detail(
             const utility::Uuid bookmark_id, const bookmark::BookmarkDetail &bmd);
 
-        void remove_bookmark(const utility::Uuid &bookmark_id, const bool only_if_empty=false);
+        void
+        remove_bookmark(const utility::Uuid &bookmark_id, const bool only_if_empty = false);
 
         /* Get the (unique) name of the current, active viewport in xSTUDIO's
         main UI window. */