[FFmpeg-cvslog] r23740 - in trunk/libavcodec: Makefile aac_tablegen.c aac_tablegen.h aac_tablegen_decl.h aacdec.c aacenc.c aactab.c aactab.h
alexc
subversion
Wed Jun 23 21:30:01 CEST 2010
Author: alexc
Date: Wed Jun 23 21:30:01 2010
New Revision: 23740
Log:
aactab: Tablegenify ff_aac_pow2sf_tab.
Added:
trunk/libavcodec/aac_tablegen.c
trunk/libavcodec/aac_tablegen.h
trunk/libavcodec/aac_tablegen_decl.h
Modified:
trunk/libavcodec/Makefile
trunk/libavcodec/aacdec.c
trunk/libavcodec/aacenc.c
trunk/libavcodec/aactab.c
trunk/libavcodec/aactab.h
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile Wed Jun 23 21:20:46 2010 (r23739)
+++ trunk/libavcodec/Makefile Wed Jun 23 21:30:01 2010 (r23740)
@@ -660,6 +660,7 @@ $(SUBDIR)%_tables.h: $(SUBDIR)%_tablegen
ifdef CONFIG_HARDCODED_TABLES
$(SUBDIR)aacdec.o: $(SUBDIR)cbrt_tables.h
+$(SUBDIR)aactab.o: $(SUBDIR)aac_tables.h
$(SUBDIR)dv.o: $(SUBDIR)dv_tables.h
$(SUBDIR)mdct.o: $(SUBDIR)mdct_tables.h
$(SUBDIR)mpegaudiodec.o: $(SUBDIR)mpegaudio_tables.h
Added: trunk/libavcodec/aac_tablegen.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libavcodec/aac_tablegen.c Wed Jun 23 21:30:01 2010 (r23740)
@@ -0,0 +1,39 @@
+/*
+ * Generate a header file for hardcoded AAC tables
+ *
+ * Copyright (c) 2010 Alex Converse <alex.converse at gmail.com>
+ *
+ * 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 CONFIG_HARDCODED_TABLES 0
+#include "aac_tablegen.h"
+#include "tableprint.h"
+
+int main(void)
+{
+ ff_aac_tableinit();
+
+ write_fileheader();
+
+ printf("const float ff_aac_pow2sf_tab[428] = {\n");
+ write_float_array(ff_aac_pow2sf_tab, 428);
+ printf("};\n");
+
+ return 0;
+}
Added: trunk/libavcodec/aac_tablegen.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libavcodec/aac_tablegen.h Wed Jun 23 21:30:01 2010 (r23740)
@@ -0,0 +1,42 @@
+/*
+ * Header file for hardcoded AAC tables
+ *
+ * Copyright (c) 2010 Alex Converse <alex.converse at gmail.com>
+ *
+ * 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 AAC_TABLEGEN_H
+#define AAC_TABLEGEN_H
+
+#include "aac_tablegen_decl.h"
+
+#if CONFIG_HARDCODED_TABLES
+#include "libavcodec/aac_tables.h"
+#else
+#include "../libavutil/mathematics.h"
+float ff_aac_pow2sf_tab[428];
+
+void ff_aac_tableinit(void)
+{
+ int i;
+ for (i = 0; i < 428; i++)
+ ff_aac_pow2sf_tab[i] = pow(2, (i - 200) / 4.);
+}
+#endif /* CONFIG_HARDCODED_TABLES */
+
+#endif /* AAC_TABLEGEN_H */
Added: trunk/libavcodec/aac_tablegen_decl.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libavcodec/aac_tablegen_decl.h Wed Jun 23 21:30:01 2010 (r23740)
@@ -0,0 +1,34 @@
+/*
+ * Header file for hardcoded AAC tables
+ *
+ * Copyright (c) 2010 Alex Converse <alex.converse at gmail.com>
+ *
+ * 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 AAC_TABLEGEN_INIT_H
+#define AAC_TABLEGEN_INIT_H
+
+#if CONFIG_HARDCODED_TABLES
+#define ff_aac_tableinit()
+extern const float ff_aac_pow2sf_tab[428];
+#else
+void ff_aac_tableinit(void);
+extern float ff_aac_pow2sf_tab[428];
+#endif /* CONFIG_HARDCODED_TABLES */
+
+#endif /* AAC_TABLEGEN_INIT_H */
Modified: trunk/libavcodec/aacdec.c
==============================================================================
--- trunk/libavcodec/aacdec.c Wed Jun 23 21:20:46 2010 (r23739)
+++ trunk/libavcodec/aacdec.c Wed Jun 23 21:30:01 2010 (r23740)
@@ -537,7 +537,6 @@ static void reset_predictor_group(Predic
static av_cold int aac_decode_init(AVCodecContext *avctx)
{
AACContext *ac = avctx->priv_data;
- int i;
ac->avctx = avctx;
ac->m4ac.sample_rate = avctx->sample_rate;
@@ -581,10 +580,7 @@ static av_cold int aac_decode_init(AVCod
ac->sf_offset = 60;
}
-#if !CONFIG_HARDCODED_TABLES
- for (i = 0; i < 428; i++)
- ff_aac_pow2sf_tab[i] = pow(2, (i - 200) / 4.);
-#endif /* CONFIG_HARDCODED_TABLES */
+ ff_aac_tableinit();
INIT_VLC_STATIC(&vlc_scalefactors,7,FF_ARRAY_ELEMS(ff_aac_scalefactor_code),
ff_aac_scalefactor_bits, sizeof(ff_aac_scalefactor_bits[0]), sizeof(ff_aac_scalefactor_bits[0]),
Modified: trunk/libavcodec/aacenc.c
==============================================================================
--- trunk/libavcodec/aacenc.c Wed Jun 23 21:20:46 2010 (r23739)
+++ trunk/libavcodec/aacenc.c Wed Jun 23 21:30:01 2010 (r23740)
@@ -204,10 +204,8 @@ static av_cold int aac_encode_init(AVCod
s->coder = &ff_aac_coders[2];
s->lambda = avctx->global_quality ? avctx->global_quality : 120;
-#if !CONFIG_HARDCODED_TABLES
- for (i = 0; i < 428; i++)
- ff_aac_pow2sf_tab[i] = pow(2, (i - 200)/4.);
-#endif /* CONFIG_HARDCODED_TABLES */
+
+ ff_aac_tableinit();
if (avctx->channels > 5)
av_log(avctx, AV_LOG_ERROR, "This encoder does not yet enforce the restrictions on LFEs. "
Modified: trunk/libavcodec/aactab.c
==============================================================================
--- trunk/libavcodec/aactab.c Wed Jun 23 21:20:46 2010 (r23739)
+++ trunk/libavcodec/aactab.c Wed Jun 23 21:30:01 2010 (r23740)
@@ -29,6 +29,7 @@
#include "libavutil/mem.h"
#include "aac.h"
+#include "aac_tablegen.h"
#include <stdint.h>
@@ -1204,129 +1205,3 @@ const uint8_t ff_tns_max_bands_128[] = {
9, 9, 10, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14
};
// @}
-
-
-#if CONFIG_HARDCODED_TABLES
-
-/**
- * Table of pow(2, (i - 200)/4.) used for different purposes depending on the
- * range of indices to the table:
- * [ 0, 255] scale factor decoding when using C dsp.float_to_int16
- * [60, 315] scale factor decoding when using SIMD dsp.float_to_int16
- * [45, 300] intensity stereo position decoding mapped in reverse order i.e. 0->300, 1->299, ..., 254->46, 255->45
- */
-const float ff_aac_pow2sf_tab[428] = {
- 8.88178420e-16, 1.05622810e-15, 1.25607397e-15, 1.49373210e-15,
- 1.77635684e-15, 2.11245619e-15, 2.51214793e-15, 2.98746420e-15,
- 3.55271368e-15, 4.22491238e-15, 5.02429587e-15, 5.97492839e-15,
- 7.10542736e-15, 8.44982477e-15, 1.00485917e-14, 1.19498568e-14,
- 1.42108547e-14, 1.68996495e-14, 2.00971835e-14, 2.38997136e-14,
- 2.84217094e-14, 3.37992991e-14, 4.01943669e-14, 4.77994272e-14,
- 5.68434189e-14, 6.75985982e-14, 8.03887339e-14, 9.55988543e-14,
- 1.13686838e-13, 1.35197196e-13, 1.60777468e-13, 1.91197709e-13,
- 2.27373675e-13, 2.70394393e-13, 3.21554936e-13, 3.82395417e-13,
- 4.54747351e-13, 5.40788785e-13, 6.43109871e-13, 7.64790834e-13,
- 9.09494702e-13, 1.08157757e-12, 1.28621974e-12, 1.52958167e-12,
- 1.81898940e-12, 2.16315514e-12, 2.57243948e-12, 3.05916334e-12,
- 3.63797881e-12, 4.32631028e-12, 5.14487897e-12, 6.11832668e-12,
- 7.27595761e-12, 8.65262056e-12, 1.02897579e-11, 1.22366534e-11,
- 1.45519152e-11, 1.73052411e-11, 2.05795159e-11, 2.44733067e-11,
- 2.91038305e-11, 3.46104823e-11, 4.11590317e-11, 4.89466134e-11,
- 5.82076609e-11, 6.92209645e-11, 8.23180635e-11, 9.78932268e-11,
- 1.16415322e-10, 1.38441929e-10, 1.64636127e-10, 1.95786454e-10,
- 2.32830644e-10, 2.76883858e-10, 3.29272254e-10, 3.91572907e-10,
- 4.65661287e-10, 5.53767716e-10, 6.58544508e-10, 7.83145814e-10,
- 9.31322575e-10, 1.10753543e-09, 1.31708902e-09, 1.56629163e-09,
- 1.86264515e-09, 2.21507086e-09, 2.63417803e-09, 3.13258326e-09,
- 3.72529030e-09, 4.43014173e-09, 5.26835606e-09, 6.26516652e-09,
- 7.45058060e-09, 8.86028346e-09, 1.05367121e-08, 1.25303330e-08,
- 1.49011612e-08, 1.77205669e-08, 2.10734243e-08, 2.50606661e-08,
- 2.98023224e-08, 3.54411338e-08, 4.21468485e-08, 5.01213321e-08,
- 5.96046448e-08, 7.08822677e-08, 8.42936970e-08, 1.00242664e-07,
- 1.19209290e-07, 1.41764535e-07, 1.68587394e-07, 2.00485328e-07,
- 2.38418579e-07, 2.83529071e-07, 3.37174788e-07, 4.00970657e-07,
- 4.76837158e-07, 5.67058141e-07, 6.74349576e-07, 8.01941314e-07,
- 9.53674316e-07, 1.13411628e-06, 1.34869915e-06, 1.60388263e-06,
- 1.90734863e-06, 2.26823256e-06, 2.69739830e-06, 3.20776526e-06,
- 3.81469727e-06, 4.53646513e-06, 5.39479661e-06, 6.41553051e-06,
- 7.62939453e-06, 9.07293026e-06, 1.07895932e-05, 1.28310610e-05,
- 1.52587891e-05, 1.81458605e-05, 2.15791864e-05, 2.56621220e-05,
- 3.05175781e-05, 3.62917210e-05, 4.31583729e-05, 5.13242441e-05,
- 6.10351562e-05, 7.25834421e-05, 8.63167458e-05, 1.02648488e-04,
- 1.22070312e-04, 1.45166884e-04, 1.72633492e-04, 2.05296976e-04,
- 2.44140625e-04, 2.90333768e-04, 3.45266983e-04, 4.10593953e-04,
- 4.88281250e-04, 5.80667537e-04, 6.90533966e-04, 8.21187906e-04,
- 9.76562500e-04, 1.16133507e-03, 1.38106793e-03, 1.64237581e-03,
- 1.95312500e-03, 2.32267015e-03, 2.76213586e-03, 3.28475162e-03,
- 3.90625000e-03, 4.64534029e-03, 5.52427173e-03, 6.56950324e-03,
- 7.81250000e-03, 9.29068059e-03, 1.10485435e-02, 1.31390065e-02,
- 1.56250000e-02, 1.85813612e-02, 2.20970869e-02, 2.62780130e-02,
- 3.12500000e-02, 3.71627223e-02, 4.41941738e-02, 5.25560260e-02,
- 6.25000000e-02, 7.43254447e-02, 8.83883476e-02, 1.05112052e-01,
- 1.25000000e-01, 1.48650889e-01, 1.76776695e-01, 2.10224104e-01,
- 2.50000000e-01, 2.97301779e-01, 3.53553391e-01, 4.20448208e-01,
- 5.00000000e-01, 5.94603558e-01, 7.07106781e-01, 8.40896415e-01,
- 1.00000000e+00, 1.18920712e+00, 1.41421356e+00, 1.68179283e+00,
- 2.00000000e+00, 2.37841423e+00, 2.82842712e+00, 3.36358566e+00,
- 4.00000000e+00, 4.75682846e+00, 5.65685425e+00, 6.72717132e+00,
- 8.00000000e+00, 9.51365692e+00, 1.13137085e+01, 1.34543426e+01,
- 1.60000000e+01, 1.90273138e+01, 2.26274170e+01, 2.69086853e+01,
- 3.20000000e+01, 3.80546277e+01, 4.52548340e+01, 5.38173706e+01,
- 6.40000000e+01, 7.61092554e+01, 9.05096680e+01, 1.07634741e+02,
- 1.28000000e+02, 1.52218511e+02, 1.81019336e+02, 2.15269482e+02,
- 2.56000000e+02, 3.04437021e+02, 3.62038672e+02, 4.30538965e+02,
- 5.12000000e+02, 6.08874043e+02, 7.24077344e+02, 8.61077929e+02,
- 1.02400000e+03, 1.21774809e+03, 1.44815469e+03, 1.72215586e+03,
- 2.04800000e+03, 2.43549617e+03, 2.89630938e+03, 3.44431172e+03,
- 4.09600000e+03, 4.87099234e+03, 5.79261875e+03, 6.88862343e+03,
- 8.19200000e+03, 9.74198469e+03, 1.15852375e+04, 1.37772469e+04,
- 1.63840000e+04, 1.94839694e+04, 2.31704750e+04, 2.75544937e+04,
- 3.27680000e+04, 3.89679387e+04, 4.63409500e+04, 5.51089875e+04,
- 6.55360000e+04, 7.79358775e+04, 9.26819000e+04, 1.10217975e+05,
- 1.31072000e+05, 1.55871755e+05, 1.85363800e+05, 2.20435950e+05,
- 2.62144000e+05, 3.11743510e+05, 3.70727600e+05, 4.40871900e+05,
- 5.24288000e+05, 6.23487020e+05, 7.41455200e+05, 8.81743800e+05,
- 1.04857600e+06, 1.24697404e+06, 1.48291040e+06, 1.76348760e+06,
- 2.09715200e+06, 2.49394808e+06, 2.96582080e+06, 3.52697520e+06,
- 4.19430400e+06, 4.98789616e+06, 5.93164160e+06, 7.05395040e+06,
- 8.38860800e+06, 9.97579232e+06, 1.18632832e+07, 1.41079008e+07,
- 1.67772160e+07, 1.99515846e+07, 2.37265664e+07, 2.82158016e+07,
- 3.35544320e+07, 3.99031693e+07, 4.74531328e+07, 5.64316032e+07,
- 6.71088640e+07, 7.98063385e+07, 9.49062656e+07, 1.12863206e+08,
- 1.34217728e+08, 1.59612677e+08, 1.89812531e+08, 2.25726413e+08,
- 2.68435456e+08, 3.19225354e+08, 3.79625062e+08, 4.51452825e+08,
- 5.36870912e+08, 6.38450708e+08, 7.59250125e+08, 9.02905651e+08,
- 1.07374182e+09, 1.27690142e+09, 1.51850025e+09, 1.80581130e+09,
- 2.14748365e+09, 2.55380283e+09, 3.03700050e+09, 3.61162260e+09,
- 4.29496730e+09, 5.10760567e+09, 6.07400100e+09, 7.22324521e+09,
- 8.58993459e+09, 1.02152113e+10, 1.21480020e+10, 1.44464904e+10,
- 1.71798692e+10, 2.04304227e+10, 2.42960040e+10, 2.88929808e+10,
- 3.43597384e+10, 4.08608453e+10, 4.85920080e+10, 5.77859616e+10,
- 6.87194767e+10, 8.17216907e+10, 9.71840160e+10, 1.15571923e+11,
- 1.37438953e+11, 1.63443381e+11, 1.94368032e+11, 2.31143847e+11,
- 2.74877907e+11, 3.26886763e+11, 3.88736064e+11, 4.62287693e+11,
- 5.49755814e+11, 6.53773525e+11, 7.77472128e+11, 9.24575386e+11,
- 1.09951163e+12, 1.30754705e+12, 1.55494426e+12, 1.84915077e+12,
- 2.19902326e+12, 2.61509410e+12, 3.10988851e+12, 3.69830155e+12,
- 4.39804651e+12, 5.23018820e+12, 6.21977702e+12, 7.39660309e+12,
- 8.79609302e+12, 1.04603764e+13, 1.24395540e+13, 1.47932062e+13,
- 1.75921860e+13, 2.09207528e+13, 2.48791081e+13, 2.95864124e+13,
- 3.51843721e+13, 4.18415056e+13, 4.97582162e+13, 5.91728247e+13,
- 7.03687442e+13, 8.36830112e+13, 9.95164324e+13, 1.18345649e+14,
- 1.40737488e+14, 1.67366022e+14, 1.99032865e+14, 2.36691299e+14,
- 2.81474977e+14, 3.34732045e+14, 3.98065730e+14, 4.73382598e+14,
- 5.62949953e+14, 6.69464090e+14, 7.96131459e+14, 9.46765196e+14,
- 1.12589991e+15, 1.33892818e+15, 1.59226292e+15, 1.89353039e+15,
- 2.25179981e+15, 2.67785636e+15, 3.18452584e+15, 3.78706078e+15,
- 4.50359963e+15, 5.35571272e+15, 6.36905167e+15, 7.57412156e+15,
- 9.00719925e+15, 1.07114254e+16, 1.27381033e+16, 1.51482431e+16,
- 1.80143985e+16, 2.14228509e+16, 2.54762067e+16, 3.02964863e+16,
- 3.60287970e+16, 4.28457018e+16, 5.09524134e+16, 6.05929725e+16,
- 7.20575940e+16, 8.56914035e+16, 1.01904827e+17, 1.21185945e+17,
-};
-
-#else
-
-float ff_aac_pow2sf_tab[428];
-
-#endif /* CONFIG_HARDCODED_TABLES */
Modified: trunk/libavcodec/aactab.h
==============================================================================
--- trunk/libavcodec/aactab.h Wed Jun 23 21:20:46 2010 (r23739)
+++ trunk/libavcodec/aactab.h Wed Jun 23 21:30:01 2010 (r23740)
@@ -32,6 +32,7 @@
#include "libavutil/mem.h"
#include "aac.h"
+#include "aac_tablegen_decl.h"
#include <stdint.h>
@@ -73,10 +74,4 @@ extern const uint16_t * const ff_swb_off
extern const uint8_t ff_tns_max_bands_1024[13];
extern const uint8_t ff_tns_max_bands_128 [13];
-#if CONFIG_HARDCODED_TABLES
-extern const float ff_aac_pow2sf_tab[428];
-#else
-extern float ff_aac_pow2sf_tab[428];
-#endif /* CONFIG_HARDCODED_TABLES */
-
#endif /* AVCODEC_AACTAB_H */
More information about the ffmpeg-cvslog
mailing list