fix movit.rect distort property not working

https://forum.shotcut.org/t/size-and-position-gpu-filter-distort/42091
mltframework · Dec 21, 2023 · 30a1280 · 30a1280
1 parent 3ffb57b
commit 30a1280
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/modules/movit/filter_movit_rect.cpp b/src/modules/movit/filter_movit_rect.cpp
@@ -1,6 +1,6 @@
 /*
  * filter_movit_rect.cpp
- * Copyright (C) 2013 Dan Dennedy <dan@dennedy.org>
+ * Copyright (C) 2013-2023 Dan Dennedy <dan@dennedy.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@ static mlt_frame process(mlt_filter filter, mlt_frame frame)
     auto rect = mlt_properties_anim_get_rect(properties, "rect", position, length);
     mlt_properties_set_rect(frame_props, "resize.rect", rect);
     mlt_properties_set(frame_props, "resize.fill", mlt_properties_get(properties, "fill"));
-    mlt_properties_set(frame_props, "distort", mlt_properties_get(properties, "distort"));
+    mlt_properties_set(frame_props, "resize.distort", mlt_properties_get(properties, "distort"));
     mlt_properties_set(frame_props, "resize.halign", mlt_properties_get(properties, "halign"));
     mlt_properties_set(frame_props, "resize.valign", mlt_properties_get(properties, "valign"));
     return frame;

diff --git a/src/modules/movit/filter_movit_resize.cpp b/src/modules/movit/filter_movit_resize.cpp
@@ -1,6 +1,6 @@
 /*
  * filter_movit_resize.cpp
- * Copyright (C) 2013-2020 Dan Dennedy <dan@dennedy.org>
+ * Copyright (C) 2013-2023 Dan Dennedy <dan@dennedy.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -115,7 +115,7 @@ static int get_image(mlt_frame frame,
     if (*format == mlt_image_none || (rescale && !strcmp(rescale, "none")))
         return mlt_frame_get_image(frame, image, format, width, height, writable);
 
-    if (mlt_properties_get_int(properties, "distort") == 0) {
+    if (mlt_properties_get_int(properties, "resize.distort") == 0) {
         // Normalize the input and out display aspect
         int normalized_width = profile->width;
         int normalized_height = profile->height;
@@ -158,7 +158,7 @@ static int get_image(mlt_frame frame,
         mlt_frame_set_aspect_ratio(frame, consumer_aspect);
     }
 
-    mlt_properties_set_int(properties, "distort", 0);
+    mlt_properties_set_int(properties, "resize.distort", 0);
 
     // Now get the image
     *format = mlt_image_movit;