Commit dcbff351 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd15c21e5'

* commit 'd15c21e5':
  avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility
  avutil: make some tables visible again
  avutil: remove inline av_log2 from public API
  celp_math: rename ff_log2 to ff_log2_q15

Conflicts:
	libavutil/libavutil.v
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 05f228b0 d15c21e5
...@@ -33,6 +33,7 @@ OBJS = allcodecs.o \ ...@@ -33,6 +33,7 @@ OBJS = allcodecs.o \
resample.o \ resample.o \
resample2.o \ resample2.o \
simple_idct.o \ simple_idct.o \
sqrt_tab.o \
utils.o \ utils.o \
# parts needed for many different codecs # parts needed for many different codecs
......
...@@ -87,7 +87,7 @@ void ff_acelp_update_past_gain( ...@@ -87,7 +87,7 @@ void ff_acelp_update_past_gain(
if(erasure) if(erasure)
quant_energy[0] = FFMAX(avg_gain >> log2_ma_pred_order, -10240) - 4096; // -10 and -4 in (5.10) quant_energy[0] = FFMAX(avg_gain >> log2_ma_pred_order, -10240) - 4096; // -10 and -4 in (5.10)
else else
quant_energy[0] = (6165 * ((ff_log2(gain_corr_factor) >> 2) - (13 << 13))) >> 13; quant_energy[0] = (6165 * ((ff_log2_q15(gain_corr_factor) >> 2) - (13 << 13))) >> 13;
} }
int16_t ff_acelp_decode_gain_code( int16_t ff_acelp_decode_gain_code(
......
...@@ -75,7 +75,7 @@ static const uint16_t tab_log2[33] = ...@@ -75,7 +75,7 @@ static const uint16_t tab_log2[33] =
#endif #endif
}; };
int ff_log2(uint32_t value) int ff_log2_q15(uint32_t value)
{ {
uint8_t power_int; uint8_t power_int;
uint8_t frac_x0; uint8_t frac_x0;
......
...@@ -59,7 +59,7 @@ int ff_exp2(uint16_t power); ...@@ -59,7 +59,7 @@ int ff_exp2(uint16_t power);
* *
* @return value of (1<<15) * log2(value) * @return value of (1<<15) * log2(value)
*/ */
int ff_log2(uint32_t value); int ff_log2_q15(uint32_t value);
/** /**
* Shift value left or right depending on sign of offset parameter. * Shift value left or right depending on sign of offset parameter.
......
...@@ -58,17 +58,6 @@ const uint32_t ff_inverse[257]={ ...@@ -58,17 +58,6 @@ const uint32_t ff_inverse[257]={
16777216 16777216
}; };
const uint8_t ff_sqrt_tab[256]={
0, 16, 23, 28, 32, 36, 40, 43, 46, 48, 51, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 77, 79, 80, 82, 84, 85, 87, 88, 90,
91, 92, 94, 95, 96, 98, 99,100,102,103,104,105,107,108,109,110,111,112,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,144,145,146,147,148,149,150,151,151,152,153,154,155,156,156,
157,158,159,160,160,161,162,163,164,164,165,166,167,168,168,169,170,171,171,172,173,174,174,175,176,176,177,178,179,179,180,181,
182,182,183,184,184,185,186,186,187,188,188,189,190,190,191,192,192,193,194,194,195,196,196,197,198,198,199,200,200,201,202,202,
203,204,204,205,205,206,207,207,208,208,209,210,210,211,212,212,213,213,214,215,215,216,216,217,218,218,219,219,220,220,221,222,
222,223,223,224,224,225,226,226,227,227,228,228,229,230,230,231,231,232,232,233,233,234,235,235,236,236,237,237,238,238,239,239,
240,240,241,242,242,243,243,244,244,245,245,246,246,247,247,248,248,249,249,250,250,251,251,252,252,253,253,254,254,255,255,255
};
const uint8_t ff_reverse[256] = { const uint8_t ff_reverse[256] = {
0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0, 0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0,
0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8, 0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8,
......
/*
* 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 <stdint.h>
const uint8_t ff_sqrt_tab[256]={
0, 16, 23, 28, 32, 36, 40, 43, 46, 48, 51, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 77, 79, 80, 82, 84, 85, 87, 88, 90,
91, 92, 94, 95, 96, 98, 99,100,102,103,104,105,107,108,109,110,111,112,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,144,145,146,147,148,149,150,151,151,152,153,154,155,156,156,
157,158,159,160,160,161,162,163,164,164,165,166,167,168,168,169,170,171,171,172,173,174,174,175,176,176,177,178,179,179,180,181,
182,182,183,184,184,185,186,186,187,188,188,189,190,190,191,192,192,193,194,194,195,196,196,197,198,198,199,200,200,201,202,202,
203,204,204,205,205,206,207,207,208,208,209,210,210,211,212,212,213,213,214,215,215,216,216,217,218,218,219,219,220,220,221,222,
222,223,223,224,224,225,226,226,227,227,228,228,229,230,230,231,231,232,232,233,233,234,235,235,236,236,237,237,238,238,239,239,
240,240,241,242,242,243,243,244,244,245,245,246,246,247,247,248,248,249,249,250,250,251,251,252,252,253,253,254,254,255,255,255
};
...@@ -75,6 +75,7 @@ OBJS = adler32.o \ ...@@ -75,6 +75,7 @@ OBJS = adler32.o \
lfg.o \ lfg.o \
lls.o \ lls.o \
log.o \ log.o \
log2.o \
log2_tab.o \ log2_tab.o \
lzo.o \ lzo.o \
mathematics.o \ mathematics.o \
...@@ -89,6 +90,7 @@ OBJS = adler32.o \ ...@@ -89,6 +90,7 @@ OBJS = adler32.o \
rc4.o \ rc4.o \
samplefmt.o \ samplefmt.o \
sha.o \ sha.o \
sqrt_tab.o \
time.o \ time.o \
timecode.o \ timecode.o \
tree.o \ tree.o \
......
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1)) #define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
/* misc math functions */ /* misc math functions */
extern const uint8_t ff_log2_tab[256];
/** /**
* Reverse the order of the bits of an 8-bits unsigned integer. * Reverse the order of the bits of an 8-bits unsigned integer.
...@@ -73,34 +72,6 @@ extern const uint8_t ff_log2_tab[256]; ...@@ -73,34 +72,6 @@ extern const uint8_t ff_log2_tab[256];
extern attribute_deprecated const uint8_t av_reverse[256]; extern attribute_deprecated const uint8_t av_reverse[256];
#endif #endif
static av_always_inline av_const int av_log2_c(unsigned int v)
{
int n = 0;
if (v & 0xffff0000) {
v >>= 16;
n += 16;
}
if (v & 0xff00) {
v >>= 8;
n += 8;
}
n += ff_log2_tab[v];
return n;
}
static av_always_inline av_const int av_log2_16bit_c(unsigned int v)
{
int n = 0;
if (v & 0xff00) {
v >>= 8;
n += 8;
}
n += ff_log2_tab[v];
return n;
}
#ifdef HAVE_AV_CONFIG_H #ifdef HAVE_AV_CONFIG_H
# include "config.h" # include "config.h"
# include "intmath.h" # include "intmath.h"
...@@ -109,6 +80,14 @@ static av_always_inline av_const int av_log2_16bit_c(unsigned int v) ...@@ -109,6 +80,14 @@ static av_always_inline av_const int av_log2_16bit_c(unsigned int v)
/* Pull in unguarded fallback defines at the end of this file. */ /* Pull in unguarded fallback defines at the end of this file. */
#include "common.h" #include "common.h"
#ifndef av_log2
av_const int av_log2(unsigned v);
#endif
#ifndef av_log2_16bit
av_const int av_log2_16bit(unsigned v);
#endif
/** /**
* Clip a signed integer value into the amin-amax range. * Clip a signed integer value into the amin-amax range.
* @param a value to clip * @param a value to clip
...@@ -390,12 +369,6 @@ static av_always_inline av_const int av_popcount64_c(uint64_t x) ...@@ -390,12 +369,6 @@ static av_always_inline av_const int av_popcount64_c(uint64_t x)
* to ensure they are immediately available in intmath.h. * to ensure they are immediately available in intmath.h.
*/ */
#ifndef av_log2
# define av_log2 av_log2_c
#endif
#ifndef av_log2_16bit
# define av_log2_16bit av_log2_16bit_c
#endif
#ifndef av_ceil_log2 #ifndef av_ceil_log2
# define av_ceil_log2 av_ceil_log2_c # define av_ceil_log2 av_ceil_log2_c
#endif #endif
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
#ifndef AVUTIL_INTMATH_H #ifndef AVUTIL_INTMATH_H
#define AVUTIL_INTMATH_H #define AVUTIL_INTMATH_H
#include <stdint.h>
#include "config.h" #include "config.h"
#include "attributes.h" #include "attributes.h"
...@@ -35,15 +37,54 @@ ...@@ -35,15 +37,54 @@
#if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4) #if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4)
#ifndef av_log2 #ifndef ff_log2
# define av_log2(x) (31 - __builtin_clz((x)|1)) # define ff_log2(x) (31 - __builtin_clz((x)|1))
# ifndef av_log2_16bit # ifndef ff_log2_16bit
# define av_log2_16bit av_log2 # define ff_log2_16bit av_log2
# endif # endif
#endif /* av_log2 */ #endif /* ff_log2 */
#endif /* AV_GCC_VERSION_AT_LEAST(3,4) */ #endif /* AV_GCC_VERSION_AT_LEAST(3,4) */
extern const uint8_t ff_log2_tab[256];
#ifndef ff_log2
#define ff_log2 ff_log2_c
static av_always_inline av_const int ff_log2_c(unsigned int v)
{
int n = 0;
if (v & 0xffff0000) {
v >>= 16;
n += 16;
}
if (v & 0xff00) {
v >>= 8;
n += 8;
}
n += ff_log2_tab[v];
return n;
}
#endif
#ifndef ff_log2_16bit
#define ff_log2_16bit ff_log2_16bit_c
static av_always_inline av_const int ff_log2_16bit_c(unsigned int v)
{
int n = 0;
if (v & 0xff00) {
v >>= 8;
n += 8;
}
n += ff_log2_tab[v];
return n;
}
#endif
#define av_log2 ff_log2
#define av_log2_16bit ff_log2_16bit
/** /**
* @} * @}
*/ */
......
LIBAVUTIL_$MAJOR { LIBAVUTIL_$MAJOR {
global: av*; ff_*; global: av*; ff_*; ff_*_tab;
local: *; local: *;
}; };
/*
* 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 "intmath.h"
/* undef these to get the function prototypes from common.h */
#undef av_log2
#undef av_log2_16bit
#include "common.h"
int av_log2(unsigned v)
{
return ff_log2(v);
}
int av_log2_16bit(unsigned v)
{
return ff_log2_16bit(v);
}
#include "libavcodec/sqrt_tab.c"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment