Merge vmfx module into core

CMakeLists.txt

@@ -33,7 +33,6 @@ option(MOD_SDL1 "Enable SDL1 module" ON)
 option(MOD_SDL2 "Enable SDL2 module" ON)
 option(MOD_SOX "Enable SoX module" ON)
 option(MOD_VIDSTAB "Enable vid.stab module" ON)
-option(MOD_VMFX "Enable vmfx module" ON)
 option(MOD_VORBIS "Enable Vorbis module" ON)
 option(MOD_XINE "Enable xine module" ON)
 option(MOD_XML "Enable XML module" ON)
@@ -340,10 +339,6 @@ if(MOD_VIDSTAB)
   endif()
 endif()
 
-if(MOD_VMFX)
-  list(APPEND MLT_SUPPORTED_COMPONENTS vmfx)
-endif()
-
 if(MOD_VORBIS)
   pkg_check_modules(vorbis IMPORTED_TARGET vorbis)
   pkg_check_modules(vorbisfile IMPORTED_TARGET vorbisfile)

docs/install.txt

@@ -41,7 +41,6 @@ Last Revision: 2013-09-07
          * sdl           - SDL dependent services
          * sox           - !SoX dependent audio filters
          * vid.stab      - video stabilization filters (*)
-         * vmfx          - services contributed by (defunct) Visual Media FX
          * vorbis        - vorbis dependenent services
          * xine          - Xine-derived sources (*)
          * xml           - XML (de)serialization services

src/modules/CMakeLists.txt

@@ -84,10 +84,6 @@ if(MOD_VIDSTAB)
   add_subdirectory(vid.stab)
 endif()
 
-if(MOD_VMFX)
-  add_subdirectory(vmfx)
-endif()
-
 if(MOD_VORBIS)
   add_subdirectory(vorbis)
 endif()

src/modules/plus/CMakeLists.txt

