Changeset 06ff9b78d59171ce194af316dffbb62faf460c79

Timestamp:

05/09/08 00:44:01 (3 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1220568241 +0200

git-parent:

[418f6bcaa716dc0ff522a261909b805f33d847da]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1220568241 +0200

Message:

Simplify.

Files:

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

modules/video_filter/blend.c

@@ -363 +363 @@
-}
-
- const uint8_t *p_src,
+
-                              int i_offset0, int i_offset1, int i_offset2,
-                              int c0, int c1, int c2, int i_alpha,
-                              bool b_do12 )
-{
-src
+dst
-    if( b_do12 )
-    {
-src
-src
-
-
-
- const uint16_t *p_src,
+dst
+dst
+
+
+
+
-                             int R, int G, int B, int i_alpha,
-                             const video_format_t *p_fmt )
-{
-src
+dst
-    const int r = ( i_pix & p_fmt->i_rmask ) >> p_fmt->i_lrshift;
-    const int g = ( i_pix & p_fmt->i_gmask ) >> p_fmt->i_lgshift;
@@ -518 +518 @@
-
-            vlc_blend_rgb16( (uint16_t*)&p_dst[i_x * i_pix_pitch],
-                             (const uint16_t*)&p_dst[i_x * i_pix_pitch],
-                             r, g, b, i_trans, &p_filter->fmt_out.video );
-        }
@@ -641 +640 @@
-
-                vlc_blend_packed( &p_dst[ i_x * i_pix_pitch],
-                                  &p_dst[i_x * i_pix_pitch],
-                                  i_rindex, i_gindex, i_bindex,
-                                  r, g, b, i_alpha, true );
@@ -713 +711 @@
-                }
-
- &p_dst[i_x * 2],
+
-                                  i_l_offset, i_u_offset, i_v_offset,
-                                  p_src_y[i_x], i_u, i_v, i_trans, true );
@@ -900 +898 @@
-
-            vlc_blend_rgb16( (uint16_t*)&p_dst[i_x * i_pix_pitch],
-                             (const uint16_t*)&p_dst[i_x * i_pix_pitch],
-                             r, g, b, i_alpha, &p_filter->fmt_out.video );
-        }
@@ -955 +952 @@
-                        p_src_y[i_x], p_src_u[i_x/2], p_src_v[i_x/2] );
-
- &p_dst[i_x * i_pix_pitch],
+
-                              i_rindex, i_gindex, i_bindex, r, g, b, i_alpha, true );
-        }
@@ -1010 +1007 @@
-
-            /* Blending */
- &p_dst[i_x * 2],
+
-                              i_l_offset, i_u_offset, i_v_offset,
-                              p_src_y[i_x], p_src_u[i_x/2], p_src_v[i_x/2], i_alpha, b_even );
@@ -1142 +1139 @@
-                }
-
- &p_dst[i_x * 2],
+
-                                  i_l_offset, i_u_offset, i_v_offset,
-                                  p_pal[p_src[i_x]][0], i_u, i_v, i_trans, true );
@@ -1208 +1205 @@
-            if( p_filter->fmt_out.video.i_chroma == FCC_RV15 || p_filter->fmt_out.video.i_chroma == FCC_RV16 )
-                vlc_blend_rgb16( (uint16_t*)&p_dst[i_x * i_pix_pitch],
-                                 (const uint16_t*)&p_dst[i_x * i_pix_pitch],
-                                  rgbpal[p_src[i_x]][0], rgbpal[p_src[i_x]][1], rgbpal[p_src[i_x]][2],
-                                  i_trans,
-                                  &p_filter->fmt_out.video );
-            else
- &p_dst[i_x * i_pix_pitch],
+
-                                  i_rindex, i_gindex, i_bindex,
-                                  rgbpal[p_src[i_x]][0], rgbpal[p_src[i_x]][1], rgbpal[p_src[i_x]][2],
@@ -1337 +1333 @@
-
-            /* Blending */
- &p_dst[i_x * i_pix_pitch],
+
-                              i_rindex, i_gindex, i_bindex,
-                              R, G, B, i_trans, true );
@@ -1383 +1379 @@
-            /* Blending */
-            vlc_blend_rgb16( (uint16_t*)&p_dst[i_x * i_pix_pitch],
-                             (const uint16_t*)&p_dst[i_x * i_pix_pitch],
-                             R, G, B, i_trans, &p_filter->fmt_out.video );
-        }
@@ -1439 +1434 @@
-            rgb_to_yuv( &y, &u, &v, R, G, B );
-
- &p_dst[i_x * 2],
+
-                              i_l_offset, i_u_offset, i_v_offset,
-                              y, u, v, i_trans, b_even );