Browse Source

Factorize CHECK/SUINT code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n3.3
Michael Niedermayer 9 years ago
parent
commit
4614bf2caf
3 changed files with 10 additions and 18 deletions
  1. +0
    -10
      libavcodec/flacdsp.h
  2. +0
    -8
      libavcodec/mpegaudio.h
  3. +10
    -0
      libavutil/internal.h

+ 0
- 10
libavcodec/flacdsp.h View File

@@ -23,16 +23,6 @@
#include "libavutil/internal.h"
#include "libavutil/samplefmt.h"

// For debuging we use signed operations so overflows can be detected (by ubsan)
// For production we use unsigned so there are no undefined operations
#ifdef CHECKED
#define SUINT int
#define SUINT32 int32_t
#else
#define SUINT unsigned
#define SUINT32 uint32_t
#endif

typedef struct FLACDSPContext {
void (*decorrelate[4])(uint8_t **out, int32_t **in, int channels,
int len, int shift);


+ 0
- 8
libavcodec/mpegaudio.h View File

@@ -59,14 +59,6 @@

#define FIX(a) ((int)((a) * FRAC_ONE))

#ifdef CHECKED
#define SUINT int
#define SUINT32 int32_t
#else
#define SUINT unsigned
#define SUINT32 uint32_t
#endif

#if USE_FLOATS
# define INTFLOAT float
# define SUINTFLOAT float


+ 10
- 0
libavutil/internal.h View File

@@ -262,6 +262,16 @@ void avpriv_request_sample(void *avc,
# define ff_dlog(ctx, ...) do { if (0) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0)
#endif

// For debuging we use signed operations so overflows can be detected (by ubsan)
// For production we use unsigned so there are no undefined operations
#ifdef CHECKED
#define SUINT int
#define SUINT32 int32_t
#else
#define SUINT unsigned
#define SUINT32 uint32_t
#endif

/**
* Clip and convert a double value into the long long amin-amax range.
* This function is needed because conversion of floating point to integers when


Loading…
Cancel
Save