Video filter fixes:

 * colorthres.c: validate input chroma.
 * erase.c: fix bluring application limit (prevents out of bounds access).
 * gaussianblur.c: validate input chroma and add planar YUV 4:2:2 support.
 * psychedelic.c: check image_Convert return value (it fails for I422 which would then trigger a segfault due to a NULL pointer being dereferenced).
 * rotate.c: validate input chroma, add planar YUV 4:2:2 support and misc code fixes or simplifications.

diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c
index 8ee41f9b1a6ba82e991155f035e4d6d53f90f180..831da9a5e0ab4364e83197819bfd71ee40f1e993 100644 (file)
--- a/modules/video_filter/colorthres.c
+++ b/modules/video_filter/colorthres.c
@@ -94,7 +94,13 @@ static int Create( vlc_object_t *p_this )
     filter_t *p_filter = (filter_t *)p_this;
 
     /* XXX: we might need to add/remove some FOURCCs ... */
-    if(   p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','0') )
+    if(   p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','0')
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','Y','U','V')
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('J','4','2','0')
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','V','1','2')
+
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','2')
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('J','4','2','2') )
     {
         msg_Err( p_filter, "Unsupported input chroma (%4s)",
                  (char*)&(p_filter->fmt_in.video.i_chroma) );

diff --git a/modules/video_filter/erase.c b/modules/video_filter/erase.c
index b329bc9730dd4a8e0196bca1dc1cf6f6fc767fb4..f6dc419e217f7140389e0d32766261c794f5b25b 100644 (file)
--- a/modules/video_filter/erase.c
+++ b/modules/video_filter/erase.c
@@ -383,7 +383,7 @@ static void FilterErase( filter_t *p_filter, picture_t *p_inpic,
         i_height = __MIN( i_visible_lines - i_y - 2, i_height );
         /* Make sure that we start at least 2 lines from the top (since our
          * bluring algorithm uses the 2 previous lines) */
-        y = __MAX(i_y-2,0);
+        y = __MAX(i_y,2);
         p_outpix = p_outpic->p[i_plane].p_pixels + (i_y+y)*i_pitch + i_x;
         for( ; y < i_height; y++, p_mask += i_mask_pitch, p_outpix += i_pitch )
         {

diff --git a/modules/video_filter/gaussianblur.c b/modules/video_filter/gaussianblur.c
index 3fb19b1686db9a2dba3c20337a5e37ab1a5ad43f..53e17da5ca9fedfc393d07a62407170bbe72087f 100644 (file)
--- a/modules/video_filter/gaussianblur.c
+++ b/modules/video_filter/gaussianblur.c
@@ -123,6 +123,27 @@ static int Create( vlc_object_t *p_this )
 {
     filter_t *p_filter = (filter_t *)p_this;
 
+    if(   p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','0')
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','Y','U','V')
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('J','4','2','0')
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','V','1','2')
+
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','2')
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('J','4','2','2')
+      )
+    {
+        /* We only want planar YUV 4:2:0 or 4:2:2 */
+        msg_Err( p_filter, "Unsupported input chroma (%4s)",
+                 (char*)&(p_filter->fmt_in.video.i_chroma) );
+        return VLC_EGENERIC;
+    }
+
+    if( p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma )
+    {
+        msg_Err( p_filter, "Input and output chromas don't match" );
+        return VLC_EGENERIC;
+    }
+
     p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
     if( p_filter->p_sys == NULL )
     {
@@ -286,7 +307,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
         const int i_pitch = p_pic->p[i_plane].i_pitch;
 
         int i_line, i_col;
-        const int factor = i_plane ? 1 : 0;
+        const int x_factor = p_pic->p[Y_PLANE].i_visible_pitch/i_visible_pitch-1;
+        const int y_factor = p_pic->p[Y_PLANE].i_visible_lines/i_visible_lines-1;
 
         for( i_line = 0 ; i_line < i_visible_lines ; i_line++ )
         {
@@ -299,16 +321,16 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 #endif
                 int x;
                 const int c = i_line*i_pitch+i_col;
-                for( x = __MAX( -i_dim, -i_col*(factor+1) );
-                     x <= __MIN( i_dim, (i_visible_pitch - i_col)*(factor+1) + 1 );
+                for( x = __MAX( -i_dim, -i_col*(x_factor+1) );
+                     x <= __MIN( i_dim, (i_visible_pitch - i_col)*(x_factor+1) + 1 );
                      x++ )
                 {
 #ifdef DONT_USE_FLOATS
                     value += pi_distribution[x+i_dim]
-                           * p_in[c+(x>>factor)];
+                           * p_in[c+(x>>x_factor)];
 #else
                     value += pf_distribution[x+i_dim]
-                           * (float)p_in[c+(x>>factor)];
+                           * (float)p_in[c+(x>>x_factor)];
 #endif
                 }
 #ifdef DONT_USE_FLOATS
@@ -329,22 +351,22 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 #endif
                 int y;
                 const int c = i_line*i_pitch+i_col;
-                for( y = __MAX( -i_dim, (-i_line)*(factor+1) );
-                     y <= __MIN( i_dim, (i_visible_lines - i_line)*(factor+1) - 1 );
+                for( y = __MAX( -i_dim, (-i_line)*(y_factor+1) );
+                     y <= __MIN( i_dim, (i_visible_lines - i_line)*(y_factor+1) - 1 );
                      y++ )
                 {
 #ifdef DONT_USE_FLOATS
                     value += pi_distribution[y+i_dim]
-                           * pi_buffer[c+(y>>factor)*i_pitch];
+                           * pi_buffer[c+(y>>y_factor)*i_pitch];
 #else
                     value += pf_distribution[y+i_dim]
-                           * pf_buffer[c+(y>>factor)*i_pitch];
+                           * pf_buffer[c+(y>>y_factor)*i_pitch];
 #endif
                 }
 #ifdef DONT_USE_FLOATS
-                p_out[c] = (uint8_t)(value/pi_scale[(i_line<<factor)*(i_pitch<<factor)+(i_col<<factor)]);
+                p_out[c] = (uint8_t)(value/pi_scale[(i_line<<y_factor)*(i_pitch<<x_factor)+(i_col<<x_factor)]);
 #else
-                p_out[c] = (uint8_t)(value*pf_scale[(i_line<<factor)*(i_pitch<<factor)+(i_col<<factor)]);
+                p_out[c] = (uint8_t)(value*pf_scale[(i_line<<y_factor)*(i_pitch<<x_factor)+(i_col<<x_factor)]);
 #endif
             }
         }

diff --git a/modules/video_filter/psychedelic.c b/modules/video_filter/psychedelic.c
index 7e7689f65af3a7b10095859f820eaa746743be11..8067584c1674f80f1ee352b8a22f45bac8a6bb84 100644 (file)
--- a/modules/video_filter/psychedelic.c
+++ b/modules/video_filter/psychedelic.c
@@ -184,6 +184,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     p_converted = image_Convert( p_filter->p_sys->p_image, p_pic,
                                  &(p_pic->format), &fmt_out );
 
+    if( p_converted )
+    {
 #define copyimage( plane, b ) \
     for( y=0; y<p_converted->p[plane].i_visible_lines; y++) { \
     for( x=0; x<p_converted->p[plane].i_visible_pitch; x++) { \
@@ -204,6 +206,11 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 #undef copyimage
 
     p_converted->pf_release( p_converted );
+    }
+    else
+    {
+        msg_Err( p_filter, "Image scaling failed miserably." );
+    }
 
     p_filter->p_sys->x += p_filter->p_sys->xinc;
     p_filter->p_sys->y += p_filter->p_sys->yinc;

diff --git a/modules/video_filter/rotate.c b/modules/video_filter/rotate.c
index ec491310b556d9585e122c74e459a846cf23514c..85a7240e02efb06a554218e69543aff835652160 100644 (file)
--- a/modules/video_filter/rotate.c
+++ b/modules/video_filter/rotate.c
@@ -63,7 +63,7 @@ vlc_module_begin();
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
 
-    add_integer_with_range( FILTER_PREFIX "angle", 0, 0, 359, NULL,
+    add_integer_with_range( FILTER_PREFIX "angle", 30, 0, 359, NULL,
         ANGLE_TEXT, ANGLE_LONGTEXT, VLC_FALSE );
 
     add_shortcut( "rotate" );
@@ -99,6 +99,27 @@ static int Create( vlc_object_t *p_this )
     filter_t *p_filter = (filter_t *)p_this;
     filter_sys_t *p_sys;
 
+    if(   p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','0')
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','Y','U','V')
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('J','4','2','0')
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','V','1','2')
+
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','2')
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('J','4','2','2')
+      )
+    {
+        /* We only want planar YUV 4:2:0 or 4:2:2 */
+        msg_Err( p_filter, "Unsupported input chroma (%4s)",
+                 (char*)&(p_filter->fmt_in.video.i_chroma) );
+        return VLC_EGENERIC;
+    }
+
+    if( p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma )
+    {
+        msg_Err( p_filter, "Input and output chromas don't match" );
+        return VLC_EGENERIC;
+    }
+
     /* Allocate structure */
     p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
     if( p_filter->p_sys == NULL )
@@ -113,9 +134,11 @@ static int Create( vlc_object_t *p_this )
 
     p_sys->i_angle = var_CreateGetIntegerCommand( p_filter,
                                                   FILTER_PREFIX "angle" ) * 10;
-    var_CreateGetIntegerCommand( p_filter, FILTER_PREFIX "deciangle" );
+    var_Create( p_filter, FILTER_PREFIX "deciangle",
+                VLC_VAR_INTEGER|VLC_VAR_ISCOMMAND );
     var_AddCallback( p_filter, FILTER_PREFIX "angle", RotateCallback, p_sys );
-    var_AddCallback( p_filter, FILTER_PREFIX "deciangle", PreciseRotateCallback, p_sys );
+    var_AddCallback( p_filter, FILTER_PREFIX "deciangle",
+                     PreciseRotateCallback, p_sys );
 
     cache_trigo( p_sys->i_angle, &p_sys->i_sin, &p_sys->i_cos );
 
@@ -162,6 +185,9 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
         const int i_pitch         = p_pic->p[i_plane].i_pitch;
         const int i_hidden_pitch  = i_pitch - i_visible_pitch;
 
+        const int i_aspect = ( i_visible_lines * p_pic->p[Y_PLANE].i_visible_pitch ) / ( p_pic->p[Y_PLANE].i_visible_lines * i_visible_pitch );
+        /* = 2 for U and V planes in YUV 4:2:2, = 1 otherwise */
+
         const int i_line_center = i_visible_lines>>1;
         const int i_col_center  = i_visible_pitch>>1;
 
@@ -172,11 +198,11 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 
         const uint8_t black_pixel = ( i_plane == Y_PLANE ) ? 0x00 : 0x80;
 
-        const int i_line_next =  i_cos-i_sin*i_visible_pitch;
-        const int i_col_next  = -i_sin-i_cos*i_visible_pitch;
-        int i_line_orig0 = - i_cos * i_line_center
-                           - i_sin * i_col_center + (1<<11);
-        int i_col_orig0 =    i_sin * i_line_center
+        const int i_line_next =  i_cos / i_aspect -i_sin*i_visible_pitch;
+        const int i_col_next  = -i_sin / i_aspect -i_cos*i_visible_pitch;
+        int i_line_orig0 = ( - i_cos * i_line_center / i_aspect
+                             - i_sin * i_col_center + (1<<11) );
+        int i_col_orig0 =    i_sin * i_line_center / i_aspect
                            - i_cos * i_col_center + (1<<11);
         for( ; p_outendline < p_outend;
              p_out += i_hidden_pitch, p_outendline += i_pitch,
@@ -185,7 +211,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
             for( ; p_out < p_outendline;
                  p_out++, i_line_orig0 += i_sin, i_col_orig0 += i_cos )
             {
-                const int i_line_orig = (i_line_orig0>>12) + i_line_center;
+                const int i_line_orig = (i_line_orig0>>12)*i_aspect + i_line_center;
                 const int i_col_orig  = (i_col_orig0>>12)  + i_col_center;
                 const uint8_t* p_orig_offset = p_in + i_line_orig * i_pitch
                                                 + i_col_orig;
@@ -211,17 +237,17 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 
                         if(  ( i_col_orig < i_visible_pitch - 1)
                              && ( i_line_orig >= 0 ) )
-                            i_colpix=*p_orig_offset;
+                            i_colpix = *p_orig_offset;
 
                         p_orig_offset+=i_pitch;
                         if( ( i_line_orig < i_visible_lines - 1)
                             && ( i_col_orig  < i_visible_pitch - 1) )
-                            i_nexpix=*p_orig_offset;
+                            i_nexpix = *p_orig_offset;
 
                         p_orig_offset--;
                         if(  ( i_line_orig < i_visible_lines - 1)
                              && ( i_col_orig >= 0 ) )
-                            i_linpix=*p_orig_offset;
+                            i_linpix = *p_orig_offset;
 
                         unsigned int temp = 0;
                         temp+= i_curpix *
@@ -264,32 +290,24 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 }
 
 /*****************************************************************************
- *
+ * Angle modification callbacks.
  *****************************************************************************/
 static int RotateCallback( vlc_object_t *p_this, char const *psz_var,
                            vlc_value_t oldval, vlc_value_t newval,
                            void *p_data )
 {
     filter_sys_t *p_sys = (filter_sys_t *)p_data;
-
-    if( !strcmp( psz_var, "rotate-angle" ) )
-    {
-        p_sys->i_angle = newval.i_int*10;
-
-        cache_trigo( p_sys->i_angle, &p_sys->i_sin, &p_sys->i_cos );
-    }
+    p_sys->i_angle = newval.i_int*10;
+    cache_trigo( p_sys->i_angle, &p_sys->i_sin, &p_sys->i_cos );
     return VLC_SUCCESS;
 }
+
 static int PreciseRotateCallback( vlc_object_t *p_this, char const *psz_var,
                            vlc_value_t oldval, vlc_value_t newval,
                            void *p_data )
 {
     filter_sys_t *p_sys = (filter_sys_t *)p_data;
-
-    if( !strcmp( psz_var, "rotate-deciangle" ) )
-    {
-        p_sys->i_angle = newval.i_int;
-        cache_trigo( p_sys->i_angle, &p_sys->i_sin, &p_sys->i_cos );
-    }
+    p_sys->i_angle = newval.i_int;
+    cache_trigo( p_sys->i_angle, &p_sys->i_sin, &p_sys->i_cos );
     return VLC_SUCCESS;
 }