More header cleanup

Common/Common.vcxproj

@@ -391,10 +391,8 @@
     <ClInclude Include="..\ext\at3_standalone\atrac3plus.h" />
     <ClInclude Include="..\ext\at3_standalone\atrac3plus_data.h" />
     <ClInclude Include="..\ext\at3_standalone\avcodec.h" />
-    <ClInclude Include="..\ext\at3_standalone\avutil.h" />
     <ClInclude Include="..\ext\at3_standalone\bytestream.h" />
     <ClInclude Include="..\ext\at3_standalone\channel_layout.h" />
-    <ClInclude Include="..\ext\at3_standalone\common.h" />
     <ClInclude Include="..\ext\at3_standalone\compat.h" />
     <ClInclude Include="..\ext\at3_standalone\fft.h" />
     <ClInclude Include="..\ext\at3_standalone\float_dsp.h" />
@@ -615,7 +613,6 @@
     <ClCompile Include="..\ext\at3_standalone\compat.c" />
     <ClCompile Include="..\ext\at3_standalone\fft_template.c" />
     <ClCompile Include="..\ext\at3_standalone\float_dsp.c" />
-    <ClCompile Include="..\ext\at3_standalone\intmath.c" />
     <ClCompile Include="..\ext\at3_standalone\mathematics.c" />
     <ClCompile Include="..\ext\at3_standalone\mdct_template.c" />
     <ClCompile Include="..\ext\at3_standalone\mem.c" />

Common/Common.vcxproj.filters

@@ -554,9 +554,6 @@
     <ClInclude Include="..\ext\at3_standalone\intreadwrite.h">
       <Filter>ext\at3_standalone</Filter>
     </ClInclude>
-    <ClInclude Include="..\ext\at3_standalone\common.h">
-      <Filter>ext\at3_standalone</Filter>
-    </ClInclude>
     <ClInclude Include="..\ext\at3_standalone\avcodec.h">
       <Filter>ext\at3_standalone</Filter>
     </ClInclude>
@@ -584,9 +581,6 @@
     <ClInclude Include="..\ext\at3_standalone\intmath.h">
       <Filter>ext\at3_standalone</Filter>
     </ClInclude>
-    <ClInclude Include="..\ext\at3_standalone\avutil.h">
-      <Filter>ext\at3_standalone</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ABI.cpp" />
@@ -1083,9 +1077,6 @@
     <ClCompile Include="..\ext\at3_standalone\fft_template.c">
       <Filter>ext\at3_standalone</Filter>
     </ClCompile>
-    <ClCompile Include="..\ext\at3_standalone\intmath.c">
-      <Filter>ext\at3_standalone</Filter>
-    </ClCompile>
     <ClCompile Include="..\ext\at3_standalone\get_bits.c">
       <Filter>ext\at3_standalone</Filter>
     </ClCompile>

ext/at3_standalone/atrac3.c

@@ -40,13 +40,15 @@
 #include "float_dsp.h"
 #include "bytestream.h"
 #include "fft.h"
-#include "common.h"
+#include "compat.h"
 #include "get_bits.h"
 
 #include "avcodec.h"
 #include "atrac.h"
 #include "atrac3data.h"
 
+#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
+
 #define JOINT_STEREO    0x12
 #define STEREO          0x2
 

ext/at3_standalone/atrac3plus.c

@@ -29,6 +29,7 @@
 #include <stdlib.h>
 
 //#include "avcodec.h"
+#include "intmath.h"
 #include "get_bits.h"
 #include "atrac3plus.h"
 #include "atrac3plus_data.h"

ext/at3_standalone/atrac3plusdec.c

@@ -41,7 +41,7 @@
 #include "float_dsp.h"
 #include "avcodec.h"
 #include "get_bits.h"
-#include "common.h"
+#include "compat.h"
 #include "atrac.h"
 #include "atrac3plus.h"
 

ext/at3_standalone/avcodec.c

@@ -27,7 +27,7 @@
 #include "avcodec.h"
 #include "compat.h"
 #include "channel_layout.h"
