From: ddennedy Date: Fri, 12 Mar 2004 20:22:12 +0000 (+0000) Subject: fix field rendering X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=598f7732f9affad93b6556ddf185ff6b9d295643;p=melted fix field rendering git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@207 d19143bc-622f-0410-bfdd-b5b2a6649095 --- diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c index ed7de2e..bba678d 100644 --- a/src/modules/core/transition_luma.c +++ b/src/modules/core/transition_luma.c @@ -92,7 +92,7 @@ static inline int dissolve_yuv( mlt_frame this, mlt_frame that, float weight, in // image processing functions -static inline uint32_t smoothstep( int32_t edge1, int32_t edge2, uint32_t a ) +static inline int32_t smoothstep( int32_t edge1, int32_t edge2, int32_t a ) { if ( a < edge1 ) return 0; @@ -152,10 +152,9 @@ static void luma_composite( mlt_frame a_frame, mlt_frame b_frame, int luma_width int32_t i_softness = softness * ( 1 << 16 ); - int field_count = field_order <= 0 ? 1 : 2; + int field_count = field_order < 0 ? 1 : 2; int field_stride_src = field_count * stride_src; int field_stride_dest = field_count * stride_dest; - int field = 0; // composite using luma map @@ -163,7 +162,7 @@ static void luma_composite( mlt_frame a_frame, mlt_frame b_frame, int luma_width { p_row = p_src + field * stride_src; q_row = p_dest + field * stride_dest; - y_offset = ( field * luma_width ) << 16; + y_offset = field << 16; i = field; while ( i < height_src )