Changeset 513 for pjproject/trunk/pjmedia/src/pjmedia/resample.c

Timestamp:

Jun 16, 2006 3:54:43 PM (17 years ago)

Author:

bennylp

Message:

Optimizations mostly in the conference bridge (gained more than 3x faster)

File:

• pjproject/trunk/pjmedia/src/pjmedia/resample.c (modified) (11 diffs)

pjproject/trunk/pjmedia/src/pjmedia/resample.c

@@ -59 +59 @@
  *  - move stddefs.h and resample.h to this file.
  *  - const correctness.
- *  - fixed SrcLinear() may write pass output buffer.
- *  - assume the same for SrcUp() and SrcUD(), so put the same
- *    protection.
  */
 #include <pjmedia/resample.h>
@@ -261 +258 @@
     Yend = Ystart + (unsigned)(nx * pFactor);
     endTime = time + (1<<Np)*(WORD)nx;
-    while (time < endTime && Y < Yend)  /* bennylp fix: added Y < Yend */
+    while (time < endTime)
     {
         iconst = (time) & Pmask;
@@ -400 +397 @@
     Yend = Ystart + (unsigned)(nx * pFactor);
     endTime = time + (1<<Np)*(WORD)nx;
-    while (time < endTime && Y < Yend)  /* bennylp fix: protect Y */
+    while (time < endTime)
     {
         xp = &X[time>>Np];      /* Ptr to current input sample */
@@ -444 +441 @@
     Yend = Ystart + (unsigned)(nx * pFactor);
     endTime = time + (1<<Np)*(WORD)nx;
-    while (time < endTime && Y < Yend) /* bennylp fix: protect Y */
+    while (time < endTime)
     {
         xp = &X[time>>Np];      /* Ptr to current input sample */
@@ -496 +493 @@
     /*
      * If we're downsampling, always use the fast algorithm since it seems
-     * to yield the same performance.
+     * to yield the same quality.
      */
     if (rate_out < rate_in) {
+        //no this is not a good idea. It sounds pretty good with speech,
+        //but very poor with background noise etc.
         //high_quality = 0;
     }
@@ -534 +533 @@
     if (high_quality) {
         unsigned size;
-        unsigned i;
 
         /* This is a bug in xoff calculation, thanks Stephane Lussier
@@ -552 +550 @@
         PJ_ASSERT_RETURN(resample->buffer, PJ_ENOMEM);
 
-        for (i=0; i<resample->xoff*2; ++i) {
-            resample->buffer[i] = 0;
-        }
+        pjmedia_zero_samples(resample->buffer, resample->xoff*2);
 
 
@@ -562 +558 @@
 
     *p_resample = resample;
+
+    PJ_LOG(5,(THIS_FILE, "resample created: %s qualiy, %s filter, in/out "
+                          "rate=%d/%d", 
+                          (high_quality?"high":"low"),
+                          (large_filter?"large":"small"),
+                          rate_in, rate_out));
     return PJ_SUCCESS;
 }
@@ -574 +576 @@
 
     if (resample->high_quality) {
-        unsigned i;
         pj_int16_t *dst_buf;
         const pj_int16_t *src_buf;
@@ -645 +646 @@
          */
         dst_buf = resample->buffer + resample->xoff*2;
-        for (i=0; i<resample->frame_size; ++i) dst_buf[i] = input[i];
+        pjmedia_copy_samples(dst_buf, input, resample->frame_size);
             
         if (resample->factor >= 1) {
@@ -689 +690 @@
         dst_buf = resample->buffer;
         src_buf = input + resample->frame_size - resample->xoff*2;
-        for (i=0; i<resample->xoff * 2; ++i) {
-            dst_buf[i] = src_buf[i];
-        }
+        pjmedia_copy_samples(dst_buf, src_buf, resample->xoff * 2);
 
     } else {