Changeset 1360a812c7f40bf8e5c2caaaffaab6cf4aaa8271

Timestamp:

02/02/07 21:51:11 (2 years ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

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

git-parent:

[0a40fae13a6daf6e924f83c10b3064f72087ae7a]

git-author:

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

Message:

Copy clip_uint8() function from ffmpeg and replace where applicable for video filters.

Files:

• include/vlc_common.h (modified) (1 diff)
• modules/video_filter/adjust.c (modified) (4 diffs)
• modules/video_filter/gradient.c (modified) (1 diff)
• modules/video_filter/panoramix.c (modified) (7 diffs)

include/vlc_common.h

@@ -628 +628 @@
-}
-
+/* function imported from libavutil/common.h */
+static inline uint8_t clip_uint8_vlc( int32_t a )
+{
+    if( a&(~255) ) return (-a)>>31;
+    else           return a;
+}
+
-/* Malloc with automatic error */
-#define MALLOC_VOID( var, type ) { var = (type*)malloc( sizeof( type) ); \

modules/video_filter/adjust.c

@@ -106 +106 @@
-{
-};
-
-inline static int32_t clip( int32_t a )
-{
-    return (a > 255) ? 255 : (a < 0) ? 0 : a;
-}
-
-/*****************************************************************************
@@ -260 +255 @@
-        for( i = 0 ; i < 256 ; i++ )
-        {
-
+_uint8_vlc
-        }
-
@@ -266 +261 @@
-        for( i = 0 ; i < 256 ; i++ )
-        {
-
+_uint8_vlc
-        }
-    }
@@ -344 +339 @@
-#define WRITE_UV_CLIP() \
-    i_u = *p_in++ ; i_v = *p_in_v++ ; \
-
+_uint8_vlc
-                           * i_sat) >> 8) + 128); \
-
+_uint8_vlc
-                           * i_sat) >> 8) + 128)
-

modules/video_filter/gradient.c

@@ -419 +419 @@
-        {
-            FOR
-
-
-
-
+
-            }}
-        }

modules/video_filter/panoramix.c

@@ -41 +41 @@
-    #ifdef SYS_MINGW32
-        #include <windows.h>
- 
-   
+
+
-    #endif
-    #define GAMMA        1
@@ -368 +368 @@
-#ifdef OVERLAP
-    p_vout->p_sys->i_offset_x = var_CreateGetInteger( p_vout, "offset-x" );
-    
+
-    p_vout->p_sys->b_autocrop = !(var_CreateGetInteger( p_vout, "crop-ratio" ) == 0);
-    if (!p_vout->p_sys->b_autocrop) p_vout->p_sys->b_autocrop = var_CreateGetInteger( p_vout, "autocrop" );     
@@ -384 +384 @@
-    p_vout->p_sys->i_ratio_max = var_CreateGetInteger( p_vout, "autocrop-ratio-max" ); // in crop module with autocrop ...
-    p_vout->p_sys->i_ratio = var_CreateGetInteger( p_vout, "crop-ratio" ); // in crop module with manual ratio ...  
-
+
-    p_vout->p_sys->a_2 = d_p * p_vout->p_sys->bz_begin - (double)(d_p * d_p / (d_p - 1)) * p_vout->p_sys->bz_middle + (double)(d_p / (d_p - 1)) * p_vout->p_sys->bz_end;
-    p_vout->p_sys->a_1 = -(d_p + 1) * p_vout->p_sys->bz_begin + (double)(d_p * d_p / (d_p - 1)) * p_vout->p_sys->bz_middle - (double)(1 / (d_p - 1)) * p_vout->p_sys->bz_end;
@@ -499 +499 @@
-
-#ifdef PACKED_YUV
-/*****************************************************************************
- * Clip: clip an 32 bits int in 8 bits
- *****************************************************************************/
-inline static int32_t clip( int32_t a )
-{
-    return (a > 255) ? 255 : (a < 0) ? 0 : a;
-}
-
-/*****************************************************************************
@@ -517 +510 @@
-
- if (input < 0.5)
-
+_uint8
- else
-
+_uint8
-
-}
@@ -544 +537 @@
-            i_window_width  = GetSystemMetrics(SM_CXSCREEN);
-            i_window_height = GetSystemMetrics(SM_CYSCREEN);
-            
+
-            Display *p_display = XOpenDisplay( "" );
-            if (p_vout->p_sys->b_xinerama)
@@ -555 +548 @@
-                i_window_width = DisplayWidth(p_display, 0);
-                i_window_height = DisplayHeight(p_display, 0);
- 
-     
-  
+
+
+
-#endif
-        var_SetInteger( p_vout, "width", i_window_width);