1 files changed, 69 insertions, 2 deletions

diff --git a/apps/codecs/libtremor/ffmpeg_render_line.h b/apps/codecs/libtremor/ffmpeg_render_line.h
index 1b760ae20e..a08952d95d 100644
--- a/apps/codecs/libtremor/ffmpeg_render_line.h
+++ b/apps/codecs/libtremor/ffmpeg_render_line.h
@@ -21,6 +21,9 @@
  */
 
 /* render_line and friend taken from ffmpeg (libavcodec/vorbis.c) */
+
+#include "misc.h"
+
 static inline void render_line_unrolled(int x, int y, int x1,
                                         int sy, int ady, int adx,
                                         const ogg_int32_t *lookup, ogg_int32_t *buf)
@@ -45,8 +48,8 @@ static inline void render_line_unrolled(int x, int y, int x1,
     }
 }
 
-static void render_line(int x0, int y0, int x1, int y1,
-                        const ogg_int32_t *lookup, ogg_int32_t *buf)
+static inline void render_line(int x0, int y0, int x1, int y1,
+                               const ogg_int32_t *lookup, ogg_int32_t *buf)
 {
     int dy  = y1 - y0;
     int adx = x1 - x0;
@@ -72,3 +75,67 @@ static void render_line(int x0, int y0, int x1, int y1,
         }
     }
 }
+
+#ifndef INCL_OPTIMIZED_VECTOR_FMUL_WINDOW
+#define INCL_OPTIMIZED_VECTOR_FMUL_WINDOW
+static inline void ff_vector_fmul_window_c(ogg_int32_t *dst, const ogg_int32_t *src0,
+                                           const ogg_int32_t *src1, const ogg_int32_t *win, int len){
+    int i,j;
+    dst += len;
+    win += len;
+    src0+= len;
+    for(i=-len, j=len-1; i<0; i++, j--) {
+        ogg_int32_t s0 = src0[i];
+        ogg_int32_t s1 = src1[j];
+        ogg_int32_t wi = win[i];
+        ogg_int32_t wj = win[j];
+        XNPROD31(s0, s1, wj, wi, &dst[i], &dst[j]);
+        /*
+        dst[i] = MULT31(s0,wj) - MULT31(s1,wi);
+        dst[j] = MULT31(s0,wi) + MULT31(s1,wj);
+        */
+    }
+}
+#endif
+
+static inline void copy_normalize(ogg_int32_t *dst, ogg_int32_t *src, int len)
+{
+    memcpy(dst, src, len * sizeof(ogg_int32_t));
+}
+
+static inline void window_overlap_add(unsigned int blocksize, unsigned int lastblock,
+                                      unsigned int bs0, unsigned int bs1, int ch,
+                                      const ogg_int32_t *win, vorbis_dsp_state *v)
+{
+    unsigned retlen = (blocksize + lastblock) / 4;
+    int j;
+    for (j = 0; j < ch; j++) {
+        ogg_int32_t *residue   = v->residues[v->ri] + j * blocksize / 2;
+        ogg_int32_t *saved;
+        saved = v->saved_ptr[j];
+        ogg_int32_t       *ret = v->floors + j * retlen;
+        ogg_int32_t       *buf = residue;
+
+        if (v->W == v->lW) {
+            ff_vector_fmul_window_c(ret, saved, buf, win, blocksize / 4);
+        } else if (v->W > v->lW) {
+            ff_vector_fmul_window_c(ret, saved, buf, win, bs0 / 4);
+            copy_normalize(ret+bs0/2, buf+bs0/4, (bs1-bs0)/4);
+        } else {
+            copy_normalize(ret, saved, (bs1 - bs0) / 4);
+            ff_vector_fmul_window_c(ret + (bs1 - bs0) / 4, saved + (bs1 - bs0) / 4, buf, win, bs0 / 4);
+        }
+        if (v->residues[1] == NULL) {
+            memcpy(saved, buf + blocksize / 4, blocksize / 4 * sizeof(ogg_int32_t));
+            v->saved_ptr[j] = v->saved + j * bs1 / 4;
+        } else {
+            v->saved_ptr[j] = buf + blocksize / 4;
+        }
+
+        v->pcmb[j] = ret;
+    }
+
+    if (v->residues[1] != NULL) {
+      v->ri ^= 1;
+    }
+}