-#include "common.h"
+#include "compat.h"
 #include "mathematics.h"
 #include "avcodec.h"
 #include "bytestream.h"

ext/at3_standalone/avutil.h

@@ -1,141 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * 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_AVUTIL_H
-#define AVUTIL_AVUTIL_H
-
-/**
- * @file
- * external API header
- */
-
-/**
- * @mainpage
- *
- * @section ffmpeg_intro Introduction
- *
- * This document describes the usage of the different libraries
- * provided by FFmpeg.
- *
- * @li @ref libavc "libavcodec" encoding/decoding library
- * @li @ref lavfi "libavfilter" graph-based frame editing library
- * @li @ref libavf "libavformat" I/O and muxing/demuxing library
- * @li @ref lavd "libavdevice" special devices muxing/demuxing library
- * @li @ref lavu "libavutil" common utility library
- * @li @ref lswr "libswresample" audio resampling, format conversion and mixing
- * @li @ref lpp  "libpostproc" post processing library
- * @li @ref libsws "libswscale" color conversion and scaling library
- *
- * @section ffmpeg_versioning Versioning and compatibility
- *
- * Each of the FFmpeg libraries contains a version.h header, which defines a
- * major, minor and micro version number with the
- * <em>LIBRARYNAME_VERSION_{MAJOR,MINOR,MICRO}</em> macros. The major version
- * number is incremented with backward incompatible changes - e.g. removing
- * parts of the public API, reordering public struct members, etc. The minor
- * version number is incremented for backward compatible API changes or major
- * new features - e.g. adding a new public function or a new decoder. The micro
- * version number is incremented for smaller changes that a calling program
- * might still want to check for - e.g. changing behavior in a previously
- * unspecified situation.
- *
- * FFmpeg guarantees backward API and ABI compatibility for each library as long
- * as its major version number is unchanged. This means that no public symbols
- * will be removed or renamed. Types and names of the public struct members and
- * values of public macros and enums will remain the same (unless they were
- * explicitly declared as not part of the public API). Documented behavior will
- * not change.
- *
- * In other words, any correct program that works with a given FFmpeg snapshot
- * should work just as well without any changes with any later snapshot with the
- * same major versions. This applies to both rebuilding the program against new
- * FFmpeg versions or to replacing the dynamic FFmpeg libraries that a program
- * links against.
- *
- * However, new public symbols may be added and new members may be appended to
- * public structs whose size is not part of public ABI (most public structs in
- * FFmpeg). New macros and enum values may be added. Behavior in undocumented
- * situations may change slightly (and be documented). All those are accompanied
- * by an entry in doc/APIchanges and incrementing either the minor or micro
- * version number.
- */
-
-
-/**
- * @brief Undefined timestamp value
- *
- * Usually reported by demuxer that work on containers that do not provide
- * either pts or dts.
- */
-
-#define AV_NOPTS_VALUE          ((int64_t)UINT64_C(0x8000000000000000))
-
-/**
- * Internal time base represented as integer
- */
-
-#define AV_TIME_BASE            1000000
-
-/**
- * Internal time base represented as fractional value
- */
-
-#define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
-
-/**
- * @}
- */
-
-/**
- * Return x default pointer in case p is NULL.
- */
-static inline void *av_x_if_null(const void *p, const void *x)
-{
-    return (void *)(intptr_t)(p ? p : x);
-}
-
-/**
- * Compute the length of an integer list.
- *
- * @param elsize  size in bytes of each list element (only 1, 2, 4 or 8)
- * @param term    list terminator (usually 0 or -1)
- * @param list    pointer to the list
- * @return  length of the list, in elements, not counting the terminator
- */
-unsigned av_int_list_length_for_size(unsigned elsize,
-                                     const void *list, uint64_t term);
-
-/**
- * Compute the length of an integer list.
- *
- * @param term  list terminator (usually 0 or -1)
- * @param list  pointer to the list
- * @return  length of the list, in elements, not counting the terminator
- */
-#define av_int_list_length(list, term) \
-    av_int_list_length_for_size(sizeof(*(list)), list, term)
-
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_AVUTIL_H */

