[FFmpeg-cvslog] swr: move compensation_distance handling to swri_resample caller.

[Ronald S. Bultje]

ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Tue May 27 08:39:12 2014 -0400| [cdfd9717edac118968e63e6f83c3e45a7e337833] | committer: Michael Niedermayer

swr: move compensation_distance handling to swri_resample caller.

I think there's an off-by-one in terms of the switchpoint where we
switch from dst_incr to ideal_dst_incr, I don't think that's a massive
issue, but just be aware of that. It's probably trivial to prevent but
I don't care.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

I could not reproduce any off by 1 error, results are bit exact (michael)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cdfd9717edac118968e63e6f83c3e45a7e337833
---

 libswresample/resample.c          |   10 ++++++++++
 libswresample/resample_template.c |   18 ++----------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/libswresample/resample.c b/libswresample/resample.c
index 0fef283..a657a03 100644
--- a/libswresample/resample.c
+++ b/libswresample/resample.c
@@ -336,6 +336,9 @@ static int multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, A
     int av_unused mm_flags = av_get_cpu_flags();
     int need_emms= 0;
 
+    if (c->compensation_distance)
+        dst_size = FFMIN(dst_size, c->compensation_distance);
+
     for(i=0; i<dst->ch_count; i++){
 #if HAVE_MMXEXT_INLINE
 #if HAVE_SSE2_INLINE
@@ -366,6 +369,13 @@ static int multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, A
     }
     if(need_emms)
         emms_c();
+
+    if (c->compensation_distance) {
+        c->compensation_distance -= ret;
+        if (!c->compensation_distance)
+            c->dst_incr = c->ideal_dst_incr / c->src_incr;
+    }
+
     return ret;
 }
 
diff --git a/libswresample/resample_template.c b/libswresample/resample_template.c
index bb36e65..5151f58 100644
--- a/libswresample/resample_template.c
+++ b/libswresample/resample_template.c
@@ -112,12 +112,11 @@ int RENAME(swri_resample)(ResampleContext *c, DELEM *dst, const DELEM *src, int
     int frac= c->frac;
     int dst_incr_frac= c->dst_incr % c->src_incr;
     int dst_incr=      c->dst_incr / c->src_incr;
-    int compensation_distance= c->compensation_distance;
 
     av_assert1(c->filter_shift == FILTER_SHIFT);
     av_assert1(c->felem_size == sizeof(FELEM));
 
-    if(compensation_distance == 0 && c->filter_length == 1 && c->phase_shift==0){
+    if (c->filter_length == 1 && c->phase_shift == 0) {
         int64_t index2= (1LL<<32)*c->frac/c->src_incr + (1LL<<32)*index;
         int64_t incr= (1LL<<32) * c->dst_incr / c->src_incr;
         int new_size = (src_size * (int64_t)c->src_incr - frac + c->dst_incr - 1) / c->dst_incr;
@@ -134,8 +133,7 @@ int RENAME(swri_resample)(ResampleContext *c, DELEM *dst, const DELEM *src, int
         av_assert2(index >= 0);
         *consumed= index;
         index = 0;
-    } else if (compensation_distance == 0 &&
-               index >= 0 &&
+    } else if (index >= 0 &&
                src_size*(int64_t)c->src_incr < (INT64_MAX >> (c->phase_shift+1))) {
         int64_t end_index = (1LL + src_size - c->filter_length) << c->phase_shift;
         int64_t delta_frac = (end_index - index) * c->src_incr - c->frac;
@@ -243,27 +241,15 @@ int RENAME(swri_resample)(ResampleContext *c, DELEM *dst, const DELEM *src, int
                 frac -= c->src_incr;
                 index++;
             }
-
-            if(dst_index + 1 == compensation_distance){
-                compensation_distance= 0;
-                dst_incr_frac= c->ideal_dst_incr % c->src_incr;
-                dst_incr=      c->ideal_dst_incr / c->src_incr;
-            }
         }
         *consumed= FFMAX(sample_index, 0);
         index += FFMIN(sample_index, 0) << c->phase_shift;
-
-        if(compensation_distance){
-            compensation_distance -= dst_index;
-            av_assert1(compensation_distance > 0);
-        }
     }
 
     if(update_ctx){
         c->frac= frac;
         c->index= index;
         c->dst_incr= dst_incr_frac + c->src_incr*dst_incr;
-        c->compensation_distance= compensation_distance;
     }
 
     return dst_index;