Allow hard-coding several QDM2 tables (about 32 kB size).

Originally committed as revision 22525 to svn://svn.ffmpeg.org/ffmpeg/trunk

4 files changed, 176 insertions, 67 deletions

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 47ebcb282b..bc36a9e83f 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -760,4 +760,5 @@ ifdef CONFIG_HARDCODED_TABLES
 $(SUBDIR)mdct.o: $(SUBDIR)mdct_tables.h
 $(SUBDIR)mpegaudiodec.o: $(SUBDIR)mpegaudio_tables.h
 $(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_tables.h
+$(SUBDIR)qdm2.o: $(SUBDIR)qdm2_tables.h
 endif
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 797a464b84..031bf2f3a4 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -42,15 +42,12 @@
 #include "mpegaudio.h"
 
 #include "qdm2data.h"
+#include "qdm2_tablegen.h"
 
 #undef NDEBUG
 #include <assert.h>
 
 
-#define SOFTCLIP_THRESHOLD 27600
-#define HARDCLIP_THRESHOLD 35716
-
-
 #define QDM2_LIST_ADD(list, size, packet) \
 do { \
       if (size > 0) { \
@@ -214,69 +211,6 @@ static VLC vlc_tab_type30;
 static VLC vlc_tab_type34;
 static VLC vlc_tab_fft_tone_offset[5];
 
-static uint16_t softclip_table[HARDCLIP_THRESHOLD - SOFTCLIP_THRESHOLD + 1];
-static float noise_table[4096];
-static uint8_t random_dequant_index[256][5];
-static uint8_t random_dequant_type24[128][3];
-static float noise_samples[128];
-
-
-static av_cold void softclip_table_init(void) {
-    int i;
-    double dfl = SOFTCLIP_THRESHOLD - 32767;
-    float delta = 1.0 / -dfl;
-    for (i = 0; i < HARDCLIP_THRESHOLD - SOFTCLIP_THRESHOLD + 1; i++)
-        softclip_table[i] = SOFTCLIP_THRESHOLD - ((int)(sin((float)i * delta) * dfl) & 0x0000FFFF);
-}
-
-
-// random generated table
-static av_cold void rnd_table_init(void) {
-    int i,j;
-    uint32_t ldw,hdw;
-    uint64_t tmp64_1;
-    uint64_t random_seed = 0;
-    float delta = 1.0 / 16384.0;
-    for(i = 0; i < 4096 ;i++) {
-        random_seed = random_seed * 214013 + 2531011;
-        noise_table[i] = (delta * (float)(((int32_t)random_seed >> 16) & 0x00007FFF)- 1.0) * 1.3;
-    }
-
-    for (i = 0; i < 256 ;i++) {
-        random_seed = 81;
-        ldw = i;
-        for (j = 0; j < 5 ;j++) {
-            random_dequant_index[i][j] = (uint8_t)((ldw / random_seed) & 0xFF);
-            ldw = (uint32_t)ldw % (uint32_t)random_seed;
-            tmp64_1 = (random_seed * 0x55555556);
-            hdw = (uint32_t)(tmp64_1 >> 32);
-            random_seed = (uint64_t)(hdw + (ldw >> 31));
-        }
-    }
-    for (i = 0; i < 128 ;i++) {
-        random_seed = 25;
-        ldw = i;
-        for (j = 0; j < 3 ;j++) {
-            random_dequant_type24[i][j] = (uint8_t)((ldw / random_seed) & 0xFF);
-            ldw = (uint32_t)ldw % (uint32_t)random_seed;
-            tmp64_1 = (random_seed * 0x66666667);
-            hdw = (uint32_t)(tmp64_1 >> 33);
-            random_seed = hdw + (ldw >> 31);
-        }
-    }
-}
-
-
-static av_cold void init_noise_samples(void) {
-    int i;
-    int random_seed = 0;
-    float delta = 1.0 / 16384.0;
-    for (i = 0; i < 128;i++) {
-        random_seed = random_seed * 214013 + 2531011;
-        noise_samples[i] = (delta * (float)((random_seed >> 16) & 0x00007fff) - 1.0);
-    }
-}
-
 static const uint16_t qdm2_vlc_offs[] = {
     0,260,566,598,894,1166,1230,1294,1678,1950,2214,2278,2310,2570,2834,3124,3448,3838,
 };
diff --git a/libavcodec/qdm2_tablegen.c b/libavcodec/qdm2_tablegen.c
new file mode 100644
index 0000000000..b311e7f4db
--- /dev/null
+++ b/libavcodec/qdm2_tablegen.c
@@ -0,0 +1,73 @@
+/*
+ * Generate a header file for hardcoded QDM2 tables
+ *
+ * Copyright (c) 2010 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdlib.h>
+#define av_cold
+#define CONFIG_HARDCODED_TABLES 0
+#include "qdm2_tablegen.h"
+#include "tableprint.h"
+
+void tableinit(void)
+{
+    softclip_table_init();
+    rnd_table_init();
+    init_noise_samples();
+}
+
+const struct tabledef tables[] = {
+    {
+        "static const uint16_t softclip_table[HARDCLIP_THRESHOLD - SOFTCLIP_THRESHOLD + 1]",
+        write_uint16_array,
+        softclip_table,
+        HARDCLIP_THRESHOLD - SOFTCLIP_THRESHOLD + 1,
+        0
+    },
+    {
+        "static const float noise_table[4096]",
+        write_float_array,
+        noise_table,
+        4096,
+        0
+    },
+    {
+        "static const uint8_t random_dequant_index[256][5]",
+        write_uint8_2d_array,
+        random_dequant_index,
+        256,
+        5
+    },
+    {
+        "static const uint8_t random_dequant_type24[128][3]",
+        write_uint8_2d_array,
+        random_dequant_type24,
+        128,
+        3
+    },
+    {
+        "static const float noise_samples[128]",
+        write_float_array,
+        noise_samples,
+        128,
+        0
+    },
+    { NULL }
+};
diff --git a/libavcodec/qdm2_tablegen.h b/libavcodec/qdm2_tablegen.h
new file mode 100644
index 0000000000..83d8c2d095
--- /dev/null
+++ b/libavcodec/qdm2_tablegen.h
@@ -0,0 +1,101 @@
+/*
+ * Header file for hardcoded QDM2 tables
+ *
+ * Copyright (c) 2010 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef QDM2_TABLEGEN_H
+#define QDM2_TABLEGEN_H
+
+#include <stdint.h>
+#include <math.h>
+
+#define SOFTCLIP_THRESHOLD 27600
+#define HARDCLIP_THRESHOLD 35716
+
+#if CONFIG_HARDCODED_TABLES
+#define softclip_table_init()
+#define rnd_table_init()
+#define init_noise_samples()
+#include "libavcodec/qdm2_tables.h"
+#else
+static uint16_t softclip_table[HARDCLIP_THRESHOLD - SOFTCLIP_THRESHOLD + 1];
+static float noise_table[4096];
+static uint8_t random_dequant_index[256][5];
+static uint8_t random_dequant_type24[128][3];
+static float noise_samples[128];
+
+static av_cold void softclip_table_init(void) {
+    int i;
+    double dfl = SOFTCLIP_THRESHOLD - 32767;
+    float delta = 1.0 / -dfl;
+    for (i = 0; i < HARDCLIP_THRESHOLD - SOFTCLIP_THRESHOLD + 1; i++)
+        softclip_table[i] = SOFTCLIP_THRESHOLD - ((int)(sin((float)i * delta) * dfl) & 0x0000FFFF);
+}
+
+
+// random generated table
+static av_cold void rnd_table_init(void) {
+    int i,j;
+    uint32_t ldw,hdw;
+    uint64_t tmp64_1;
+    uint64_t random_seed = 0;
+    float delta = 1.0 / 16384.0;
+    for(i = 0; i < 4096 ;i++) {
+        random_seed = random_seed * 214013 + 2531011;
+        noise_table[i] = (delta * (float)(((int32_t)random_seed >> 16) & 0x00007FFF)- 1.0) * 1.3;
+    }
+
+    for (i = 0; i < 256 ;i++) {
+        random_seed = 81;
+        ldw = i;
+        for (j = 0; j < 5 ;j++) {
+            random_dequant_index[i][j] = (uint8_t)((ldw / random_seed) & 0xFF);
+            ldw = (uint32_t)ldw % (uint32_t)random_seed;
+            tmp64_1 = (random_seed * 0x55555556);
+            hdw = (uint32_t)(tmp64_1 >> 32);
+            random_seed = (uint64_t)(hdw + (ldw >> 31));
+        }
+    }
+    for (i = 0; i < 128 ;i++) {
+        random_seed = 25;
+        ldw = i;
+        for (j = 0; j < 3 ;j++) {
+            random_dequant_type24[i][j] = (uint8_t)((ldw / random_seed) & 0xFF);
+            ldw = (uint32_t)ldw % (uint32_t)random_seed;
+            tmp64_1 = (random_seed * 0x66666667);
+            hdw = (uint32_t)(tmp64_1 >> 33);
+            random_seed = hdw + (ldw >> 31);
+        }
+    }
+}
+
+
+static av_cold void init_noise_samples(void) {
+    int i;
+    int random_seed = 0;
+    float delta = 1.0 / 16384.0;
+    for (i = 0; i < 128;i++) {
+        random_seed = random_seed * 214013 + 2531011;
+        noise_samples[i] = (delta * (float)((random_seed >> 16) & 0x00007fff) - 1.0);
+    }
+}
+#endif /* CONFIG_HARDCODED_TABLES */
+
+#endif /* QDM2_TABLEGEN_H */