Changeset 2edcd5be1ce653a36cce752dc4704a0edf92a311

Timestamp:

22/01/05 21:35:24 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1106426124 +0000

git-parent:

[e8e8633f716bc2126688aefddc4fdac16bee734a]

git-author:

Gildas Bazin <gbazin@videolan.org> 1106426124 +0000

Message:

* modules/video_filter/blend.c: chroma fixes for the YUY2 blending.

Files:

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

modules/video_filter/blend.c

@@ -513 +513 @@
-    uint8_t *p_trans;
-    int i_x, i_y, i_pix_pitch, i_trans;
+    vlc_bool_t b_even = !((i_x_offset + p_filter->fmt_out.video.i_x_offset)%2);
-
-    i_pix_pitch = 2;
@@ -542 +543 @@
-              p_src->p[A_PLANE].i_pitch * p_filter->fmt_in.video.i_y_offset;
-
+    i_width = (i_width >> 1) << 1; /* Needs to be a multiple of 2 */
+
-#define MAX_TRANS 255
-#define TRANS_BITS  8
@@ -552 +555 @@
-    {
-        /* Draw until we reach the end of the line */
- += 2
+++, b_even = !b_even
-        {
-            i_trans = ( p_trans[i_x] * i_alpha ) / 255;
@@ -563 +566 @@
-                /* Completely opaque. Completely overwrite underlying pixel */
-                p_dst[i_x * 2]     = p_src2_y[i_x];
-
-
+
+
+
+
+
+
-            }
-            else
@@ -572 +579 @@
-                    (uint16_t)p_src1[i_x * 2] * (MAX_TRANS - i_trans) )
-                    >> TRANS_BITS;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -721 +714 @@
-    uint8_t *p_src1, *p_src2, *p_dst;
-    int i_x, i_y, i_pix_pitch, i_trans;
+    vlc_bool_t b_even = !((i_x_offset + p_filter->fmt_out.video.i_x_offset)%2);
-
-    i_pix_pitch = 2;
@@ -737 +731 @@
-             i_src2_pitch * p_filter->fmt_in.video.i_y_offset;
-
+    i_width = (i_width >> 1) << 1; /* Needs to be a multiple of 2 */
+
-#define MAX_TRANS 255
-#define TRANS_BITS  8
@@ -747 +743 @@
-    {
-        /* Draw until we reach the end of the line */
- += 2
+++, b_even = !b_even
-        {
-            i_trans = ( p_pal[p_trans[i_x]][3] * i_alpha ) / 255;
@@ -757 +753 @@
-            {
-                /* Completely opaque. Completely overwrite underlying pixel */
-        /* NOTE: YUVP is actually YVUP */
-                p_dst[i_x * 2]     = p_pal[p_src2[i_x]][0];
-
-
+
+
+
+
+
+
-            }
-            else
-            {
-                /* Blending */
-        /* NOTE: YUVP is actually YVUP */
-                p_dst[i_x * 2]     = ( (uint16_t)p_pal[p_src2[i_x]][0] *
-                    i_trans + (uint16_t)p_src1[i_x * 2] *
-                    (MAX_TRANS - i_trans) ) >> TRANS_BITS;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            }
-        }