Changeset 6ec82b018ceee54f37157333ce6bc74dd23b57cb

Timestamp:

16/04/07 23:59:39 (2 years ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1176760779 +0000

git-parent:

[c7bcb18012ebac706106e40b1d67ddd830e130e3]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1176760779 +0000

Message:

• erase.c: add bluring effect, fix a bunch of bugs and compile warnings. It now looks good.
  
• deinterlace.c: compile warning fix.
  

Files:

• modules/video_filter/deinterlace.c (modified) (1 diff)
• modules/video_filter/erase.c (modified) (5 diffs)

modules/video_filter/deinterlace.c

@@ -370 +370 @@
-{
-    vout_thread_t *p_real_vout = NULL;
-
+
+
-
-    msg_Dbg( p_vout, "spawning the real video output" );

modules/video_filter/erase.c

@@ -95 +95 @@
-{
-    image_handler_t *p_image;
-
+
+
+
-    fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
-    if( p_filter->p_sys->p_mask )
@@ -239 +241 @@
-        uint8_t *p_mask = p_sys->p_mask->A_PIXELS;
-
+        int i_x = p_sys->i_x, i_y = p_sys->i_y;
-        int x, y;
-        int i_height = i_mask_visible_lines;
-        int i_width = i_mask_visible_pitch;
-
+ /* U_PLANE or V_PLANE */
-        {
-
-
+
+
+
+
-        }
-(i_plane?p_sys->i_y/2:p_sys->i_y)
-= __MIN( i_visible_pitch - (i_plane?p_sys->i_x/2:p_sys->i_x), i_width
+i_y
+ = __MIN( i_visible_pitch - i_x, i_width 
-
-        p_filter->p_libvlc->pf_memcpy( p_outpix, p_inpix, i_pitch * i_lines );
-
-
-
+
-        {
-
-
-
-
-
-
-
-
-
+
+
+
+
-            {
-                prev = *(p_outpix-1);
-            }
-p_sys->
+
-            {
-                prev = *(p_outpix-i_pitch);
@@ -294 +293 @@
-                        {
-                            if( x0 == x ) x0++;
-(i_plane?p_sys->i_x/2:p_sys->i_x)+i_width
+x0
-                            {
-                                next_x = x0;
@@ -305 +304 @@
-                            }
-                        }
+                        if( !( i_x || y || i_y ) )
+                            prev = next;
-                    }
-                    /* interpolate new value */
-
+;//
-                }
-                else
@@ -316 +317 @@
-            }
-        }
+
+        /* Vertical bluring */
+        p_mask = p_sys->p_mask->A_PIXELS;
+        i_height = i_mask_visible_lines / (i_plane?2:1);
+        i_height = __MIN( i_visible_lines - i_y - 2, i_height );
+        for( y = __MAX(i_y-2,0); y < i_height;
+             y++, p_mask += i_mask_pitch )
+        {
+            p_outpix = p_outpic->p[i_plane].p_pixels + (i_y+y)*i_pitch + i_x;
+            for( x = 0; x < i_width; x++ )
+            {
+                if( p_mask[i_plane?2*x:x] > 127 )
+                {
+                    p_outpix[x] =
+                        ( (p_outpix[x-2*i_pitch]<<1)       /* 2 */
+                        + (p_outpix[x-i_pitch]<<2)         /* 4 */
+                        + (p_outpix[x]<<2)                 /* 4 */
+                        + (p_outpix[x+i_pitch]<<2)         /* 4 */
+                        + (p_outpix[x+2*i_pitch]<<1) )>>4; /* 2 */
+                }
+            }
+        }
+
-    }
-}