filter_crop.c: add cropping filter (kdenlive-509)

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1356 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile
index ec8cd5ffd4bc86ec59fd37cd65e4ad30592cfdca..b4c3b4399f22b53870b6b09e5373df991200aaf2 100644 (file)
--- a/src/modules/core/Makefile
+++ b/src/modules/core/Makefile
@@ -9,6 +9,7 @@ OBJS = factory.o \
           producer_ppm.o \
           filter_brightness.o \
           filter_channelcopy.o \
+          filter_crop.o \
           filter_data_feed.o \
           filter_data_show.o \
           filter_gamma.o \

diff --git a/src/modules/core/factory.c b/src/modules/core/factory.c
index 9157ce18e5cb337466b0ee3dd79608fd2054027a..755597f96e0c0b163e7e7308e4db2ce858d80674 100644 (file)
--- a/src/modules/core/factory.c
+++ b/src/modules/core/factory.c
@@ -24,6 +24,7 @@
 extern mlt_consumer consumer_null_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_brightness_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_channelcopy_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
+extern mlt_filter filter_crop_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_data_feed_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_data_show_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_gamma_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
@@ -51,6 +52,7 @@ MLT_REPOSITORY
        MLT_REGISTER( consumer_type, "null", consumer_null_init );
        MLT_REGISTER( filter_type, "brightness", filter_brightness_init );
        MLT_REGISTER( filter_type, "channelcopy", filter_channelcopy_init );
+       MLT_REGISTER( filter_type, "crop", filter_crop_init );
        MLT_REGISTER( filter_type, "data_feed", filter_data_feed_init );
        MLT_REGISTER( filter_type, "data_show", filter_data_show_init );
        MLT_REGISTER( filter_type, "gamma", filter_gamma_init );