@@ -3,6 +3,8 @@ add_library(mltplus MODULE
   factory.c
   filter_affine.c
   filter_charcoal.c
+  filter_chroma_hold.c
+  filter_chroma.c
   filter_dynamictext.c
   filter_dynamic_loudness.c
   filter_invert.c
@@ -13,12 +15,15 @@ add_library(mltplus MODULE
   filter_pillar_echo.c
   filter_rgblut.c
   filter_sepia.c
+  filter_shape.c
   filter_spot_remover.c
+  filter_strobe.c
   filter_text.c
+  filter_threshold.c
   filter_timer.c
-  filter_strobe.c
   producer_blipflash.c
   producer_count.c
+  producer_pgm.c
   transition_affine.c
 )
 
@@ -49,6 +54,8 @@ install(FILES
   consumer_blipflash.yml
   filter_affine.yml
   filter_charcoal.yml
+  filter_chroma_hold.yml
+  filter_chroma.yml
   filter_dynamic_loudness.yml
   filter_dynamictext.yml
   filter_invert.yml
@@ -59,12 +66,15 @@ install(FILES
   filter_pillar_echo.yml
   filter_rgblut.yml
   filter_sepia.yml
+  filter_shape.yml
   filter_spot_remover.yml
   filter_strobe.yml
   filter_text.yml
+  filter_threshold.yml
   filter_timer.yml
   producer_blipflash.yml
   producer_count.yml
+  producer_pgm.yml
   transition_affine.yml
   DESTINATION ${MLT_INSTALL_DATA_DIR}/plus
 )

src/modules/plus/Makefile

@@ -11,6 +11,8 @@ OBJS = consumer_blipflash.o \
 	   factory.o \
 	   filter_affine.o \
 	   filter_charcoal.o \
+	   filter_chroma.o \
+	   filter_chroma_hold.o \
 	   filter_dynamictext.o \
 	   filter_dynamic_loudness.o \
 	   filter_invert.o \
@@ -23,10 +25,13 @@ OBJS = consumer_blipflash.o \
 	   filter_sepia.o \
 	   filter_spot_remover.o \
 	   filter_text.o \
+	   filter_threshold.o \
 	   filter_timer.o \
+	   filter_shape.o \
 	   filter_strobe.o \
 	   producer_blipflash.o \
 	   producer_count.o \
+	   producer_pgm.o \
 	   transition_affine.o
 
 ifdef USE_FFTW

src/modules/plus/factory.c

@@ -24,22 +24,27 @@
 extern mlt_consumer consumer_blipflash_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_affine_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_charcoal_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
+extern mlt_filter filter_chroma_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
+extern mlt_filter filter_chroma_hold_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_dynamictext_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_dynamic_loudness_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
+extern mlt_filter filter_invert_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_lift_gamma_gain_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_loudness_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_loudness_meter_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_lumakey_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_pillar_echo_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
-extern mlt_filter filter_invert_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_rgblut_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_sepia_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
+extern mlt_filter filter_shape_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_spot_remover_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
+extern mlt_filter filter_strobe_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_text_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
+extern mlt_filter filter_threshold_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_timer_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
-extern mlt_filter filter_strobe_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_producer producer_blipflash_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_producer producer_count_init( const char *arg );
+extern mlt_producer producer_pgm_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_transition transition_affine_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 
 #ifdef USE_FFTW
@@ -59,6 +64,8 @@ MLT_REPOSITORY
 	MLT_REGISTER( mlt_service_consumer_type, "blipflash", consumer_blipflash_init );
 	MLT_REGISTER( mlt_service_filter_type, "affine", filter_affine_init );
 	MLT_REGISTER( mlt_service_filter_type, "charcoal", filter_charcoal_init );
+	MLT_REGISTER( mlt_service_filter_type, "chroma", filter_chroma_init );
+	MLT_REGISTER( mlt_service_filter_type, "chroma_hold", filter_chroma_hold_init );
 	MLT_REGISTER( mlt_service_filter_type, "dynamictext", filter_dynamictext_init );
 	MLT_REGISTER( mlt_service_filter_type, "dynamic_loudness", filter_dynamic_loudness_init );
 	MLT_REGISTER( mlt_service_filter_type, "invert", filter_invert_init );
@@ -69,12 +76,15 @@ MLT_REPOSITORY
 	MLT_REGISTER( mlt_service_filter_type, "pillar_echo", filter_pillar_echo_init );
 	MLT_REGISTER( mlt_service_filter_type, "rgblut", filter_rgblut_init );
 	MLT_REGISTER( mlt_service_filter_type, "sepia", filter_sepia_init );
+	MLT_REGISTER( mlt_service_filter_type, "shape", filter_shape_init );
 	MLT_REGISTER( mlt_service_filter_type, "spot_remover", filter_spot_remover_init );
+	MLT_REGISTER( mlt_service_filter_type, "strobe", filter_strobe_init );
 	MLT_REGISTER( mlt_service_filter_type, "text", filter_text_init );
+	MLT_REGISTER( mlt_service_filter_type, "threshold", filter_threshold_init );
 	MLT_REGISTER( mlt_service_filter_type, "timer", filter_timer_init );
-	MLT_REGISTER( mlt_service_filter_type, "strobe", filter_strobe_init );
 	MLT_REGISTER( mlt_service_producer_type, "blipflash", producer_blipflash_init );
 	MLT_REGISTER( mlt_service_producer_type, "count", producer_count_init );
+	MLT_REGISTER( mlt_service_producer_type, "pgm", producer_pgm_init );
 	MLT_REGISTER( mlt_service_transition_type, "affine", transition_affine_init );
 #ifdef USE_FFTW
 	MLT_REGISTER( mlt_service_filter_type, "dance", filter_dance_init );
@@ -84,6 +94,8 @@ MLT_REPOSITORY
 	MLT_REGISTER_METADATA( mlt_service_consumer_type, "blipflash", metadata, "consumer_blipflash.yml" );
 	MLT_REGISTER_METADATA( mlt_service_filter_type, "affine", metadata, "filter_affine.yml" );
 	MLT_REGISTER_METADATA( mlt_service_filter_type, "charcoal", metadata, "filter_charcoal.yml" );
+	MLT_REGISTER_METADATA( mlt_service_filter_type, "chroma", metadata, "filter_chroma.yml" );
+	MLT_REGISTER_METADATA( mlt_service_filter_type, "chroma_hold", metadata, "filter_chroma_hold.yml" );
 	MLT_REGISTER_METADATA( mlt_service_filter_type, "dynamictext", metadata, "filter_dynamictext.yml" );
 	MLT_REGISTER_METADATA( mlt_service_filter_type, "dynamic_loudness", metadata, "filter_dynamic_loudness.yml" );
 	MLT_REGISTER_METADATA( mlt_service_filter_type, "invert", metadata, "filter_invert.yml" );
@@ -94,12 +106,15 @@ MLT_REPOSITORY
 	MLT_REGISTER_METADATA( mlt_service_filter_type, "pillar_echo", metadata, "filter_pillar_echo.yml" );
 	MLT_REGISTER_METADATA( mlt_service_filter_type, "rgblut", metadata, "filter_rgblut.yml" );
 	MLT_REGISTER_METADATA( mlt_service_filter_type, "sepia", metadata, "filter_sepia.yml" );
+	MLT_REGISTER_METADATA( mlt_service_filter_type, "shape", metadata, "filter_shape.yml" );
 	MLT_REGISTER_METADATA( mlt_service_filter_type, "spot_remover", metadata, "filter_spot_remover.yml" );
+	MLT_REGISTER_METADATA( mlt_service_filter_type, "strobe", metadata, "filter_strobe.yml" );
 	MLT_REGISTER_METADATA( mlt_service_filter_type, "text", metadata, "filter_text.yml" );
+	MLT_REGISTER_METADATA( mlt_service_filter_type, "threshold", metadata, "filter_threshold.yml" );
 	MLT_REGISTER_METADATA( mlt_service_filter_type, "timer", metadata, "filter_timer.yml" );
-	MLT_REGISTER_METADATA( mlt_service_filter_type, "strobe", metadata, "filter_strobe.yml" );
 	MLT_REGISTER_METADATA( mlt_service_producer_type, "blipflash", metadata, "producer_blipflash.yml" );
 	MLT_REGISTER_METADATA( mlt_service_producer_type, "count", metadata, "producer_count.yml" );
+	MLT_REGISTER_METADATA( mlt_service_producer_type, "pgm", metadata, "producer_pgm.yml" );
 	MLT_REGISTER_METADATA( mlt_service_transition_type, "affine", metadata, "transition_affine.yml" );
 #ifdef USE_FFTW
 	MLT_REGISTER_METADATA( mlt_service_filter_type, "dance", metadata, "filter_dance.yml" );

src/modules/vmfx/filter_mono.c → src/modules/plus/filter_threshold.c

@@ -1,5 +1,5 @@
 /*
- * filter_mono.c -- Arbitrary alpha channel shaping
+ * filter_threshold.c -- Arbitrary alpha channel shaping
  * Copyright (C) 2005 Visual Media Fx Inc.
  * Author: Charles Yates <[email protected]>
  *
@@ -90,7 +90,7 @@ static mlt_frame filter_process( mlt_filter filter, mlt_frame frame )
 /** Constructor for the filter.
 */
 
-mlt_filter filter_mono_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
+mlt_filter filter_threshold_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
 	mlt_filter filter = mlt_filter_new( );
 	if ( filter != NULL )