1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

mathematics.h no longer needs config.h, so update tablegen code and

documentation to use it where appropriate.

Originally committed as revision 23680 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2010-06-21 17:01:22 +00:00
parent 28db32159e
commit 6785e92709
4 changed files with 3 additions and 13 deletions

View File

@ -12,6 +12,7 @@ the tables as a header file using the tableprint.h helpers.
Both of these files will be compiled for the host system, so to avoid
breakage with cross-compilation neither of them may include, directly
or indirectly, config.h or avconfig.h.
This means that e.g. libavutil/mathematics.h is ok but libavutil/libm.h is not.
Due to this, the .c file or Makefile may have to provide additional defines
or stubs, though if possible this should be avoided.
In particular, CONFIG_HARDCODED_TABLES should always be defined to 0.

View File

@ -21,7 +21,7 @@
*/
#include <assert.h>
// do not use libavutil/mathematics.h since this is compiled both
// do not use libavutil/libm.h since this is compiled both
// for the host and the target and config.h is only valid for the target
#include <math.h>
#include "../libavutil/attributes.h"

View File

@ -24,8 +24,6 @@
#define MPEGAUDIO_TABLEGEN_H
#include <stdint.h>
// do not use libavutil/mathematics.h since this is compiled both
// for the host and the target and config.h is only valid for the target
#include <math.h>
#define TABLE_4_3_SIZE (8191 + 16)*4

View File

@ -24,22 +24,13 @@
#define PS_TABLEGEN_H
#include <stdint.h>
#include <math.h>
#if CONFIG_HARDCODED_TABLES
#define ps_tableinit()
#include "libavcodec/ps_tables.h"
#else
#include "../libavutil/common.h"
#ifndef M_SQRT1_2
#define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */
#endif
#ifndef M_PI
#define M_PI 3.14159265358979323846 /* pi */
#endif
#ifndef M_SQRT2
#define M_SQRT2 1.41421356237309504880 /* sqrt(2) */
#endif
#include "../libavutil/mathematics.h"
#define NR_ALLPASS_BANDS20 30
#define NR_ALLPASS_BANDS34 50
#define PS_AP_LINKS 3