From af570ac8e6d5601fc2e84a6955c94b4ff9194bd7 Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Wed, 12 Apr 2006 22:00:31 +0000 Subject: [PATCH] + Top field first correction (original approach would not have worked [mea culpa], and this is only a partial solution since the consumers have no say in field order) git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@907 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/modules/core/filter_resize.c | 40 +++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/modules/core/filter_resize.c b/src/modules/core/filter_resize.c index 81e850d..f9f80df 100644 --- a/src/modules/core/filter_resize.c +++ b/src/modules/core/filter_resize.c @@ -27,6 +27,16 @@ #include #include +/** Swapbytes inline. +*/ + +static inline void swap_bytes( uint8_t *upper, uint8_t *lower ) +{ + uint8_t t = *lower; + *lower = *upper; + *upper = t; +} + /** Do it :-). */ @@ -115,22 +125,26 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * // Get the input image, width and height int size; uint8_t *image = mlt_properties_get_data( properties, "image", &size ); - - // Keep the original image around to be destroyed on frame close - mlt_properties_rename( properties, "image", "original_image" ); - - // Duplicate the last line in the field to avoid artifact - memcpy( image + oheight * owidth * 2, image + oheight * owidth * 2 - owidth * 4, owidth * 2 ); - - // Offset the image pointer by one line - image += owidth * 2; - size -= owidth * 2; - - // Set the new image pointer with no destructor - mlt_properties_set_data( properties, "image", image, size, NULL, NULL ); + uint8_t *ptr = image + owidth * 2; + int h = oheight / 2; + int w = owidth; + + // Swap the lines around + while( h -- ) + { + w = owidth; + while( w -- ) + { + swap_bytes( image ++, ptr ++ ); + swap_bytes( image ++, ptr ++ ); + } + image += owidth * 2; + ptr += owidth * 2; + } // Set the normalised field order mlt_properties_set_int( properties, "top_field_first", 0 ); + mlt_properties_set_int( properties, "meta.top_field_first", 0 ); } if ( !strcmp( op, "affine" ) ) -- 1.7.4.4