Changeset e2ff540dbb82d5505d869e422255fa57bc7b202a

Timestamp:

05/08/04 12:16:58 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

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

git-parent:

[d82767397e842b8a2e5cd323bec6482116fed0c2]

git-author:

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

Message:

* modules/video_filter/blend.c: sanity checks.

Files:

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

modules/video_filter/blend.c

@@ -45 +45 @@
-                   int, int );
-static void BlendI420( filter_t *, picture_t *, picture_t *, picture_t *,
-
+, int, int
-static void BlendR16( filter_t *, picture_t *, picture_t *, picture_t *,
-
+, int, int
-static void BlendR24( filter_t *, picture_t *, picture_t *, picture_t *,
-
+, int, int
-static void BlendYUY2( filter_t *, picture_t *, picture_t *, picture_t *,
-
+, int, int
-static void BlendPalI420( filter_t *, picture_t *, picture_t *, picture_t *,
-
+, int, int
-static void BlendPalYUY2( filter_t *, picture_t *, picture_t *, picture_t *,
-
+, int, int
-static void BlendPalRV( filter_t *, picture_t *, picture_t *, picture_t *,
-
+, int, int
-
-/*****************************************************************************
@@ -118 +118 @@
-                   int i_x_offset, int i_y_offset )
-{
+    int i_width, i_height;
+
+    i_width = __MIN( p_filter->fmt_out.video.i_visible_width - i_x_offset,
+                     p_filter->fmt_in.video.i_visible_width );
+
+    i_height = __MIN( p_filter->fmt_out.video.i_visible_height - i_y_offset,
+                      p_filter->fmt_in.video.i_visible_height );
+
+    if( i_width <= 0 || i_height <= 0 ) return;
+
-    if( p_filter->fmt_in.video.i_chroma == VLC_FOURCC('Y','U','V','A') &&
-        ( p_filter->fmt_out.video.i_chroma == VLC_FOURCC('I','4','2','0') ||
@@ -123 +133 @@
-    {
-        BlendI420( p_filter, p_dst, p_dst_orig, p_src,
-
+, i_width, i_height
-        return;
-    }
@@ -130 +140 @@
-    {
-        BlendYUY2( p_filter, p_dst, p_dst_orig, p_src,
-
+, i_width, i_height
-        return;
-    }
@@ -137 +147 @@
-    {
-        BlendR16( p_filter, p_dst, p_dst_orig, p_src,
-
+, i_width, i_height
-        return;
-    }
@@ -145 +155 @@
-    {
-        BlendR24( p_filter, p_dst, p_dst_orig, p_src,
-
+, i_width, i_height
-        return;
-    }
@@ -153 +163 @@
-    {
-        BlendPalI420( p_filter, p_dst, p_dst_orig, p_src,
-
+, i_width, i_height
-        return;
-    }
@@ -160 +170 @@
-    {
-        BlendPalYUY2( p_filter, p_dst, p_dst_orig, p_src,
-
+, i_width, i_height
-        return;
-    }
@@ -169 +179 @@
-    {
-        BlendPalRV( p_filter, p_dst, p_dst_orig, p_src,
-
+, i_width, i_height
-        return;
-    }
@@ -178 +188 @@
-static void BlendI420( filter_t *p_filter, picture_t *p_dst,
-                       picture_t *p_dst_orig, picture_t *p_src,
-
+
+
-{
-    int i_src1_pitch, i_src2_pitch, i_dst_pitch;
@@ -185 +196 @@
-    uint8_t *p_src1_v, *p_src2_v, *p_dst_v;
-    uint8_t *p_trans;
-width, i_height, i_
+
-    vlc_bool_t b_even_scanline = i_y_offset % 2;
-
@@ -231 +242 @@
-              p_src->p[A_PLANE].i_pitch * p_filter->fmt_in.video.i_y_offset;
-
-    i_width = __MIN( p_filter->fmt_out.video.i_visible_width - i_x_offset,
-                     p_filter->fmt_in.video.i_visible_width );
-
-    i_height = __MIN( p_filter->fmt_out.video.i_visible_height - i_y_offset,
-                      p_filter->fmt_in.video.i_visible_height );
-
-#define MAX_TRANS 255
-#define TRANS_BITS  8
@@ -322 +327 @@
-static void BlendR16( filter_t *p_filter, picture_t *p_dst_pic,
-                      picture_t *p_dst_orig, picture_t *p_src,
-
+
+
-{
-    int i_src1_pitch, i_src2_pitch, i_dst_pitch;
@@ -328 +334 @@
-    uint8_t *p_src2_u, *p_src2_v;
-    uint8_t *p_trans;
-width, i_height, i_
+
-    int r, g, b;
-
@@ -359 +365 @@
-              p_src->p[A_PLANE].i_pitch * p_filter->fmt_in.video.i_y_offset;
-
-    i_width = __MIN( p_filter->fmt_out.video.i_visible_width - i_x_offset,
-                     p_filter->fmt_in.video.i_visible_width );
-
-    i_height = __MIN( p_filter->fmt_out.video.i_visible_height - i_y_offset,
-                      p_filter->fmt_in.video.i_visible_height );
-
-#define MAX_TRANS 255
-#define TRANS_BITS  8
@@ -408 +408 @@
-static void BlendR24( filter_t *p_filter, picture_t *p_dst_pic,
-                      picture_t *p_dst_orig, picture_t *p_src,
-
+
+
-{
-    int i_src1_pitch, i_src2_pitch, i_dst_pitch;
@@ -414 +415 @@
-    uint8_t *p_src2_u, *p_src2_v;
-    uint8_t *p_trans;
-width, i_height, i_
+
-    int r, g, b;
-
@@ -445 +446 @@
-              p_src->p[A_PLANE].i_pitch * p_filter->fmt_in.video.i_y_offset;
-
-    i_width = __MIN( p_filter->fmt_out.video.i_visible_width - i_x_offset,
-                     p_filter->fmt_in.video.i_visible_width );
-
-    i_height = __MIN( p_filter->fmt_out.video.i_visible_height - i_y_offset,
-                      p_filter->fmt_in.video.i_visible_height );
-
-#define MAX_TRANS 255
-#define TRANS_BITS  8
@@ -504 +499 @@
-static void BlendYUY2( filter_t *p_filter, picture_t *p_dst_pic,
-                       picture_t *p_dst_orig, picture_t *p_src,
-
+
+
-{
-    int i_src1_pitch, i_src2_pitch, i_dst_pitch;
@@ -510 +506 @@
-    uint8_t *p_src2_u, *p_src2_v;
-    uint8_t *p_trans;
-width, i_height, i_
+
-
-    i_pix_pitch = 2;
@@ -540 +536 @@
-              p_src->p[A_PLANE].i_pitch * p_filter->fmt_in.video.i_y_offset;
-
-    i_width = __MIN( p_filter->fmt_out.video.i_visible_width - i_x_offset,
-                     p_filter->fmt_in.video.i_visible_width );
-
-    i_height = __MIN( p_filter->fmt_out.video.i_visible_height - i_y_offset,
-                      p_filter->fmt_in.video.i_visible_height );
-
-#define MAX_TRANS 255
-#define TRANS_BITS  8
@@ -610 +600 @@
-static void BlendPalI420( filter_t *p_filter, picture_t *p_dst,
-                          picture_t *p_dst_orig, picture_t *p_src,
-
+
+
-{
-    int i_src1_pitch, i_src2_pitch, i_dst_pitch;
@@ -616 +607 @@
-    uint8_t *p_src1_u, *p_dst_u;
-    uint8_t *p_src1_v, *p_dst_v;
-width, i_height, i_
+
-    vlc_bool_t b_even_scanline = i_y_offset % 2;
-
@@ -651 +642 @@
-             i_src2_pitch * p_filter->fmt_in.video.i_y_offset;
-
-    i_width = __MIN( p_filter->fmt_out.video.i_visible_width - i_x_offset,
-                     p_filter->fmt_in.video.i_visible_width );
-
-    i_height = __MIN( p_filter->fmt_out.video.i_visible_height - i_y_offset,
-                      p_filter->fmt_in.video.i_visible_height );
-
-#define MAX_TRANS 255
-#define TRANS_BITS  8
@@ -721 +706 @@
-static void BlendPalYUY2( filter_t *p_filter, picture_t *p_dst_pic,
-                          picture_t *p_dst_orig, picture_t *p_src,
-
+
+
-{
-    int i_src1_pitch, i_src2_pitch, i_dst_pitch;
-    uint8_t *p_src1, *p_src2, *p_dst;
-width, i_height, i_
+
-
-    i_pix_pitch = 2;
@@ -741 +727 @@
-    p_src2 = p_src->p->p_pixels + p_filter->fmt_in.video.i_x_offset +
-             i_src2_pitch * p_filter->fmt_in.video.i_y_offset;
-
-    i_width = __MIN( p_filter->fmt_out.video.i_visible_width - i_x_offset,
-                     p_filter->fmt_in.video.i_visible_width );
-
-    i_height = __MIN( p_filter->fmt_out.video.i_visible_height - i_y_offset,
-                      p_filter->fmt_in.video.i_visible_height );
-
-#define MAX_TRANS 255
@@ -814 +794 @@
-static void BlendPalRV( filter_t *p_filter, picture_t *p_dst_pic,
-                        picture_t *p_dst_orig, picture_t *p_src,
-
+
+
-{
-    int i_src1_pitch, i_src2_pitch, i_dst_pitch;
-    uint8_t *p_src1, *p_src2, *p_dst;
-width, i_height, i_
+
-    int r, g, b;
-    video_palette_t rgbpalette;
@@ -836 +817 @@
-    p_src2 = p_src->p->p_pixels + p_filter->fmt_in.video.i_x_offset +
-             i_src2_pitch * p_filter->fmt_in.video.i_y_offset;
-
-    i_width = __MIN( p_filter->fmt_out.video.i_visible_width - i_x_offset,
-                     p_filter->fmt_in.video.i_visible_width );
-
-    i_height = __MIN( p_filter->fmt_out.video.i_visible_height - i_y_offset,
-                      p_filter->fmt_in.video.i_visible_height );
-
-#define MAX_TRANS 255