generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move avutil tables only used in libavcodec to libavcodec.

Browse Source
This commit is contained in:
Diego Biurrun
2012-10-11 01:16:05 +02:00
parent 0a75d1da23
commit 9734b8ba56
14 changed files with 70 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
libavutil/intmath.h
View File

@@ -21,7 +21,6 @@
#ifndef AVUTIL_INTMATH_H
#define AVUTIL_INTMATH_H
#include <stdint.h>
#include "config.h"
#include "attributes.h"
@@ -30,12 +29,6 @@
* @{
*/
extern const uint32_t ff_inverse[257];
#if ARCH_ARM
# include "arm/intmath.h"
#endif
#if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4)
#ifndef av_log2
@@ -47,34 +40,6 @@ extern const uint32_t ff_inverse[257];
#endif /* AV_GCC_VERSION_AT_LEAST(3,4) */
#ifndef FASTDIV
# define FASTDIV(a,b) ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32))
#endif /* FASTDIV */
#include "common.h"
extern const uint8_t ff_sqrt_tab[256];
static inline av_const unsigned int ff_sqrt(unsigned int a)
{
unsigned int b;
if (a < 255) return (ff_sqrt_tab[a + 1] - 1) >> 4;
else if (a < (1 << 12)) b = ff_sqrt_tab[a >> 4] >> 2;
#if !CONFIG_SMALL
else if (a < (1 << 14)) b = ff_sqrt_tab[a >> 6] >> 1;
else if (a < (1 << 16)) b = ff_sqrt_tab[a >> 8] ;
#endif
else {
int s = av_log2_16bit(a >> 16) >> 1;
unsigned int c = a >> (s + 2);
b = ff_sqrt_tab[c >> (s + 8)];
b = FASTDIV(c,b) + (b << s);
}
return b - (a < b * b);
}
/**
* @}
*/