[FFmpeg-devel] [PATCH 8/9] New dcadsp method, qmf_32_subbands

[Ben Avison]

This does most of the work formerly carried out by
the static function qmf_32_subbands() in dcadec.c.

Signed-off-by: Ben Avison <bavison at riscosopen.org>
---
 libavcodec/arm/dcadsp_init_arm.c |    2 ++
 libavcodec/dcadec.c              |   32 ++++++++------------------------
 libavcodec/dcadsp.c              |   32 ++++++++++++++++++++++++++++++++
 libavcodec/dcadsp.h              |    6 ++++++
 4 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/libavcodec/arm/dcadsp_init_arm.c b/libavcodec/arm/dcadsp_init_arm.c
index 9406b86..2fd5c4c 100644
--- a/libavcodec/arm/dcadsp_init_arm.c
+++ b/libavcodec/arm/dcadsp_init_arm.c
@@ -22,6 +22,8 @@
 
 #include "libavutil/arm/cpu.h"
 #include "libavutil/attributes.h"
+#include "libavcodec/avfft.h"
+#include "libavcodec/synth_filter.h"
 #include "libavcodec/dcadsp.h"
 
 void ff_dca_lfe_fir_vfp(float *out, const float *in, const float *coefs,
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index d4adf73..1af6310 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -1111,39 +1111,23 @@ static void qmf_32_subbands(DCAContext *s, int chans,
                             float samples_in[32][8], float *samples_out,
                             float scale)
 {
-    const float *prCoeff;
-    int i;
+    const float (*prCoeff)[512];
 
     int sb_act = s->subband_activity[chans];
-    int subindex;
 
     scale *= sqrt(1 / 8.0);
 
     /* Select filter */
     if (!s->multirate_inter)    /* Non-perfect reconstruction */
-        prCoeff = fir_32bands_nonperfect;
+        prCoeff = &fir_32bands_nonperfect;
     else                        /* Perfect reconstruction */
-        prCoeff = fir_32bands_perfect;
-
-    for (i = sb_act; i < 32; i++)
-        s->raXin[i] = 0.0;
-
-    /* Reconstructed channel sample index */
-    for (subindex = 0; subindex < 8; subindex++) {
-        /* Load in one sample from each subband and clear inactive subbands */
-        for (i = 0; i < sb_act; i++) {
-            unsigned sign = (i - 1) & 2;
-            uint32_t v    = AV_RN32A(&samples_in[i][subindex]) ^ sign << 30;
-            AV_WN32A(&s->raXin[i], v);
-        }
+        prCoeff = &fir_32bands_perfect;
 
-        s->synth.synth_filter_float(&s->imdct,
-                                    s->subband_fir_hist[chans],
-                                    &s->hist_index[chans],
-                                    s->subband_fir_noidea[chans], prCoeff,
-                                    samples_out, s->raXin, scale);
-        samples_out += 32;
-    }
+    s->dcadsp.qmf_32_subbands(samples_in, sb_act, &s->synth, &s->imdct,
+                              &s->subband_fir_hist[chans],
+                              &s->hist_index[chans],
+                              &s->subband_fir_noidea[chans], prCoeff,
+                              samples_out, &s->raXin, scale);
 }
 
 static void lfe_interpolation_fir(DCAContext *s, int decimation_select,
diff --git a/libavcodec/dcadsp.c b/libavcodec/dcadsp.c
index 249aff2..d1b9f86 100644
--- a/libavcodec/dcadsp.c
+++ b/libavcodec/dcadsp.c
@@ -21,7 +21,10 @@
 
 #include "config.h"
 #include "libavutil/attributes.h"
+#include "avfft.h"
+#include "synth_filter.h"
 #include "dcadsp.h"
+#include "libavutil/intreadwrite.h"
 
 static void dca_lfe_fir_c(float *out, const float *in, const float *coefs,
                           int decifactor, float scale)
@@ -45,8 +48,37 @@ static void dca_lfe_fir_c(float *out, const float *in, const float *coefs,
     }
 }
 
+static void dca_qmf_32_subbands(float samples_in[32][8], int sb_act,
+                                SynthFilterContext *synth, FFTContext *imdct,
+                                float (*synth_buf_ptr)[512],
+                                int *synth_buf_offset, float (*synth_buf2)[32],
+                                const float (*window)[512], float *samples_out,
+                                float (*raXin)[32], float scale)
+{
+    int i;
+    int subindex;
+
+    for (i = sb_act; i < 32; i++)
+        (*raXin)[i] = 0.0;
+
+    /* Reconstructed channel sample index */
+    for (subindex = 0; subindex < 8; subindex++) {
+        /* Load in one sample from each subband and clear inactive subbands */
+        for (i = 0; i < sb_act; i++) {
+            unsigned sign = (i - 1) & 2;
+            uint32_t v    = AV_RN32A(&samples_in[i][subindex]) ^ sign << 30;
+            AV_WN32A(&(*raXin)[i], v);
+        }
+
+        synth->synth_filter_float(imdct, *synth_buf_ptr, synth_buf_offset,
+                                  *synth_buf2, *window, samples_out, *raXin, scale);
+        samples_out += 32;
+    }
+}
+
 av_cold void ff_dcadsp_init(DCADSPContext *s)
 {
     s->lfe_fir = dca_lfe_fir_c;
+    s->qmf_32_subbands = dca_qmf_32_subbands;
     if (ARCH_ARM) ff_dcadsp_init_arm(s);
 }
diff --git a/libavcodec/dcadsp.h b/libavcodec/dcadsp.h
index bb157f7..f39b68e 100644
--- a/libavcodec/dcadsp.h
+++ b/libavcodec/dcadsp.h
@@ -22,6 +22,12 @@
 typedef struct DCADSPContext {
     void (*lfe_fir)(float *out, const float *in, const float *coefs,
                     int decifactor, float scale);
+    void (*qmf_32_subbands)(float samples_in[32][8], int sb_act,
+                            SynthFilterContext *synth, FFTContext *imdct,
+                            float (*synth_buf_ptr)[512],
+                            int *synth_buf_offset, float (*synth_buf2)[32],
+                            const float (*window)[512], float *samples_out,
+                            float (*raXin)[32], float scale);
 } DCADSPContext;
 
 void ff_dcadsp_init(DCADSPContext *s);
-- 
1.7.5.4