X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Ffilter_rescale.c;h=f70c039cfa4563476be1827efa021e05630e7e7c;hb=0b288164cbeb9a3c98107d439d86844be13ba910;hp=46de666aed06f854a8b225c39dc637964f970fc1;hpb=dc57bd7b4020663b49149f44f1607c4d78c4d2d5;p=melted diff --git a/src/modules/gtk2/filter_rescale.c b/src/modules/gtk2/filter_rescale.c index 46de666..f70c039 100644 --- a/src/modules/gtk2/filter_rescale.c +++ b/src/modules/gtk2/filter_rescale.c @@ -28,6 +28,7 @@ #include #include + /** Do it :-). */ @@ -44,9 +45,9 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * int owidth = *width; int oheight = *height; uint8_t *input = NULL; - char *interps = mlt_properties_get( properties, "rescale.interp" ); int interp = PIXOPS_INTERP_BILINEAR; + if ( strcmp( interps, "nearest" ) == 0 ) interp = PIXOPS_INTERP_NEAREST; else if ( strcmp( interps, "tiles" ) == 0 ) @@ -54,27 +55,27 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * else if ( strcmp( interps, "hyper" ) == 0 ) interp = PIXOPS_INTERP_HYPER; - mlt_frame_get_image( this, &input, format, &iwidth, &iheight, 0 ); + // If real_width/height exist, we want that as minimum information + if ( mlt_properties_get_int( properties, "real_width" ) ) + { + iwidth = mlt_properties_get_int( properties, "real_width" ); + iheight = mlt_properties_get_int( properties, "real_height" ); + } + + // Let the producer know what we are actually requested to obtain + mlt_properties_set_int( properties, "rescale_width", *width ); + mlt_properties_set_int( properties, "rescale_height", *height ); - // Determine maximum size within the aspect ratio: - double aspect_ratio = mlt_frame_get_aspect_ratio( this ); - float display_aspect_ratio = 4.0 / 3.0; // (float)iwidth / (float)iheight; - if ( *width < *height * aspect_ratio ) - oheight = *width / aspect_ratio; - else - owidth = *height * aspect_ratio; - if ( ( float )owidth * display_aspect_ratio < *width ) - owidth = ( int )( ( float )owidth * display_aspect_ratio ); - else if ( ( float )oheight * display_aspect_ratio < *height ) - oheight = ( int )( ( float )oheight * display_aspect_ratio ); - - // If width and height are correct, don't do anything - if ( input != NULL && ( iwidth != owidth || iheight != oheight ) ) + // Get the image as requested + mlt_frame_get_image( this, &input, format, &iwidth, &iheight, writable ); + + if ( input != NULL ) { - if ( *format == mlt_image_yuv422 ) + // If width and height are correct, don't do anything + if ( *format == mlt_image_yuv422 && strcmp( interps, "none" ) && ( iwidth != owidth || iheight != oheight ) ) { // Create the output image - uint8_t *output = malloc( owidth * oheight * 2 ); + uint8_t *output = mlt_pool_alloc( owidth * ( oheight + 1 ) * 2 ); // Calculate strides int istride = iwidth * 2; @@ -83,7 +84,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * yuv422_scale_simple( output, owidth, oheight, ostride, input, iwidth, iheight, istride, interp ); // Now update the frame - mlt_properties_set_data( properties, "image", output, owidth * oheight * 2, free, NULL ); + 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 ); @@ -93,31 +94,82 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * else if ( *format == mlt_image_rgb24 || *format == mlt_image_rgb24a ) { int bpp = (*format == mlt_image_rgb24a ? 4 : 3 ); - GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data( input, GDK_COLORSPACE_RGB, - (*format == mlt_image_rgb24a), 24, iwidth, iheight, - iwidth * bpp, NULL, NULL ); - GdkPixbuf *scaled = gdk_pixbuf_scale_simple( pixbuf, owidth, oheight, interp ); - - // Create the output image - uint8_t *output = malloc( owidth * oheight * bpp ); - - int i; - for ( i = 0; i < oheight; i++ ) - memcpy( output + i * owidth * bpp, - gdk_pixbuf_get_pixels( scaled ) + i * gdk_pixbuf_get_rowstride( scaled ), - gdk_pixbuf_get_width( scaled ) * bpp ); - - g_object_unref( pixbuf ); - g_object_unref( scaled ); + // Create the yuv image + uint8_t *output = mlt_pool_alloc( owidth * ( oheight + 1 ) * 2 ); + + if ( strcmp( interps, "none" ) && ( iwidth != owidth || iheight != oheight ) ) + { + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data( input, GDK_COLORSPACE_RGB, + ( *format == mlt_image_rgb24a ), 8, iwidth, iheight, + iwidth * bpp, NULL, NULL ); + + GdkPixbuf *scaled = gdk_pixbuf_scale_simple( pixbuf, owidth, oheight, interp ); + g_object_unref( pixbuf ); + + // Extract YUV422 and alpha + if ( bpp == 4 ) + { + // Allocate the alpha mask + uint8_t *alpha = mlt_pool_alloc( owidth * ( oheight + 1 ) ); + + // Convert the image and extract alpha + mlt_convert_rgb24a_to_yuv422( gdk_pixbuf_get_pixels( scaled ), + owidth, oheight, + gdk_pixbuf_get_rowstride( scaled ), + output, alpha ); + + mlt_properties_set_data( properties, "alpha", alpha, owidth * ( oheight + 1 ), ( mlt_destructor )mlt_pool_release, NULL ); + } + else + { + // No alpha to extract + mlt_convert_rgb24_to_yuv422( gdk_pixbuf_get_pixels( scaled ), + owidth, oheight, + gdk_pixbuf_get_rowstride( scaled ), + output ); + } + g_object_unref( scaled ); + } + else + { + // Extract YUV422 and alpha + if ( bpp == 4 ) + { + // Allocate the alpha mask + uint8_t *alpha = mlt_pool_alloc( owidth * ( oheight + 1 ) ); + + // Convert the image and extract alpha + mlt_convert_rgb24a_to_yuv422( input, + owidth, oheight, + owidth * 4, + output, alpha ); + + mlt_properties_set_data( properties, "alpha", alpha, owidth * ( oheight + 1 ), ( mlt_destructor )mlt_pool_release, NULL ); + } + else + { + // No alpha to extract + mlt_convert_rgb24_to_yuv422( input, + owidth, oheight, + owidth * 3, + output ); + } + } + // Now update the frame - mlt_properties_set_data( properties, "image", output, owidth * oheight * bpp, free, NULL ); + 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 ); // Return the output + *format = mlt_image_yuv422; + *width = owidth; + *height = oheight; *image = output; } + else + *image = input; } else *image = input; @@ -125,6 +177,15 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * return 0; } +static uint8_t *producer_get_alpha_mask( mlt_frame this ) +{ + // Obtain properties of frame + mlt_properties properties = mlt_frame_properties( this ); + + // Return the alpha mask + return mlt_properties_get_data( properties, "alpha", NULL ); +} + /** Filter processing. */ @@ -133,6 +194,9 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) mlt_frame_push_get_image( frame, filter_get_image ); mlt_properties_set( mlt_frame_properties( frame ), "rescale.interp", mlt_properties_get( mlt_filter_properties( this ), "interpolation" ) ); + + // Set alpha call back + frame->get_alpha_mask = producer_get_alpha_mask; return frame; }