Changeset 09fb4e575c3b743ae4f381a15819c48c6a98fc4b

Timestamp:

21/08/08 01:45:57 (3 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1219275957 +0200

git-parent:

[960c04ad6a2c7abf33631e4182e71150608c821d]

git-author:

Laurent Aimar <fenrir@videolan.org> 1219275957 +0200

Message:

Fixed YUVP blending (my bad for not testing it).

Files:

• modules/video_filter/blend.c (modified) (7 diffs)

modules/video_filter/blend.c

@@ -1100 +1100 @@
-    bool b_even_scanline = i_y_offset % 2;
-
+    fprintf( stderr, "--------------\n" );
+
-    i_dst_pitch = p_dst->p[Y_PLANE].i_pitch;
-    p_dst_y = p_dst->p[Y_PLANE].p_pixels + i_x_offset +
@@ -1132 +1134 @@
-             i_src2_pitch * p_filter->fmt_in.video.i_y_offset;
-
-    const uint8_t *p_trans = p_src2;
-#define p_pal p_filter->fmt_in.video.p_palette->palette
-
@@ -1144 +1145 @@
-         p_src1_v += b_even_scanline ? i_src1_pitch/2 : 0 )
-    {
+        const uint8_t *p_trans = p_src2;
-        b_even_scanline = !b_even_scanline;
-
@@ -1196 +1198 @@
-    i_width &= ~1; /* Needs to be a multiple of 2 */
-
-    const uint8_t *p_trans = p_src2;
-#define p_pal p_filter->fmt_in.video.p_palette->palette
-
@@ -1203 +1204 @@
-         p_dst += i_dst_pitch, p_src1 += i_src1_pitch, p_src2 += i_src2_pitch )
-    {
+        const uint8_t *p_trans = p_src2;
-        /* Draw until we reach the end of the line */
-        for( i_x = 0; i_x < i_width; i_x++, b_even = !b_even )
@@ -1266 +1268 @@
-             i_src2_pitch * p_filter->fmt_in.video.i_y_offset;
-
-    const uint8_t *p_trans = p_src2;
-#define p_pal p_filter->fmt_in.video.p_palette->palette
-#define rgbpal rgbpalette.palette
@@ -1284 +1285 @@
-         p_dst += i_dst_pitch, p_src1 += i_src1_pitch, p_src2 += i_src2_pitch )
-    {
+        const uint8_t *p_trans = p_src2;
-        /* Draw until we reach the end of the line */
-        for( i_x = 0; i_x < i_width; i_x++ )