Changeset a11a00

Timestamp:

04/27/10 10:53:09 (3 years ago)

Author:

Dan Dennedy <dan@…>

Branches:

b1faa09f4dfcf63d19d2cb9fc598a583e1df1c33

Children:

649580

Parents:

4025fc

git-author:

Dan Dennedy <dan@…> (04/27/10 10:53:09)

git-committer:

Dan Dennedy <dan@…> (04/27/10 10:53:09)

Message:

Fix segfault in scale0tilt on insane widths (ticket:18).

Patch from Burkhard Plaum with indentation fix by me.

File:

• src/filter/scale0tilt/scale0tilt.c (modified) (7 diffs)

src/filter/scale0tilt/scale0tilt.c

@@ -24 +24 @@
 #include <string.h>
 
+#define EPSILON 1e-6
+
 typedef struct scale0tilt_instance {
         double cl, ct, cr, cb;
@@ -32 +34 @@
         gavl_video_frame_t* frame_src;
         gavl_video_frame_t* frame_dst;
+        int do_scale;
 } scale0tilt_instance_t;
 
@@ -38 +41 @@
         float dst_x, dst_y, dst_w, dst_h;
         float src_x, src_y, src_w, src_h;
-
+        
+        inst->do_scale = 1;
         src_x = inst->w * inst->cl;
         src_y = inst->h * inst->ct;
@@ -48 +52 @@
         dst_w = inst->w * (1.0 - inst->cl - inst->cr) * inst->sx;
         dst_h = inst->h * (1.0 - inst->ct - inst->cb) * inst->sy;
+
+        if((dst_w < EPSILON) || (dst_h < EPSILON) || 
+           (src_w < EPSILON) || (src_h < EPSILON)) {
+                inst->do_scale = 0;
+                return;
+        }
 
         if ( dst_x + dst_w > inst->w ) {
@@ -69 +79 @@
                 dst_y = 0;
         }
+
+        if((dst_w < EPSILON) || (dst_h < EPSILON) ||
+           (src_w < EPSILON) || (src_h < EPSILON)) {
+                inst->do_scale = 0;
+                return;
+        }
+
         gavl_video_options_t* options = gavl_video_scaler_get_options( inst->video_scaler );
 
@@ -74 +91 @@
         gavl_video_format_t format_dst;
 
-        memset(&format_src, 0, sizeof(format_src));
-        memset(&format_dst, 0, sizeof(format_dst));
+        memset(&format_src, 0, sizeof(format_src));
+        memset(&format_dst, 0, sizeof(format_dst));
 
         format_dst.frame_width  = inst->w;
@@ -275 +292 @@
                 outframe[i] = 0;
         }
-        gavl_video_scaler_scale( inst->video_scaler, inst->frame_src, inst->frame_dst );
-}
-
+        if(inst->do_scale)
+                gavl_video_scaler_scale( inst->video_scaler, inst->frame_src, inst->frame_dst );
+}
+