From 86a291c54f58e6cc8cd2e45e85ad40e728bcc431 Mon Sep 17 00:00:00 2001 From: Janne Liljeblad Date: Tue, 11 Feb 2014 09:10:17 +0200 Subject: [PATCH] Change this to frame or filter as appropriate --- src/modules/plus/filter_rgblut.c | 36 +++++++++++++++--------------- src/modules/plus/filter_rgblut.yml | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/modules/plus/filter_rgblut.c b/src/modules/plus/filter_rgblut.c index 6d2e936a..9ba390cd 100644 --- a/src/modules/plus/filter_rgblut.c +++ b/src/modules/plus/filter_rgblut.c @@ -60,27 +60,27 @@ static void fill_channel_lut(int lut[], char* channel_table_str) /** Do it :-). */ -static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable ) +static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable ) { // Get the image - mlt_filter filter = mlt_frame_pop_service( this ); + mlt_filter filter = mlt_frame_pop_service( frame ); *format = mlt_image_rgb24; - int error = mlt_frame_get_image( this, image, format, width, height, 0 ); + int error = mlt_frame_get_image( frame, image, format, width, height, 0 ); // Only process if we have no error and a valid colour space if ( error == 0 ) { // Create lut tables from properties for each RGB channel - char* r_str = mlt_properties_get( MLT_FRAME_PROPERTIES( this ), "R_table" ); + char* r_str = mlt_properties_get( MLT_FRAME_PROPERTIES( frame ), "R_table" ); int r_lut[256]; fill_channel_lut( r_lut, r_str ); - char* g_str = mlt_properties_get( MLT_FRAME_PROPERTIES( this ), "G_table" ); + char* g_str = mlt_properties_get( MLT_FRAME_PROPERTIES( frame ), "G_table" ); int g_lut[256]; fill_channel_lut( g_lut, g_str ); - char* b_str = mlt_properties_get( MLT_FRAME_PROPERTIES( this ), "B_table" ); + char* b_str = mlt_properties_get( MLT_FRAME_PROPERTIES( frame ), "B_table" ); int b_lut[256]; fill_channel_lut( b_lut, b_str ); @@ -102,18 +102,18 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * /** Filter processing. */ -static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) +static mlt_frame filter_process( mlt_filter filter, mlt_frame frame ) { - char* r_table = mlt_properties_get( MLT_FILTER_PROPERTIES( this ), "R_table" ); - char* g_table = mlt_properties_get( MLT_FILTER_PROPERTIES( this ), "G_table" ); - char* b_table = mlt_properties_get( MLT_FILTER_PROPERTIES( this ), "B_table" ); + char* r_table = mlt_properties_get( MLT_FILTER_PROPERTIES( filter ), "R_table" ); + char* g_table = mlt_properties_get( MLT_FILTER_PROPERTIES( filter ), "G_table" ); + char* b_table = mlt_properties_get( MLT_FILTER_PROPERTIES( filter ), "B_table" ); mlt_properties_set( MLT_FRAME_PROPERTIES( frame ), "R_table", r_table ); mlt_properties_set( MLT_FRAME_PROPERTIES( frame ), "G_table", g_table ); mlt_properties_set( MLT_FRAME_PROPERTIES( frame ), "B_table", b_table ); // Push the frame filter - mlt_frame_push_service( frame, this ); + mlt_frame_push_service( frame, filter ); mlt_frame_push_get_image( frame, filter_get_image ); return frame; } @@ -123,14 +123,14 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) mlt_filter filter_rgblut_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ) { - mlt_filter this = mlt_filter_new( ); - if ( this != NULL ) + mlt_filter filter = mlt_filter_new( ); + if ( filter != NULL ) { - this->process = filter_process; - mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "R_table", "unset" ); - mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "G_table", "unset" ); - mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "B_table", "unset" ); + filter->process = filter_process; + mlt_properties_set( MLT_FILTER_PROPERTIES( filter ), "R_table", "unset" ); + mlt_properties_set( MLT_FILTER_PROPERTIES( filter ), "G_table", "unset" ); + mlt_properties_set( MLT_FILTER_PROPERTIES( filter ), "B_table", "unset" ); } - return this; + return filter; } diff --git a/src/modules/plus/filter_rgblut.yml b/src/modules/plus/filter_rgblut.yml index 7355ba3e..ce2fb9dc 100644 --- a/src/modules/plus/filter_rgblut.yml +++ b/src/modules/plus/filter_rgblut.yml @@ -10,7 +10,7 @@ language: en tags: - Video description: - Converts input strings with exactly 256 half-comma separated integer values in + Converts input strings with exactly 256 semicolon separated integer values in range 0 - 255 to look-up tables that are then used to modify R, G, B values. This creates a generic string interface for color correction. -- 2.39.5