Mercurial > libavcodec.hg

changeset 2083:76cdbe832239 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid useless normalization and 10l fix
author michael
date Thu, 17 Jun 2004 16:34:46 +0000
parents 3dc9bbe1b152
children db6a5e3e74a0
files resample2.c
diffstat 1 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/resample2.c	Thu Jun 17 15:43:23 2004 +0000
+++ b/resample2.c	Thu Jun 17 16:34:46 2004 +0000
@@ -93,7 +93,7 @@
                 break;
             case 2:
                 w = 2.0*x / (factor*tap_count*M_PI);
-                y *= bessel(16*sqrt(FFMAX(1-w*w, 0))) / bessel(16);
+                y *= bessel(16*sqrt(FFMAX(1-w*w, 0)));
                 break;
             }
 
@@ -139,10 +139,9 @@
 }
 
 void av_resample_compensate(AVResampleContext *c, int sample_delta, int compensation_distance){
-    assert(!c->compensation_distance); //FIXME
-
+//    sample_delta += (c->ideal_dst_incr - c->dst_incr)*(int64_t)c->compensation_distance / c->ideal_dst_incr;
     c->compensation_distance= compensation_distance;
-    c->dst_incr-= c->ideal_dst_incr * sample_delta / compensation_distance;
+    c->dst_incr = c->ideal_dst_incr - c->ideal_dst_incr * (int64_t)sample_delta / compensation_distance;
 }
 
 /**
@@ -202,7 +201,7 @@
     }
     if(update_ctx){
         if(c->compensation_distance){
-            c->compensation_distance -= index;
+            c->compensation_distance -= dst_index;
             if(!c->compensation_distance)
                 c->dst_incr= c->ideal_dst_incr;
         }
@@ -210,5 +209,13 @@
         c->index=0;
     }
     *consumed= index >> PHASE_SHIFT;
+#if 0    
+    if(update_ctx && !c->compensation_distance){
+#undef rand
+        av_resample_compensate(c, rand() % (8000*2) - 8000, 8000*2);
+av_log(NULL, AV_LOG_DEBUG, "%d %d %d\n", c->dst_incr, c->ideal_dst_incr, c->compensation_distance);
+    }
+#endif
+    
     return dst_index;
 }