Openfx v3

CMakeLists.txt

@@ -28,11 +28,12 @@ option(MOD_JACKRACK "Enable JACK Rack module" ON)
 option(USE_LV2 "Enable LV2 features" ON)
 option(USE_VST2 "Enable LV2 features" ON)
 option(MOD_KDENLIVE "Enable Kdenlive module" ON)
+option(MOD_MOVIT "Enable OpenGL module" ON)
 option(MOD_NDI "Enable NDI module" OFF)
 option(MOD_NORMALIZE "Enable Normalize module (GPL)" ON)
 option(MOD_OLDFILM "Enable Oldfilm module" ON)
 option(MOD_OPENCV "Enable OpenCV module" OFF)
-option(MOD_MOVIT "Enable OpenGL module" ON)
+option(MOD_OPENFX "Enable OpenFX module (GPL)" ON)
 option(MOD_PLUS "Enable Plus module" ON)
 option(MOD_PLUSGPL "Enable PlusGPL module (GPL)" ON)
 option(MOD_QT6 "Enable Qt6 module (GPL)" ON)
@@ -180,6 +181,7 @@ endif()
 
 if(NOT GPL)
   set(MOD_NORMALIZE OFF)
+  set(MOD_OPENFX OFF)
   set(MOD_PLUSGPL OFF)
   set(MOD_QT6 OFF)
   set(MOD_RESAMPLE OFF)
@@ -275,6 +277,16 @@ if(MOD_KDENLIVE)
   list(APPEND MLT_SUPPORTED_COMPONENTS kdenlive)
 endif()
 
+if(MOD_MOVIT)
+  pkg_check_modules(movit REQUIRED IMPORTED_TARGET movit)
+  find_package(OpenGL REQUIRED)
+
+  if(UNIX AND NOT APPLE)
+    find_package(X11 REQUIRED)
+  endif()
+  list(APPEND MLT_SUPPORTED_COMPONENTS movit)
+endif()
+
 if(MOD_NDI)
   find_package(NDI REQUIRED)
   list(APPEND MLT_SUPPORTED_COMPONENTS ndi)
@@ -293,14 +305,8 @@ if(MOD_OPENCV)
   list(APPEND MLT_SUPPORTED_COMPONENTS opencv)
 endif()
 
-if(MOD_MOVIT)
-  pkg_check_modules(movit REQUIRED IMPORTED_TARGET movit)
-  find_package(OpenGL REQUIRED)
-
-  if(UNIX AND NOT APPLE)
-    find_package(X11 REQUIRED)
-  endif()
-  list(APPEND MLT_SUPPORTED_COMPONENTS movit)
+if(MOD_OPENFX)
+  pkg_check_modules(glib IMPORTED_TARGET glib-2.0)
 endif()
 
 if(MOD_PLUS)
@@ -494,6 +500,7 @@ if(CLANG_FORMAT)
     list(FILTER FORMAT_FILES EXCLUDE REGEX "/.*/plus/ebur128")
     list(FILTER FORMAT_FILES EXCLUDE REGEX "/.*/movit/optional_effect.h")
     list(FILTER FORMAT_FILES EXCLUDE REGEX "/.*/opencv/filter_opencv_tracker.cpp")
+    list(FILTER FORMAT_FILES EXCLUDE REGEX "/.*/openfx/openfx")
     list(FILTER FORMAT_FILES EXCLUDE REGEX "/.*/plusgpl/cJSON")
     list(FILTER FORMAT_FILES EXCLUDE REGEX "/.*/plusgpl/image.*")
     list(FILTER FORMAT_FILES EXCLUDE REGEX "/.*/plusgpl/utils.*")
@@ -563,11 +570,12 @@ add_feature_info("Module: GDK" MOD_GDK "")
 add_feature_info("Module: Glaxnimate (Qt6)" MOD_GLAXNIMATE_QT6 "")
 add_feature_info("Module: JACKRack" MOD_JACKRACK "")
 add_feature_info("Module: Kdenlive" MOD_KDENLIVE "")
+add_feature_info("Module: Movit" MOD_MOVIT "")
 add_feature_info("Module: NDI" MOD_NDI "")
 add_feature_info("Module: Normalize" MOD_NORMALIZE "")
 add_feature_info("Module: Oldfilm" MOD_OLDFILM "")
 add_feature_info("Module: OpenCV" MOD_OPENCV "")
