Changeset 1773

Timestamp:

Feb 2, 2008 4:37:43 PM (16 years ago)

Author:

nanang

Message:

Ticket #461:
Fixed bug in find_matched_window(), the ref pointer is not correctly set.

File:

• pjproject/branches/projects/jbuf2/pjmedia/src/pjmedia/jbuf2.c (modified) (4 diffs)

pjproject/branches/projects/jbuf2/pjmedia/src/pjmedia/jbuf2.c

@@ -452 +452 @@
 {
     PJ_UNUSED_ARG(jb);
+    PJ_ASSERT_RETURN(jb, PJ_EINVAL);
 
     return PJ_SUCCESS;
@@ -881 +882 @@
 }
 
-
-/* Find matching samples pattern */
+/* Window len for matching samples */
 #define MATCH_WINDOW_LEN    8
 
+/* Find matching samples pattern, longest possible distance for !left_ref */
 static pj_status_t find_matched_window(jb_vbuf *buf, pj_bool_t left_ref, 
+                                       int pref_dist,
+                                       unsigned *ref_, unsigned *match_)
+{
+    const int MATCH_THRESHOLD = MATCH_WINDOW_LEN*1200;
+    unsigned ref, ptr, end;
+    int i, similarity, s1, s2;
+
+    if (buf->size/2 < MATCH_WINDOW_LEN * 2) {
+        TRACE__((THIS_FILE, "Buf size too small (%d) to perform matching",
+                 buf->size));
+        return PJ_ENOTFOUND;
+    }
+
+    /* Check minimum distance */
+    pj_assert(pref_dist >= MATCH_WINDOW_LEN);
+
+    if (left_ref) {
+        ref = 0;
+        end = MATCH_WINDOW_LEN - 1;
+        if (buf->size/2 > pref_dist + MATCH_WINDOW_LEN)
+            ptr = pref_dist;
+        else
+            ptr = buf->size/2 - MATCH_WINDOW_LEN;
+    } else {
+        ref = buf->size/2 - MATCH_WINDOW_LEN;
+
+        /* do not +1, this is for insertion, inserting 0 sample is no use */
+        end = ref - MATCH_WINDOW_LEN;
+        if ((int)ref > pref_dist)
+            ptr = ref - pref_dist;
+        else
+            ptr = 0;
+    }
+
+    *ref_ = ref;
+
+    while (ptr != end) {
+        similarity = 0;
+        for (i = 0; i < MATCH_WINDOW_LEN; ++i) {
+            s1 = jb_vbuf_get_sample(buf, ref+i);
+            s2 = jb_vbuf_get_sample(buf, ptr+i);
+            similarity += PJ_ABS(s1 - s2);
+            if (similarity >= MATCH_THRESHOLD)
+                break;
+        }
+
+        if (similarity <= MATCH_THRESHOLD) {
+            *match_ = ptr;
+            return PJ_SUCCESS;
+        }
+        ptr += left_ref ? -1 : 1;
+    }
+
+    return PJ_ENOTFOUND;
+}
+
+/* Find matching samples pattern, shortest possible distance for !left_ref */
+static pj_status_t find_matched_window2(jb_vbuf *buf, pj_bool_t left_ref, 
                                        int pref_dist,
                                        unsigned *ref_, unsigned *match_)
@@ -910 +969 @@
             ptr = buf->size/2 - MATCH_WINDOW_LEN - 1;
     } else {
-        ref = buf->size/2 - MATCH_WINDOW_LEN - 1;
-
-        /* do not +1, this is for insertion, inserting 0 sample is no use */
-        end = ref - MATCH_WINDOW_LEN;
-        if ((int)ref > pref_dist)
-            ptr = ref - pref_dist;
-        else
-            ptr = 0;
+        ref = buf->size/2 - MATCH_WINDOW_LEN;
+        end = -1;
+        ptr = ref - MATCH_WINDOW_LEN;
     }
 
@@ -936 +990 @@
             return PJ_SUCCESS;
         }
-        ptr += left_ref ? -1 : 1;
+        ptr += left_ref ? -1 : -1;
     }