Changeset 5ddc5a275ab184db4d97d934c3abec829bae2764

Show
Ignore:
Timestamp:
03/08/04 14:21:14 (4 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1091535674 +0000
git-parent:

[08ee63a2b2b6f337f1cf7befaa0131fe08b0c5bf]

git-author:
Gildas Bazin <gbazin@videolan.org> 1091535674 +0000
Message:

* modules/video_filter/blend.c: fix for chroma planes in ->I420 blending.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/video_filter/blend.c

    r08ee63a r5ddc5a2  
    166166    p_dst_u = p_dst->p[U_PLANE].p_pixels + i_x_offset/2 + 
    167167              p_filter->fmt_out.video.i_x_offset/2 + 
    168               p_dst->p[U_PLANE].i_pitch * 
    169               ( i_y_offset + p_filter->fmt_out.video.i_y_offset )/2; 
     168              ( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 * 
     169              p_dst->p[U_PLANE].i_pitch; 
    170170    p_dst_v = p_dst->p[V_PLANE].p_pixels + i_x_offset/2 + 
    171171              p_filter->fmt_out.video.i_x_offset/2 + 
    172               p_dst->p[V_PLANE].i_pitch * 
    173               ( i_y_offset + p_filter->fmt_out.video.i_y_offset )/2; 
     172              ( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 * 
     173              p_dst->p[V_PLANE].i_pitch; 
    174174 
    175175    i_src1_pitch = p_dst_orig->p[Y_PLANE].i_pitch; 
    …… 
    180180    p_src1_u = p_dst_orig->p[U_PLANE].p_pixels + i_x_offset/2 + 
    181181               p_filter->fmt_out.video.i_x_offset/2 + 
    182                p_dst_orig->p[U_PLANE].i_pitch * 
    183                ( i_y_offset + p_filter->fmt_out.video.i_y_offset )/2; 
     182               ( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 * 
     183               p_dst_orig->p[U_PLANE].i_pitch; 
    184184    p_src1_v = p_dst_orig->p[V_PLANE].p_pixels + i_x_offset/2 + 
    185185               p_filter->fmt_out.video.i_x_offset/2 + 
    186                p_dst_orig->p[V_PLANE].i_pitch * 
    187                ( i_y_offset + p_filter->fmt_out.video.i_y_offset )/2; 
     186               ( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 * 
     187               p_dst_orig->p[V_PLANE].i_pitch; 
    188188 
    189189    i_src2_pitch = p_src->p[Y_PLANE].i_pitch; 
    …… 
    494494    p_dst_u = p_dst->p[U_PLANE].p_pixels + i_x_offset/2 + 
    495495              p_filter->fmt_out.video.i_x_offset/2 + 
    496               p_dst->p[U_PLANE].i_pitch * 
    497               ( i_y_offset + p_filter->fmt_out.video.i_y_offset )/2; 
     496              ( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 * 
     497              p_dst->p[U_PLANE].i_pitch; 
    498498    p_dst_v = p_dst->p[V_PLANE].p_pixels + i_x_offset/2 + 
    499499              p_filter->fmt_out.video.i_x_offset/2 + 
    500               p_dst->p[V_PLANE].i_pitch * 
    501               ( i_y_offset + p_filter->fmt_out.video.i_y_offset )/2; 
     500              ( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 * 
     501              p_dst->p[V_PLANE].i_pitch; 
    502502 
    503503    i_src1_pitch = p_dst_orig->p[Y_PLANE].i_pitch; 
    …… 
    508508    p_src1_u = p_dst_orig->p[U_PLANE].p_pixels + i_x_offset/2 + 
    509509               p_filter->fmt_out.video.i_x_offset/2 + 
    510                p_dst_orig->p[U_PLANE].i_pitch * 
    511                ( i_y_offset + p_filter->fmt_out.video.i_y_offset )/2; 
     510               ( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 * 
     511               p_dst_orig->p[U_PLANE].i_pitch; 
    512512    p_src1_v = p_dst_orig->p[V_PLANE].p_pixels + i_x_offset/2 + 
    513513               p_filter->fmt_out.video.i_x_offset/2 + 
    514                p_dst_orig->p[V_PLANE].i_pitch * 
    515                ( i_y_offset + p_filter->fmt_out.video.i_y_offset )/2; 
     514               ( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 * 
     515               p_dst_orig->p[V_PLANE].i_pitch; 
    516516 
    517517    i_src2_pitch = p_src->p->i_pitch;