* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef MATHOPS_H
-#define MATHOPS_H
+#ifndef AVCODEC_MATHOPS_H
+#define AVCODEC_MATHOPS_H
+
+#include "libavutil/common.h"
#ifdef ARCH_X86_32
#include "armv4l/mathops.h"
-#elif defined(ARCH_PPC)
+#elif defined(ARCH_POWERPC)
#include "ppc/mathops.h"
+#elif defined(ARCH_BFIN)
+
+#include "bfin/mathops.h"
+
#endif
/* generic implementation */
#ifndef MULL
-# define MULL(a,b) (((int64_t)(a) * (int64_t)(b)) >> FRAC_BITS)
+# define MULL(a,b,s) (((int64_t)(a) * (int64_t)(b)) >> (s))
#endif
#ifndef MULH
//gcc 3.4 creates an incredibly bloated mess out of this
//# define MULH(a,b) (((int64_t)(a) * (int64_t)(b))>>32)
-static always_inline int MULH(int a, int b){
+static av_always_inline int MULH(int a, int b){
return ((int64_t)(a) * (int64_t)(b))>>32;
}
#endif
# define MUL64(a,b) ((int64_t)(a) * (int64_t)(b))
#endif
+#ifndef MAC64
+# define MAC64(d, a, b) ((d) += MUL64(a, b))
+#endif
+
+#ifndef MLS64
+# define MLS64(d, a, b) ((d) -= MUL64(a, b))
+#endif
+
/* signed 16x16 -> 32 multiply add accumulate */
#ifndef MAC16
# define MAC16(rt, ra, rb) rt += (ra) * (rb)
# define MUL16(ra, rb) ((ra) * (rb))
#endif
-#endif //MATHOPS_H
+#ifndef MLS16
+# define MLS16(rt, ra, rb) ((rt) -= (ra) * (rb))
+#endif
+
+#endif /* AVCODEC_MATHOPS_H */