ext/at3_standalone/bytestream.h

@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "common.h"
+#include "compat.h"
 #include "intreadwrite.h"
 
 typedef struct GetByteContext {
@@ -34,16 +34,16 @@ typedef struct GetByteContext {
 } GetByteContext;
 
 #define DEF(type, name, bytes, read, write)                                  \
-static av_always_inline type bytestream_get_ ## name(const uint8_t **b)        \
+static inline type bytestream_get_ ## name(const uint8_t **b)        \
 {                                                                              \
     (*b) += bytes;                                                             \
     return read(*b - bytes);                                                   \
 }                                                                              \
-static av_always_inline type bytestream2_get_ ## name ## u(GetByteContext *g)  \
+static inline type bytestream2_get_ ## name ## u(GetByteContext *g)  \
 {                                                                              \
     return bytestream_get_ ## name(&g->buffer);                                \
 }                                                                              \
-static av_always_inline type bytestream2_get_ ## name(GetByteContext *g)       \
+static inline type bytestream2_get_ ## name(GetByteContext *g)       \
 {                                                                              \
     if (g->buffer_end - g->buffer < bytes) {                                   \
         g->buffer = g->buffer_end;                                             \
@@ -51,7 +51,7 @@ static av_always_inline type bytestream2_get_ ## name(GetByteContext *g)       \
     }                                                                          \
     return bytestream2_get_ ## name ## u(g);                                   \
 }                                                                              \
-static av_always_inline type bytestream2_peek_ ## name(GetByteContext *g)      \
+static inline type bytestream2_peek_ ## name(GetByteContext *g)      \
 {                                                                              \
     if (g->buffer_end - g->buffer < bytes)                                     \
         return 0;                                                              \

ext/at3_standalone/channel_layout.c

@@ -27,9 +27,9 @@
 #include <errno.h>
 #include <stddef.h>
 
-#include "avutil.h"
 #include "channel_layout.h"
-#include "common.h"
+#include "compat.h"
+#include "mathematics.h"
 
 struct channel_name {
     const char *name;

ext/at3_standalone/common.h

@@ -1,136 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * 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
- */
-
-/**
- * @file
- * common internal and external API header
- */
-
-#ifndef AVUTIL_COMMON_H
-#define AVUTIL_COMMON_H
-
-#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) && !defined(UINT64_C)
-#error missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS
-#endif
-
-#include <stdint.h>
-#include <limits.h>
-#include <math.h>
-
-#include "compat.h"
-#include "mem.h"
-
-//rounded division & shift
-#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
-
-#define FFUDIV(a,b) (((a)>0 ?(a):(a)-(b)+1) / (b))
-#define FFUMOD(a,b) ((a)-(b)*FFUDIV(a,b))
-
-#define FF_SANE_NB_CHANNELS 64U
-
-/**
- * @addtogroup preproc_misc Preprocessor String Macros
- *
- * String manipulation macros
- *
- * @{
- */
-
-#define AV_STRINGIFY(s)         AV_TOSTRING(s)
-#define AV_TOSTRING(s) #s
-
-#define AV_GLUE(a, b) a ## b
-#define AV_JOIN(a, b) AV_GLUE(a, b)
-
- /**
-  * @}
-  */
-
-#define AV_PRAGMA(s) _Pragma(#s)
-
-#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
-
-/**
- * Maximum size in bytes of extradata.
- * This value was chosen such that every bit of the buffer is
- * addressable by a 32-bit signed integer as used by get_bits.
- */
-#define FF_MAX_EXTRADATA_SIZE ((1 << 28) - AV_INPUT_BUFFER_PADDING_SIZE)
-
-/**
- * Absolute value, Note, INT_MIN / INT64_MIN result in undefined behavior as they
- * are not representable as absolute values of their type. This is the same
- * as with *abs()
- * @see FFNABS()
- */
-#define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
-
-#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-
-#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
-#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
-
-#ifndef av_log2
-av_const int av_log2(unsigned v);
-#endif
-
-#ifndef av_log2_16bit
-av_const int av_log2_16bit(unsigned v);
-#endif
-
-/**
- * Clear high bits from an unsigned integer starting with specific bit position
- * @param  a value to clip
- * @param  p bit position to clip at
- * @return clipped value
- */
-static av_always_inline av_const unsigned av_mod_uintp2(unsigned a, unsigned p)
-{
-    return a & ((1 << p) - 1);
-}
-
-/**
- * Count number of bits set to one in x
- * @param x value to count bits of
- * @return the number of bits set to one in x
- */
-static av_always_inline av_const int av_popcount(uint32_t x)
-{
-    x -= (x >> 1) & 0x55555555;
-    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
-    x = (x + (x >> 4)) & 0x0F0F0F0F;
-    x += x >> 8;
-    return (x + (x >> 16)) & 0x3F;
-}
-
-/**
- * Count number of bits set to one in x
- * @param x value to count bits of
- * @return the number of bits set to one in x
- */
-static av_always_inline av_const int av_popcount64(uint64_t x)
-{
-    return av_popcount((uint32_t)x) + av_popcount((uint32_t)(x >> 32));
-}
-
-#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
-
-#endif /* AVUTIL_COMMON_H */

ext/at3_standalone/compat.c

@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
 
 #include "ext/at3_standalone/compat.h"
-#include "ext/at3_standalone/common.h"
 
 void av_log(void *avcl, int level, const char *fmt, ...) {
 

ext/at3_standalone/compat.h

@@ -37,6 +37,9 @@
 #define av_printf_format(a,b)
 #define avpriv_report_missing_feature(...)
 
+#define AV_NOPTS_VALUE          ((int64_t)UINT64_C(0x8000000000000000))
+#define AV_TIME_BASE            1000000
+#define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
 
 #define AVERROR(e) (-(e))   ///< Returns a negative error code from a POSIX error code, to return from library functions.
 #define AVUNERROR(e) (-(e)) ///< Returns a POSIX error code from a library function error return value.
@@ -46,6 +49,39 @@
 #define AVERROR_INVALIDDATA        FFERRTAG( 'I','N','D','A') ///< Invalid data found when processing input
 #define AVERROR_PATCHWELCOME       FFERRTAG( 'P','A','W','E') ///< Not yet implemented in FFmpeg, patches welcome
 
+#define FF_SANE_NB_CHANNELS 64U
+
+/**
+ * Maximum size in bytes of extradata.
+ * This value was chosen such that every bit of the buffer is
+ * addressable by a 32-bit signed integer as used by get_bits.
+ */
+#define FF_MAX_EXTRADATA_SIZE ((1 << 28) - AV_INPUT_BUFFER_PADDING_SIZE)
+
+ /**
+  * Absolute value, Note, INT_MIN / INT64_MIN result in undefined behavior as they
+  * are not representable as absolute values of their type. This is the same
+  * as with *abs()
+  * @see FFNABS()
+  */
+#define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
+
+#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
+#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
+
+#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
+#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
+
+#ifndef av_log2
+av_const int av_log2(unsigned v);
+#endif
+
+#ifndef av_log2_16bit
+av_const int av_log2_16bit(unsigned v);
+#endif
+
+#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
+
 #pragma warning(disable:4305)
 #pragma warning(disable:4244)
 

ext/at3_standalone/get_bits.c

@@ -32,7 +32,7 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "common.h"
+#include "compat.h"
 #include "mathematics.h"
 #include "get_bits.h"
 

ext/at3_standalone/get_bits.h

@@ -28,8 +28,7 @@
 
 #include <stdint.h>
 
-#include "common.h"
+#include "compat.h"
-#include "common.h"
 #include "intreadwrite.h"
 #include "mathematics.h"
  /*

ext/at3_standalone/intmath.c

@@ -17,18 +17,3 @@
  */
 
 #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);
-}

ext/at3_standalone/intmath.h

@@ -18,20 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVUTIL_INTMATH_H
+#pragma once
-#define AVUTIL_INTMATH_H
 
 #include <stdint.h>
 
 #include "compat.h"
 
-#if ARCH_ARM
-#   include "arm/intmath.h"
-#endif
-#if ARCH_X86
-#   include "x86/intmath.h"
-#endif
-
 #if HAVE_FAST_CLZ
 #if AV_GCC_VERSION_AT_LEAST(3,4)
 #ifndef ff_log2
@@ -136,8 +128,3 @@ static av_always_inline av_const int ff_ctzll_c(long long v)
     return debruijn_ctz64[(uint64_t)((v & -v) * 0x022FDD63CC95386DU) >> 58];
 }
 #endif
-
-/**
- * @}
- */
-#endif /* AVUTIL_INTMATH_H */

ext/at3_standalone/log.h

@@ -22,7 +22,6 @@
 #define AVUTIL_LOG_H
 
 #include <stdarg.h>
-#include "avutil.h"
 #include "compat.h"
 
 typedef enum {

ext/at3_standalone/mathematics.c

@@ -28,7 +28,7 @@
 
 #include "mathematics.h"
 #include "intmath.h"
-#include "common.h"
+#include "compat.h"
 
 /* Stein's binary GCD algorithm:
  * https://en.wikipedia.org/wiki/Binary_GCD_algorithm */

ext/at3_standalone/mathematics.h

@@ -23,28 +23,25 @@
 
 #include <stdint.h>
 #include <math.h>
+#include <limits.h>
+
 #include "compat.h"
-#include "common.h"
 #include "intfloat.h"
 
 extern const uint32_t ff_inverse[257];
 extern const uint8_t ff_sqrt_tab[256];
 
-#ifndef sign_extend
+static inline int sign_extend(int val, unsigned bits)
-static inline av_const int sign_extend(int val, unsigned bits)
 {
 	unsigned shift = 8 * sizeof(int) - bits;
 	union { unsigned u; int s; } v = { (unsigned)val << shift };
 	return v.s >> shift;
 }
-#endif
 
-#ifndef zero_extend
+static inline unsigned zero_extend(unsigned val, unsigned bits)
-static inline av_const unsigned zero_extend(unsigned val, unsigned bits)
 {
 	return (val << ((8 * sizeof(int)) - bits)) >> ((8 * sizeof(int)) - bits);
 }
-#endif
 
 #ifndef NEG_SSR32
 #   define NEG_SSR32(a,s) ((( int32_t)(a))>>(32-(s)))
@@ -54,15 +51,6 @@ static inline av_const unsigned zero_extend(unsigned val, unsigned bits)
 #   define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s)))
 #endif
 
-#ifndef M_E
-#define M_E            2.7182818284590452354   /* e */
-#endif
-#ifndef M_LN2
-#define M_LN2          0.69314718055994530942  /* log_e 2 */
-#endif
-#ifndef M_LN10
-#define M_LN10         2.30258509299404568402  /* log_e 10 */
-#endif
 #ifndef M_LOG2_10
 #define M_LOG2_10      3.32192809488736234787  /* log_2 10 */
 #endif
@@ -81,12 +69,6 @@ static inline av_const unsigned zero_extend(unsigned val, unsigned bits)
 #ifndef M_SQRT2
 #define M_SQRT2        1.41421356237309504880  /* sqrt(2) */
 #endif
-#ifndef NAN
-#define NAN            av_int2float(0x7fc00000)
-#endif
-#ifndef INFINITY
-#define INFINITY       av_int2float(0x7f800000)
-#endif
 
 /**
  * @addtogroup lavu_math
@@ -203,7 +185,7 @@ int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max)
  * @param c second rational
  * @return b*c
  */
-AVRational av_mul_q(AVRational b, AVRational c) av_const;
+AVRational av_mul_q(AVRational b, AVRational c);
 
 /**
  * Divide one rational by another.
@@ -211,7 +193,7 @@ AVRational av_mul_q(AVRational b, AVRational c) av_const;
  * @param c second rational
  * @return b/c
  */
-AVRational av_div_q(AVRational b, AVRational c) av_const;
+AVRational av_div_q(AVRational b, AVRational c);
 
 /**
  * Add two rationals.
@@ -219,14 +201,14 @@ AVRational av_div_q(AVRational b, AVRational c) av_const;
  * @param c second rational
  * @return b+c
  */
-AVRational av_add_q(AVRational b, AVRational c) av_const;
+AVRational av_add_q(AVRational b, AVRational c);
 
 /**
  * Invert a rational.
  * @param q value
  * @return 1 / q
  */
-static av_always_inline AVRational av_inv_q(AVRational q)
+static inline AVRational av_inv_q(AVRational q)
 {
 	AVRational r = { q.den, q.num };
 	return r;
@@ -240,6 +222,42 @@ static av_always_inline AVRational av_inv_q(AVRational q)
  * @param max the maximum allowed numerator and denominator
  * @return (AVRational) d
  */
-AVRational av_d2q(double d, int max) av_const;
+AVRational av_d2q(double d, int max);
+
+
+/**
+ * Clear high bits from an unsigned integer starting with specific bit position
+ * @param  a value to clip
+ * @param  p bit position to clip at
+ * @return clipped value
+ */
+static inline unsigned av_mod_uintp2(unsigned a, unsigned p)
+{
+	return a & ((1 << p) - 1);
+}
+
+/**
+ * Count number of bits set to one in x
+ * @param x value to count bits of
+ * @return the number of bits set to one in x
+ */
+static inline int av_popcount(uint32_t x)
+{
+	x -= (x >> 1) & 0x55555555;
+	x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
+	x = (x + (x >> 4)) & 0x0F0F0F0F;
+	x += x >> 8;
+	return (x + (x >> 16)) & 0x3F;
+}
+
+/**
+ * Count number of bits set to one in x
+ * @param x value to count bits of
+ * @return the number of bits set to one in x
+ */
+static inline int av_popcount64(uint64_t x)
+{
+	return av_popcount((uint32_t)x) + av_popcount((uint32_t)(x >> 32));
+}
 
 #endif /* AVUTIL_MATHEMATICS_H */

ext/at3_standalone/mem.c

@@ -32,8 +32,6 @@
 #include <string.h>
 
 #include "compat.h"
-#include "avutil.h"
-#include "common.h"
 #include "intreadwrite.h"
 #include "mem.h"
 

ext/at3_standalone/mem.h

@@ -18,13 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/**
+#pragma once
- * @file
- * memory handling functions
- */
-
-#ifndef AVUTIL_MEM_H
-#define AVUTIL_MEM_H
 
 #include <limits.h>
 #include <stdint.h>
@@ -32,25 +26,10 @@
 #include <stddef.h>
 
 #include "compat.h"
-#include "avutil.h"
 
-/**
- * @addtogroup lavu_mem
- * @{
- */
 #define FF_MEMORY_POISON 0x2a
 
-#if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || defined(__SUNPRO_C)
+#if defined(__GNUC__)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
-#elif defined(__TI_COMPILER_VERSION__)
-    #define DECLARE_ALIGNED(n,t,v)                      \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        t __attribute__((aligned(n))) v
-    #define DECLARE_ASM_CONST(n,t,v)                    \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        static const t __attribute__((aligned(n))) v
-#elif defined(__GNUC__)
     #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
     #define DECLARE_ASM_CONST(n,t,v)    static const t av_used __attribute__ ((aligned (n))) v
 #elif defined(_MSC_VER)
@@ -235,5 +214,3 @@ void av_fast_mallocz(void *ptr, unsigned int *size, size_t min_size);
 /**
  * @}
  */
-
-#endif /* AVUTIL_MEM_H */

ext/at3_standalone/sinewin.c

@@ -22,7 +22,6 @@
 #include <assert.h>
 #include "aac_defines.h"
 #include "compat.h"
-#include "common.h"
 
 #include "mem.h"
 #include "aac_defines.h"