Changeset 17167 for lang/actionscript

Timestamp:

08/06/08 18:25:18 (4 months ago)

Author:

gyuque

Message:

rewrote some snippets using macro

Location:

lang/actionscript/ashaardetect/trunk/cv

Files:

• ClassifierTree.as (modified) (2 diffs)
• HaarCascade.as (modified) (6 diffs)
• HaarCascade.mas (added)
• preprocess.rb (added)

lang/actionscript/ashaardetect/trunk/cv/ClassifierTree.as

@@ -9 +9 @@
                 public var rects:Array     = [];
                 public var scaled_rects:Array = [];
+
+                public var sr0:SRect = null;
+                public var sr1:SRect = null;
+                public var sr2:SRect = null;
 
                 public function readRectsFromBin(d:ByteArray):Boolean
@@ -51 +55 @@
                                         sum0 += sr.weight * sr.w * th;
                         }
+
+                        sr0 = scaled_rects[0];
+                        sr1 = scaled_rects[1];
+
+                        if (len > 2)
+                                sr2 = scaled_rects[2];
         
                         scaled_rects[0].weight = -sum0 / area0;

lang/actionscript/ashaardetect/trunk/cv/HaarCascade.as

@@ -155 +155 @@
                 }
 
-                public static function cvRound(v:Number):int
-                {
-                        return v+0.5;
-                }
-
-                private function initCascade(scale:Number, sums:SumImage):void
-                {
-                        var equ_rect_width:int  = cvRound((width-2)*scale);
-                        var equ_rect_height:int = cvRound((height-2)*scale);
+                                private function initCascade(scale:Number, sums:SumImage):void
+                {
+                        var equ_rect_width:int  = int(((width-2)*scale) + 0.5);
+                        var equ_rect_height:int = int(((height-2)*scale) + 0.5);
                         mWeightScale = 1.0/Number(equ_rect_width*equ_rect_height); // cascade->inv_window_area
-                        sums.setEqWindowRect(cvRound(scale), cvRound(scale), equ_rect_width, equ_rect_height);
+                        sums.setEqWindowRect(int((scale) + 0.5), int((scale) + 0.5), equ_rect_width, equ_rect_height);
 //                      correction_ratio = mWeightScale;
                         for each(var stg:ClassifierStage in mStages)
                                 stg.calcScale(scale, mWeightScale, sums);
                 }
-//public static var dcount:int = 0;
-                private function cvRunHaarClassifierCascade(ix:int, iyp:int, start_stage:int, sums:SumImage, limit:int = 99):int
-                {
-/*
+
+                                                private function cvRunHaarClassifierCascade(ix:int, iyp:int, start_stage:int, sums:SumImage, limit:int = 99):int
+                {
+                        /*
                         if( ix < 0 || iy < 0 ||
                                 (ix + width)  >= (sums.width-2 ) ||
@@ -192 +187 @@
                         var cascade_count:int = mStages.length;
                         var sum:Number;
-                        var rects:Array;
+
                         if (cascade_count > limit)
                                 cascade_count = limit;
@@ -214 +209 @@
                                         {
                                                 node = stage.nodes[j];
-                                                t = node.threshold*variance_norm_factor;
-                                                rects = node.scaled_rects;
-                                                r0 = rects[0];
-                                                r1 = rects[1];
+                                                r0 = node.sr0;
+                                                r1 = node.sr1;
                                                 w0 = r0.weight;
 
-                                                base = r0.base + ixyp;
-                                                base_w = base + r0.w;
+                                                base = r0.base + ixyp; 
+                                                base_w = base + r0.w; 
                                                 hh = r0.hh;
                                                 sum =  (raw_sum[base] - raw_sum[base_w] - raw_sum[base + hh] + raw_sum[base_w + hh]) * w0;
 
-                                                base = r1.base + ixyp;
-                                                base_w = base + r1.w;
+                                                base = r1.base + ixyp; 
+                                                base_w = base + r1.w; 
                                                 hh = r1.hh;
                                                 sum += (raw_sum[base] - raw_sum[base_w] - raw_sum[base + hh] + raw_sum[base_w + hh]) * r1.weight;
@@ -233 +226 @@
                                                 b = node.right;
 
-                                                if (sum < t) stage_sum += a;
+                                                if (sum < (node.threshold*variance_norm_factor)) stage_sum += a;
                                                 else  stage_sum += b;
 
@@ -243 +236 @@
                                         {
                                                 node = stage.nodes[j];
-                                                t = node.threshold*variance_norm_factor
-                                                rects = node.scaled_rects;
-                                                r0 = rects[0];
-                                                r1 = rects[1];
-
-                                                base = r0.base + ixyp;
-                                                base_w = base + r0.w;
+                                                r0 = node.sr0;
+                                                r1 = node.sr1;
+
+                                                base = r0.base + ixyp; 
+                                                base_w = base + r0.w; 
                                                 hh = r0.hh;
                                                 sum =  (raw_sum[base] - raw_sum[base_w] - raw_sum[base + hh] + raw_sum[base_w + hh]) * r0.weight;
 
-                                                base = r1.base + ixyp;
-                                                base_w = base + r1.w;
+                                                base = r1.base + ixyp; 
+                                                base_w = base + r1.w; 
                                                 hh = r1.hh;
                                                 sum += (raw_sum[base] - raw_sum[base_w] - raw_sum[base + hh] + raw_sum[base_w + hh]) * r1.weight;
 
-                                                if (rects[2])
+                                                if (node.sr2)
                                                 {
-                                                        r2 = rects[2];
-                                                        base = r2.base + ixyp;
-                                                        base_w = base + r2.w;
-                                                        hh = r2.hh;
+                                                        r2 = node.sr2;
+                                                        base = r2.base + ixyp; 
+                                                base_w = base + r2.w; 
+                                                hh = r2.hh;
                                                         sum += (raw_sum[base] - raw_sum[base_w] - raw_sum[base + hh] + raw_sum[base_w + hh]) * r2.weight;
                                                 }
@@ -269 +260 @@
                                                 a = node.left;
                                                 b = node.right;
-                                                if (sum < t) stage_sum += a;
+                                                if (sum < (node.threshold*variance_norm_factor)) stage_sum += a;
                                                 else  stage_sum += b;
                                         }