diff --git a/src/modules/core/filter_crop.c b/src/modules/core/filter_crop.c
new file mode 100644 (file)
index 0000000..6e0fcd0
--- /dev/null
+++ b/src/modules/core/filter_crop.c
@@ -0,0 +1,163 @@
+/*
+ * filter_crop.c -- cropping filter
+ * Copyright (C) 2009 Ushodaya Enterprises Limited
+ * Author: Dan Dennedy <dan@dennedy.org>
+ *
+ * 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 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
+ * Lesser General Public License for more details.
+ *
+ * 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 <framework/mlt_filter.h>
+#include <framework/mlt_frame.h>
+#include <framework/mlt_log.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+
+static void crop( uint8_t *src, uint8_t *dest, int bpp, int width, int height, int left, int right, int top, int bottom )
+{
+       int stride = ( width - left - right ) * bpp + 1;
+       int y      = height - top - bottom + 1;
+       uint8_t *s = &src[ ( ( top * width ) + left ) * bpp ];
+
+       while ( --y )
+       {
+               int x = stride;
+               while ( --x )
+                       *dest ++ = *s ++;
+               s += ( right + left ) * bpp;
+       }
+}
+
+/** Do it :-).
+*/
+
+static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
+{
+       int error = 0;
+
+       // Get the properties from the frame
+       mlt_properties properties = MLT_FRAME_PROPERTIES( this );
+
+       // Correct Width/height if necessary
+       if ( *width == 0 || *height == 0 )
+       {
+               *width  = mlt_properties_get_int( properties, "normalised_width" );
+               *height = mlt_properties_get_int( properties, "normalised_height" );
+       }
+
+       // Now get the image
+       error = mlt_frame_get_image( this, image, format, width, height, writable );
+
+       int left    = mlt_properties_get_int( properties, "crop.left" );
+       int right   = mlt_properties_get_int( properties, "crop.right" );
+       int top     = mlt_properties_get_int( properties, "crop.top" );
+       int bottom  = mlt_properties_get_int( properties, "crop.bottom" );
+       int owidth  = *width - left - right;
+       int oheight = *height - top - bottom;
+
+       // We only know how to process yuv422 at the moment
+       if ( ( owidth != *width || oheight != *height ) &&
+               error == 0 && *format == mlt_image_yuv422 && *image != NULL && owidth > 0 && oheight > 0 )
+       {
+               // Provides a manual override for misreported field order
+               if ( mlt_properties_get( properties, "meta.top_field_first" ) )
+               {
+                       mlt_properties_set_int( properties, "top_field_first", mlt_properties_get_int( properties, "meta.top_field_first" ) );
+                       mlt_properties_set_int( properties, "meta.top_field_first", 0 );
+               }
+
+               if ( top % 2 )
+                       mlt_properties_set_int( properties, "top_field_first", !mlt_properties_get_int( properties, "top_field_first" ) );
+
+               // Create the output image
+               uint8_t *output = mlt_pool_alloc( owidth * ( oheight + 1 ) * 2 );
+               if ( output )
+               {
+                       // Call the generic resize
+                       crop( *image, output, 2, *width, *height, left, right, top, bottom );
+
+                       // Now update the frame
+                       *image = output;
+                       mlt_properties_set_data( properties, "image", output, owidth * ( oheight + 1 ) * 2, ( mlt_destructor )mlt_pool_release, NULL );
+                       mlt_properties_set_int( properties, "width", owidth );
+                       mlt_properties_set_int( properties, "height", oheight );
+               }
+
+               // We should resize the alpha too
+               uint8_t *alpha = mlt_frame_get_alpha_mask( this );
+               if ( alpha != NULL )
+               {
+                       uint8_t *newalpha = mlt_pool_alloc( owidth * oheight );
+                       if ( newalpha )
+                       {
+                               crop( alpha, newalpha, 1, *width, *height, left, right, top, bottom );
+                               mlt_properties_set_data( properties, "alpha", newalpha, owidth * oheight, ( mlt_destructor )mlt_pool_release, NULL );
+                               this->get_alpha_mask = NULL;
+                       }
+               }
+               *width = owidth;
+               *height = oheight;
+       }
+
+       return error;
+}
+
+/** Filter processing.
+*/
+
+static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
+{
+       if ( mlt_properties_get_int( MLT_FILTER_PROPERTIES( this ), "active" ) )
+       {
+               // Push the get_image method on to the stack
+               mlt_frame_push_get_image( frame, filter_get_image );
+       }
+       else
+       {
+               mlt_properties filter_props = MLT_FILTER_PROPERTIES( this );
+               mlt_properties frame_props = MLT_FRAME_PROPERTIES( frame );
+               int left   = mlt_properties_get_int( filter_props, "left" );
+               int right  = mlt_properties_get_int( filter_props, "right" );
+               int top    = mlt_properties_get_int( filter_props, "top" );
+               int bottom = mlt_properties_get_int( filter_props, "bottom" );
+               int width  = mlt_properties_get_int( frame_props, "real_width" );
+               int height = mlt_properties_get_int( frame_props, "real_height" );
+
+               mlt_properties_set_int( frame_props, "crop.left", left );
+               mlt_properties_set_int( frame_props, "crop.right", right );
+               mlt_properties_set_int( frame_props, "crop.top", top );
+               mlt_properties_set_int( frame_props, "crop.bottom", bottom );
+               mlt_properties_set_int( frame_props, "real_width", width - left - right );
+               mlt_properties_set_int( frame_props, "real_height", height - top - bottom );
+       }
+       return frame;
+}
+
+/** Constructor for the filter.
+*/
+
+mlt_filter filter_crop_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
+{
+       mlt_filter this = calloc( sizeof( struct mlt_filter_s ), 1 );
+       if ( mlt_filter_init( this, this ) == 0 )
+       {
+               this->process = filter_process;
+               if ( arg )
+                       mlt_properties_set_int( MLT_FILTER_PROPERTIES( this ), "active", atoi( arg ) );
+       }
+       return this;
+}

diff --git a/src/modules/fezzik.ini b/src/modules/fezzik.ini
index f0b2382664c72e0462e3b3ae7d2cbddf79760755..96417652fa1e16479c8feeffb3ecc949d74bd4dc 100644 (file)
--- a/src/modules/fezzik.ini
+++ b/src/modules/fezzik.ini
@@ -6,6 +6,7 @@
 # The names of the services on the right dictate the preference used (if unavailable
 # the second and third are applied as applicable).
 
+crop=crop:1
 deinterlace=deinterlace,avdeinterlace
 rescaler=mcrescale,swscale,gtkrescale,rescale
 resizer=resize