mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-11 09:59:50 +00:00
Move FASTDIV macro to intmath.h
Originally committed as revision 21335 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
parent
2087c82339
commit
75fb5c24ed
54
libavutil/arm/intmath.h
Normal file
54
libavutil/arm/intmath.h
Normal file
@ -0,0 +1,54 @@
|
||||
/*
|
||||
* Copyright (c) 2010 Mans Rullgard <mans@mansr.com>
|
||||
*
|
||||
* 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
|
||||
*/
|
||||
|
||||
#ifndef AVUTIL_ARM_INTMATH_H
|
||||
#define AVUTIL_ARM_INTMATH_H
|
||||
|
||||
#include "config.h"
|
||||
#include "libavutil/common.h"
|
||||
|
||||
#if HAVE_INLINE_ASM
|
||||
|
||||
#if HAVE_ARMV6
|
||||
static inline av_const int FASTDIV(int a, int b)
|
||||
{
|
||||
int r, t;
|
||||
__asm__ volatile("cmp %3, #2 \n\t"
|
||||
"ldr %1, [%4, %3, lsl #2] \n\t"
|
||||
"lsrle %0, %2, #1 \n\t"
|
||||
"smmulgt %0, %1, %2 \n\t"
|
||||
: "=&r"(r), "=&r"(t) : "r"(a), "r"(b), "r"(ff_inverse));
|
||||
return r;
|
||||
}
|
||||
#else
|
||||
static inline av_const int FASTDIV(int a, int b)
|
||||
{
|
||||
int r, t;
|
||||
__asm__ volatile("umull %1, %0, %2, %3"
|
||||
: "=&r"(r), "=&r"(t) : "r"(a), "r"(ff_inverse[b]));
|
||||
return r;
|
||||
}
|
||||
#endif
|
||||
|
||||
#define FASTDIV FASTDIV
|
||||
|
||||
#endif /* HAVE_INLINE_ASM */
|
||||
|
||||
#endif /* AVUTIL_ARM_INTMATH_H */
|
||||
@ -120,44 +120,6 @@
|
||||
|
||||
/* math */
|
||||
|
||||
extern const uint32_t ff_inverse[257];
|
||||
|
||||
#if ARCH_X86
|
||||
# define FASTDIV(a,b) \
|
||||
({\
|
||||
int ret, dmy;\
|
||||
__asm__ volatile(\
|
||||
"mull %3"\
|
||||
:"=d"(ret), "=a"(dmy)\
|
||||
:"1"(a), "g"(ff_inverse[b])\
|
||||
);\
|
||||
ret;\
|
||||
})
|
||||
#elif HAVE_ARMV6 && HAVE_INLINE_ASM
|
||||
static inline av_const int FASTDIV(int a, int b)
|
||||
{
|
||||
int r, t;
|
||||
__asm__ volatile("cmp %3, #2 \n\t"
|
||||
"ldr %1, [%4, %3, lsl #2] \n\t"
|
||||
"lsrle %0, %2, #1 \n\t"
|
||||
"smmulgt %0, %1, %2 \n\t"
|
||||
: "=&r"(r), "=&r"(t) : "r"(a), "r"(b), "r"(ff_inverse));
|
||||
return r;
|
||||
}
|
||||
#elif ARCH_ARM && HAVE_INLINE_ASM
|
||||
static inline av_const int FASTDIV(int a, int b)
|
||||
{
|
||||
int r, t;
|
||||
__asm__ volatile("umull %1, %0, %2, %3"
|
||||
: "=&r"(r), "=&r"(t) : "r"(a), "r"(ff_inverse[b]));
|
||||
return r;
|
||||
}
|
||||
#elif CONFIG_FASTDIV
|
||||
# define FASTDIV(a,b) ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32))
|
||||
#else
|
||||
# define FASTDIV(a,b) ((a) / (b))
|
||||
#endif
|
||||
|
||||
extern const uint8_t ff_sqrt_tab[256];
|
||||
|
||||
static inline av_const unsigned int ff_sqrt(unsigned int a)
|
||||
|
||||
@ -24,6 +24,14 @@
|
||||
#include "config.h"
|
||||
#include "common.h"
|
||||
|
||||
extern const uint32_t ff_inverse[257];
|
||||
|
||||
#if ARCH_ARM
|
||||
# include "arm/intmath.h"
|
||||
#elif ARCH_X86
|
||||
# include "x86/intmath.h"
|
||||
#endif
|
||||
|
||||
#if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4)
|
||||
|
||||
#ifndef av_log2
|
||||
@ -38,4 +46,14 @@
|
||||
|
||||
#endif /* AV_GCC_VERSION_AT_LEAST(3,4) */
|
||||
|
||||
#ifndef FASTDIV
|
||||
|
||||
#if CONFIG_FASTDIV
|
||||
# define FASTDIV(a,b) ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32))
|
||||
#else
|
||||
# define FASTDIV(a,b) ((a) / (b))
|
||||
#endif
|
||||
|
||||
#endif /* FASTDIV */
|
||||
|
||||
#endif /* AVUTIL_INTMATH_H */
|
||||
|
||||
37
libavutil/x86/intmath.h
Normal file
37
libavutil/x86/intmath.h
Normal file
@ -0,0 +1,37 @@
|
||||
/*
|
||||
* Copyright (c) 2010 Mans Rullgard <mans@mansr.com>
|
||||
*
|
||||
* 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
|
||||
*/
|
||||
|
||||
#ifndef AVUTIL_X86_INTMATH_H
|
||||
#define AVUTIL_X86_INTMATH_H
|
||||
|
||||
#include "libavutil/common.h"
|
||||
|
||||
#define FASTDIV(a,b) \
|
||||
({\
|
||||
int ret, dmy;\
|
||||
__asm__ volatile(\
|
||||
"mull %3"\
|
||||
:"=d"(ret), "=a"(dmy)\
|
||||
:"1"(a), "g"(ff_inverse[b])\
|
||||
);\
|
||||
ret;\
|
||||
})
|
||||
|
||||
#endif /* AVUTIL_X86_INTMATH_H */
|
||||
Loading…
Reference in New Issue
Block a user