fix race condition in region filter when parallel processing

[mlt] / src / modules / core / filter_region.c

diff --git a/src/modules/core/filter_region.c b/src/modules/core/filter_region.c
index 1e7ad17aed13e086db983739f292b4d6baaf8bd7..7ccfe5287681abc2f73f6ce8c8b722df9cc9e12d 100644 (file)
--- a/src/modules/core/filter_region.c
+++ b/src/modules/core/filter_region.c
@@ -3,24 +3,24 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "filter_region.h"
 #include "transition_region.h"
 
+#include <framework/mlt_filter.h>
 #include <framework/mlt.h>
 
 #include <stdio.h>
@@ -30,10 +30,15 @@
 /** Filter processing.
 */
 
-static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
+static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
+       // Get the filter
+       mlt_filter filter = mlt_frame_pop_service( frame );
+
        // Get the properties of the filter
-       mlt_properties properties = MLT_FILTER_PROPERTIES( this );
+       mlt_properties properties = MLT_FILTER_PROPERTIES( filter );
+
+       mlt_service_lock( MLT_FILTER_SERVICE( filter ) );
 
        // Get the region transition
        mlt_transition transition = mlt_properties_get_data( properties, "_transition", NULL );
@@ -42,26 +47,42 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
        if ( transition == NULL )
        {
                // Create the transition
-               transition = mlt_factory_transition( "region", NULL );
+               mlt_profile profile = mlt_service_profile( MLT_FILTER_SERVICE( filter ) );
+               transition = mlt_factory_transition( profile, "region", NULL );
 
                // Register with the filter
                mlt_properties_set_data( properties, "_transition", transition, 0, ( mlt_destructor )mlt_transition_close, NULL );
 
                // Pass a reference to this filter down
-               mlt_properties_set_data( MLT_TRANSITION_PROPERTIES( transition ), "_region_filter", this, 0, NULL, NULL );
+               mlt_properties_set_data( MLT_TRANSITION_PROPERTIES( transition ), "_region_filter", filter, 0, NULL, NULL );
        }
 
+       mlt_service_unlock( MLT_FILTER_SERVICE( filter ) );
+
        // Pass all properties down
-       mlt_properties_pass( MLT_TRANSITION_PROPERTIES( transition ), properties, "" );
+       mlt_properties_inherit( MLT_TRANSITION_PROPERTIES( transition ), properties );
+
+       // Make the frame's position relative to this filter's in point
+       mlt_frame_set_position( frame, mlt_filter_get_position( filter, frame ) );
 
        // Process the frame
-       return mlt_transition_process( transition, frame, NULL );
+       mlt_transition_process( transition, frame, NULL );
+
+       return mlt_frame_get_image( frame, image, format, width, height, writable );
+}
+
+static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
+{
+       mlt_frame_push_service( frame, this );
+       mlt_frame_push_get_image( frame, filter_get_image );
+
+       return frame;
 }
 
 /** Constructor for the filter.
 */
 
-mlt_filter filter_region_init( void *arg )
+mlt_filter filter_region_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
        // Create a new filter
        mlt_filter this = mlt_filter_new( );
@@ -85,4 +106,3 @@ mlt_filter filter_region_init( void *arg )
        // Return the filter
        return this;
 }
-