Thread: [Mlt-devel] SF.net SVN: mlt:[1378] trunk/mlt/src/modules/core/transition_composite.c
Brought to you by:
ddennedy,
lilo_booter
From: <dde...@us...> - 2009-03-14 20:40:01
|
Revision: 1378 http://mlt.svn.sourceforge.net/mlt/?rev=1378&view=rev Author: ddennedy Date: 2009-03-14 20:39:49 +0000 (Sat, 14 Mar 2009) Log Message: ----------- transition_composite.c: make luma and luma_invert properties mutable Modified Paths: -------------- trunk/mlt/src/modules/core/transition_composite.c Modified: trunk/mlt/src/modules/core/transition_composite.c =================================================================== --- trunk/mlt/src/modules/core/transition_composite.c 2009-03-10 23:35:15 UTC (rev 1377) +++ trunk/mlt/src/modules/core/transition_composite.c 2009-03-14 20:39:49 UTC (rev 1378) @@ -624,7 +624,7 @@ luma_height = height; } - if ( resource != NULL && strchr( resource, '%' ) ) + if ( resource && resource[0] && strchr( resource, '%' ) ) { // TODO: Clean up quick and dirty compressed/existence check FILE *test; @@ -637,8 +637,20 @@ resource = temp; } - if ( resource != NULL && ( luma_bitmap == NULL || luma_width != width || luma_height != height ) ) + if ( resource && resource[0] ) { + char *old_luma = mlt_properties_get( properties, "_luma" ); + int old_invert = mlt_properties_get_int( properties, "_luma_invert" ); + + if ( invert != old_invert || ( old_luma && old_luma[0] && strcmp( resource, old_luma ) ) ) + { + mlt_properties_set_data( properties, "_luma.orig_bitmap", NULL, 0, NULL, NULL ); + luma_bitmap = NULL; + } + } + + if ( resource && resource[0] && ( luma_bitmap == NULL || luma_width != width || luma_height != height ) ) + { uint16_t *orig_bitmap = mlt_properties_get_data( properties, "_luma.orig_bitmap", NULL ); luma_width = mlt_properties_get_int( properties, "_luma.orig_width" ); luma_height = mlt_properties_get_int( properties, "_luma.orig_height" ); @@ -725,6 +737,8 @@ mlt_properties_set_int( properties, "_luma.width", width ); mlt_properties_set_int( properties, "_luma.height", height ); mlt_properties_set_data( properties, "_luma.bitmap", luma_bitmap, width * height * 2, mlt_pool_release, NULL ); + mlt_properties_set( properties, "_luma", resource ); + mlt_properties_set_int( properties, "_luma_invert", invert ); } return luma_bitmap; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-03-15 20:08:23
|
Revision: 1379 http://mlt.svn.sourceforge.net/mlt/?rev=1379&view=rev Author: j-b-m Date: 2009-03-15 18:55:05 +0000 (Sun, 15 Mar 2009) Log Message: ----------- transition_composite.c: allow removing of luma file by passing an empty name Modified Paths: -------------- trunk/mlt/src/modules/core/transition_composite.c Modified: trunk/mlt/src/modules/core/transition_composite.c =================================================================== --- trunk/mlt/src/modules/core/transition_composite.c 2009-03-14 20:39:49 UTC (rev 1378) +++ trunk/mlt/src/modules/core/transition_composite.c 2009-03-15 18:55:05 UTC (rev 1379) @@ -648,6 +648,15 @@ luma_bitmap = NULL; } } + else { + char *old_luma = mlt_properties_get( properties, "_luma" ); + if ( old_luma && old_luma[0] ) + { + mlt_properties_set_data( properties, "_luma.orig_bitmap", NULL, 0, NULL, NULL ); + luma_bitmap = NULL; + mlt_properties_set( properties, "_luma", NULL); + } + } if ( resource && resource[0] && ( luma_bitmap == NULL || luma_width != width || luma_height != height ) ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: jb <j-...@us...> - 2009-03-15 17:30:38
Attachments:
patch.diff
|
Hi! Patch below allows user to remove the luma file in a composite transition when there was one before, like it works in the luma transition... So you are able to select "None" in the luma file field of the composite transition in Kdenlive to get rid of the luma file... regards jb Index: transition_composite.c =================================================================== --- transition_composite.c (revision 1378) +++ transition_composite.c (working copy) @@ -648,6 +648,15 @@ luma_bitmap = NULL; } } + else { + char *old_luma = mlt_properties_get( properties, "_luma" ); + if ( old_luma && old_luma[0] ) + { + mlt_properties_set_data( properties, "_luma.orig_bitmap", NULL, 0, NULL, NULL ); + luma_bitmap = NULL; + mlt_properties_set( properties, "_luma", NULL); + } + } if ( resource && resource[0] && ( luma_bitmap == NULL || luma_width != width || luma_height != height ) ) { |
From: Dan D. <da...@de...> - 2009-03-15 18:35:16
|
On Sun, Mar 15, 2009 at 10:30 AM, jb <j-...@us...> wrote: > Hi! > > Patch below allows user to remove the luma file in a composite transition when > there was one before, like it works in the luma transition... > > So you are able to select "None" in the luma file field of the composite > transition in Kdenlive to get rid of the luma file... ah yes, I forgot about that case. please commit this. -- +-DRD-+ |