[Mlt-devel] mlt/src/modules/core transition_luma.c,1.45,1.46
Brought to you by:
ddennedy,
lilo_booter
From: j-b-m <j-...@us...> - 2006-11-05 12:11:03
|
Update of /cvsroot/mlt/mlt/src/modules/core In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20491/src/modules/core Modified Files: transition_luma.c Log Message: Luma get_image produces yuv only, so announce it. Fix problem when requesting rgb image of a luma transition. Index: transition_luma.c =================================================================== RCS file: /cvsroot/mlt/mlt/src/modules/core/transition_luma.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- transition_luma.c 10 Oct 2005 09:28:12 -0000 1.45 +++ transition_luma.c 5 Nov 2006 12:10:55 -0000 1.46 @@ -369,6 +369,9 @@ // Get the properties of the b frame mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame ); + // This compositer is yuv422 only + *format = mlt_image_yuv422; + // The cached luma map information int luma_width = mlt_properties_get_int( properties, "width" ); int luma_height = mlt_properties_get_int( properties, "height" ); @@ -512,6 +515,7 @@ if ( mlt_properties_get( properties, "fixed" ) ) mix = mlt_properties_get_double( properties, "fixed" ); + if ( luma_width > 0 && luma_height > 0 && luma_bitmap != NULL ) // Composite the frames using a luma map luma_composite( !invert ? a_frame : b_frame, !invert ? b_frame : a_frame, luma_width, luma_height, luma_bitmap, mix, frame_delta, @@ -520,6 +524,7 @@ // Dissolve the frames using the time offset for mix value dissolve_yuv( a_frame, b_frame, mix, *width, *height ); + // Extract the a_frame image info *width = mlt_properties_get_int( !invert ? a_props : b_props, "width" ); *height = mlt_properties_get_int( !invert ? a_props : b_props, "height" ); |