Commit 36cd3069 authored by Måns Rullgård's avatar Måns Rullgård
Browse files

rename inverse -> ff_inverse

Originally committed as revision 6990 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 7e244702
......@@ -93,7 +93,7 @@ const uint8_t ff_alternate_vertical_scan[64] = {
};
/* a*inverse[b]>>32 == a/b for all 0<=a<=65536 && 2<=b<=255 */
const uint32_t inverse[256]={
const uint32_t ff_inverse[256]={
0, 4294967295U,2147483648U,1431655766, 1073741824, 858993460, 715827883, 613566757,
536870912, 477218589, 429496730, 390451573, 357913942, 330382100, 306783379, 286331154,
268435456, 252645136, 238609295, 226050911, 214748365, 204522253, 195225787, 186737709,
......
......@@ -76,7 +76,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s,
asm volatile (
"mul %%ecx \n\t"
: "=d" (level), "=a"(dummy)
: "a" ((block[0]>>2) + q), "c" (inverse[q<<1])
: "a" ((block[0]>>2) + q), "c" (ff_inverse[q<<1])
);
#else
asm volatile (
......
......@@ -675,7 +675,7 @@ static inline int msmpeg4_pred_dc(MpegEncContext * s, int n,
"mull %4 \n\t"
"movl %%edx, %2 \n\t"
: "+b" (a), "+c" (b), "+D" (c)
: "g" (scale), "S" (inverse[scale])
: "g" (scale), "S" (ff_inverse[scale])
: "%eax", "%edx"
);
#else
......
......@@ -1438,7 +1438,7 @@ static int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, uint_fa
voffset=vr->begin;
for(partition_count=0;partition_count<ptns_to_read;) { // SPEC error
if (!pass) {
uint_fast32_t inverse_class = inverse[vr->classifications];
uint_fast32_t inverse_class = ff_inverse[vr->classifications];
for(j_times_ptns_to_read=0, j=0;j<ch_used;++j) {
if (!do_not_decode[j]) {
uint_fast32_t temp=get_vlc2(gb, vc->codebooks[vr->classbook].vlc.table,
......
......@@ -103,7 +103,7 @@
# define av_abort() do { av_log(NULL, AV_LOG_ERROR, "Abort at %s:%d\n", __FILE__, __LINE__); abort(); } while (0)
extern const uint32_t inverse[256];
extern const uint32_t ff_inverse[256];
#if defined(ARCH_X86)
# define FASTDIV(a,b) \
......@@ -112,7 +112,7 @@ extern const uint32_t inverse[256];
asm volatile(\
"mull %3"\
:"=d"(ret),"=a"(dmy)\
:"1"(a),"g"(inverse[b])\
:"1"(a),"g"(ff_inverse[b])\
);\
ret;\
})
......@@ -123,12 +123,12 @@ extern const uint32_t inverse[256];
asm volatile(\
"umull %1, %0, %2, %3"\
:"=&r"(ret),"=&r"(dmy)\
:"r"(a),"r"(inverse[b])\
:"r"(a),"r"(ff_inverse[b])\
);\
ret;\
})
#elif defined(CONFIG_FASTDIV)
# define FASTDIV(a,b) ((uint32_t)((((uint64_t)a)*inverse[b])>>32))
# define FASTDIV(a,b) ((uint32_t)((((uint64_t)a)*ff_inverse[b])>>32))
#else
# define FASTDIV(a,b) ((a)/(b))
#endif
......
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