set transform properties from mlt

diff --git a/src/modules/videostab/filter_videostab2.c b/src/modules/videostab/filter_videostab2.c
index 2e17ee44a6f737e46ea6b648b2ab1bc3917db4a5..535af26b4d1033a939973ec34bc24920e5feb031 100644 (file)
--- a/src/modules/videostab/filter_videostab2.c
+++ b/src/modules/videostab/filter_videostab2.c
@@ -178,7 +178,18 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
                                        interp = 3;
                                else if ( strcmp( interps, "bicublin" ) == 0 )
                                        interp = 4;
+
                                tf->interpoltype = interp;
+                               tf->smoothing = mlt_properties_get_int( MLT_FILTER_PROPERTIES(filter), "smoothing" ); 
+                               tf->maxshift = mlt_properties_get_int( MLT_FILTER_PROPERTIES(filter), "maxshift" ); 
+                               tf->maxangle = mlt_properties_get_int( MLT_FILTER_PROPERTIES(filter), "maxangle" ); 
+                               tf->crop = mlt_properties_get_int( MLT_FILTER_PROPERTIES(filter), "crop" ); 
+                               tf->invert = mlt_properties_get_int( MLT_FILTER_PROPERTIES(filter), "invert" ); 
+                               tf->relative = mlt_properties_get_int( MLT_FILTER_PROPERTIES(filter), "relative" ); 
+                               tf->zoom = mlt_properties_get_int( MLT_FILTER_PROPERTIES(filter), "zoom" ); 
+                               tf->optzoom = mlt_properties_get_int( MLT_FILTER_PROPERTIES(filter), "optzoom" ); 
+                               tf->sharpen = mlt_properties_get_double( MLT_FILTER_PROPERTIES(filter), "sharpen" ); 
+
                                transform_configure(tf,w,h,*format ,*image, deserialize_vectors(  vectors, length ),length);
                                
                        }
@@ -221,12 +232,24 @@ mlt_filter filter_videostab2_init( mlt_profile profile, mlt_service_type type, c
                parent->close = filter_close;
                parent->process = filter_process;
                self->parent = parent;
+               //properties for stabilize
                mlt_properties_set( MLT_FILTER_PROPERTIES(parent), "shakiness", "4" ); 
                mlt_properties_set( MLT_FILTER_PROPERTIES(parent), "accuracy", "4" ); 
                mlt_properties_set( MLT_FILTER_PROPERTIES(parent), "stepsize", "6" ); 
                mlt_properties_set( MLT_FILTER_PROPERTIES(parent), "algo", "1" ); 
                mlt_properties_set( MLT_FILTER_PROPERTIES(parent), "mincontrast", "0.3" ); 
                mlt_properties_set( MLT_FILTER_PROPERTIES(parent), "show", "0" ); 
+               
+               //properties for transform
+               mlt_properties_set( MLT_FILTER_PROPERTIES(parent), "smoothing", "10" ); 
+               mlt_properties_set( MLT_FILTER_PROPERTIES(parent), "maxshift", "-1" ); 
+               mlt_properties_set( MLT_FILTER_PROPERTIES(parent), "maxangle", "-1" ); 
+               mlt_properties_set( MLT_FILTER_PROPERTIES(parent), "crop", "0" ); 
+               mlt_properties_set( MLT_FILTER_PROPERTIES(parent), "invert", "0" ); 
+               mlt_properties_set( MLT_FILTER_PROPERTIES(parent), "relative", "1" ); 
+               mlt_properties_set( MLT_FILTER_PROPERTIES(parent), "zoom", "0" ); 
+               mlt_properties_set( MLT_FILTER_PROPERTIES(parent), "optzoom", "1" ); 
+               mlt_properties_set( MLT_FILTER_PROPERTIES(parent), "sharpen", "0.8" ); 
                return parent;
        }
        return NULL;

diff --git a/src/modules/videostab/transform_image.c b/src/modules/videostab/transform_image.c
index d186c5155f32aaa66bc89e7d958c3daac3de4846..edbee1c7998f939d6592c2becdfd040438d9f156 100644 (file)
--- a/src/modules/videostab/transform_image.c
+++ b/src/modules/videostab/transform_image.c
@@ -622,26 +622,25 @@ int transform_configure(TransformData *self,int width,int height, mlt_image_form
     td->warned_transform_end = 0;  
 
     /* Options */
-    td->maxshift = -1;
-    td->maxangle = -1;
+    // set from  filter td->maxshift = -1;
+    // set from  filter td->maxangle = -1;
     
 
-    td->crop = 0;
-    td->relative = 1;
-    td->invert = 0;
-    td->smoothing = 10;
+    // set from  filter td->crop = 0;
+    // set from  filter td->relative = 1;
+    // set from  filter td->invert = 0;
+    // set from  filter td->smoothing = 10;
   
     td->rotation_threshhold = 0.25/(180/M_PI);
 
-    td->zoom    = 0;
-    td->optzoom = 1;
+    // set from  filter td->zoom    = 0;
+    // set from  filter td->optzoom = 1;
     // set from  filter td->interpoltype = 2; // bi-linear
-    td->sharpen = 0.8;
+    // set from  filter td->sharpen = 0.8;
        
     td->interpoltype = TC_MIN(td->interpoltype,4);
     if (1) {
         mlt_log_warning(NULL, "Image Transformation/Stabilization Settings:\n");
-        mlt_log_warning(NULL, "    input     = %s\n", td->input);
         mlt_log_warning(NULL, "    smoothing = %d\n", td->smoothing);
         mlt_log_warning(NULL, "    maxshift  = %d\n", td->maxshift);
         mlt_log_warning(NULL, "    maxangle  = %f\n", td->maxangle);

diff --git a/src/modules/videostab/transform_image.h b/src/modules/videostab/transform_image.h
index 23b921816247f3e59725984e682765ac9d14c9d9..71fd9ea679c1fd3341cffc2cb3a53f69859d122e 100644 (file)
--- a/src/modules/videostab/transform_image.h
+++ b/src/modules/videostab/transform_image.h
@@ -75,9 +75,6 @@ typedef struct {
     int interpoltype; // type of interpolation: 0->Zero,1->Lin,2->BiLin,3->Sqr
     double sharpen;   // amount of sharpening
 
-    char input[0124];
-    FILE* f;
-
     char conf_str[1024];
 } TransformData;