Don't add new tractor function, simply duplicate the list of wanted p…

…roperties to pass
j-b-m · Jul 23, 2023 · 0f7438a · 0f7438a
1 parent 6bc8642
commit 0f7438a
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 10 deletions.
diff --git a/src/framework/mlt.vers b/src/framework/mlt.vers
@@ -680,5 +680,4 @@ MLT_7.16.0 {
 MLT_7.18.0 {
   global:
     mlt_audio_free_data;
-    mlt_tractor_passthrough_properties;
 } MLT_7.16.0;
diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c
@@ -345,11 +345,6 @@ mlt_producer mlt_tractor_get_track(mlt_tractor self, int index)
     return mlt_multitrack_track(mlt_tractor_multitrack(self), index);
 }
 
-const char *mlt_tractor_passthrough_properties()
-{
-    return "progressive,progressive,distort,colorspace,full_range,force_full_luma,top_field_first,color_trc";
-}
-
 static int producer_get_image(mlt_frame self,
                               uint8_t **buffer,
                               mlt_image_format *format,
@@ -386,7 +381,7 @@ static int producer_get_image(mlt_frame self,
     mlt_properties_set_int(properties, "format", *format);
     mlt_properties_set_double(properties, "aspect_ratio", mlt_frame_get_aspect_ratio(frame));
     // Pass all required frame properties
-    mlt_properties_pass_list(properties, frame_properties, mlt_tractor_passthrough_properties());
+    mlt_properties_pass_list(properties, frame_properties, "progressive,distort,colorspace,full_range,force_full_luma,top_field_first,color_trc");
 
     mlt_properties_set_data(properties,
                             "movit.convert.fence",

diff --git a/src/framework/mlt_tractor.h b/src/framework/mlt_tractor.h
@@ -55,7 +55,6 @@ extern mlt_field mlt_tractor_field(mlt_tractor self);
 extern mlt_multitrack mlt_tractor_multitrack(mlt_tractor self);
 extern int mlt_tractor_connect(mlt_tractor self, mlt_service service);
 extern void mlt_tractor_refresh(mlt_tractor self);
-extern const char *mlt_tractor_passthrough_properties();
 extern int mlt_tractor_set_track(mlt_tractor self, mlt_producer producer, int index);
 extern int mlt_tractor_insert_track(mlt_tractor self, mlt_producer producer, int index);
 extern int mlt_tractor_remove_track(mlt_tractor self, int index);

diff --git a/src/modules/frei0r/transition_frei0r.c b/src/modules/frei0r/transition_frei0r.c
@@ -72,7 +72,7 @@ static int transition_get_image(mlt_frame a_frame,
             error = mlt_frame_get_image(a_frame, image, format, width, height, 0);
         } else {
             // Pass all required frame properties
-            mlt_properties_pass_list(a_props, b_props, mlt_tractor_passthrough_properties());
+            mlt_properties_pass_list(a_props, b_props, "progressive,distort,colorspace,full_range,force_full_luma,top_field_first,color_trc");
             *image = images[1];
         }
     } else {

diff --git a/src/modules/qt/transition_qtblend.cpp b/src/modules/qt/transition_qtblend.cpp
@@ -189,7 +189,7 @@ static int get_image(mlt_frame a_frame,
         }
         if (!hasAlpha) {
             // Pass all required frame properties
-            mlt_properties_pass_list(properties, b_properties, mlt_tractor_passthrough_properties());
+            mlt_properties_pass_list(properties, b_properties, "progressive,distort,colorspace,full_range,force_full_luma,top_field_first,color_trc");
             // Prepare output image
             if (b_frame->convert_image && (b_width != request_width || b_height != request_height)) {
                 mlt_properties_set_int(b_properties, "convert_image_width", request_width);