-add_feature_info("Module: Movit" MOD_MOVIT "")
+add_feature_info("Module: OpenFX" MOD_OPENFX "")
 add_feature_info("Module: Plus" MOD_PLUS "")
 add_feature_info("Module: PlusGPL" MOD_PLUSGPL "")
 add_feature_info("Module: Qt6" MOD_QT6 "")

CMakePresets.json

@@ -15,13 +15,14 @@
                 "MOD_FREI0R": "OFF",
                 "MOD_GDK": "ON",
                 "MOD_JACKRACK": "OFF",
-                "USE_LV2": "OFF",
                 "USE_VST2": "OFF",
+                "USE_LV2": "OFF",
                 "MOD_KDENLIVE": "ON",
                 "MOD_NDI": "OFF",
                 "MOD_NORMALIZE": "ON",
                 "MOD_OLDFILM": "ON",
                 "MOD_OPENCV": "ON",
+                "MOD_OPENFX": "OFF",
                 "MOD_MOVIT": "OFF",
                 "MOD_PLUS": "ON",
                 "MOD_PLUSGPL": "OFF",

src/framework/metaschema.yaml

@@ -1,5 +1,5 @@
 --- # A metadata schema in Kwalify: http://www.kuwata-lab.com/kwalify/
-# Version: 7.0
+# Version: 7.1
 type: map
 mapping:
   "schema_version": # This should match the version comment above
@@ -70,14 +70,15 @@ mapping:
             type: str
             enum:
               - boolean # 0 or 1; not 'true', 'false', 'yes', or 'no' strings at this time
+              - color # 0xrrggbbaa | #rrggbb | #aarrggbb
               - float
               - geometry
+              - group # for grouping parameters in a UI, this is not an mlt_property_type
               - integer
               - properties # for passing options to encapsulated services
+              - rect  # "X Y W H" or "X/Y:WxH"
               - string
               - time # time string values (clock, SMPTE) can be accepted in addition to frames
-              - rect  # "X Y W H" or "X/Y:WxH"
-              - color # 0xrrggbbaa | #rrggbb | #aarrggbb
           "service-name": # for type: properties, a reference to another service
             type: str     # format: type.service, e.g. transition.composite
           "title": # A UI can use this for a field label
@@ -114,8 +115,10 @@ mapping:
               - knob
               - listbox
               - dropdown # aka HTML select or GtkOptionMenu
+              - point
               - radio
               - rectangle # for use with type: geometry
+              - size
               - slider
               - spinner
               - text
@@ -138,4 +141,9 @@ mapping:
                       # widget: combo or if "other" is in this sequence
             sequence:
               - type: scalar
-
+          "group": # A UI can use this to group parameters together
+            type: str
+          "normalized_coordinates": # For types that represent coordinates, whether values are normalized to 0..1
+            type: bool
+            default: no
+

src/modules/CMakeLists.txt

@@ -92,6 +92,10 @@ if(MOD_VIDSTAB)
   add_subdirectory(vid.stab)
 endif()
 
+if(MOD_OPENFX)
+  add_subdirectory(openfx)
+endif()
+
 if(MOD_VORBIS)
   add_subdirectory(vorbis)
 endif()

src/modules/openfx/CMakeLists.txt

@@ -0,0 +1,27 @@
+add_library(mltopenfx MODULE
+  factory.c
+  mlt_openfx.c mlt_openfx.h
+  filter_openfx.c
+)
+
+add_custom_target(Other_openfx_Files SOURCES
+  filter_openfx.yml
+)
+
+if(GPL AND TARGET PkgConfig::glib)
+  include(GenerateExportHeader)
+  generate_export_header(mltopenfx)
+  target_compile_options(mltopenfx PRIVATE ${MLT_COMPILE_OPTIONS})
+  target_include_directories(mltopenfx PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+  target_link_libraries(mltopenfx PRIVATE mlt PkgConfig::glib ${CMAKE_DL_LIBS})
+  target_include_directories(mltopenfx PRIVATE openfx/include)
+  if(NOT MSVC)
+    target_link_libraries(mltopenfx PRIVATE m)
+  endif()
+endif()
+
+set_target_properties(mltopenfx PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
+
+install(TARGETS mltopenfx LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
+
+install(FILES filter_openfx.yml DESTINATION ${MLT_INSTALL_DATA_DIR}/openfx)