This will allow for easier implementation of ARM-optimized functions in libraries other than libavcodec.
Unified · Split
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | |
| 23 | 23 | function ff_ps_add_squares_neon, export=1 |
| 24 | 24 | mov r3, r0 |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | |
| 23 | 23 | function ff_ac3_update_bap_counts_arm, export=1 |
| 24 | 24 | push {lr} |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | |
| 23 | 23 | function ff_ac3_bit_alloc_calc_bap_armv6, export=1 |
| 24 | 24 | ldr r12, [sp] |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | |
| 23 | 23 | function ff_ac3_max_msb_abs_int16_neon, export=1 |
| 24 | 24 | vmov.i16 q0, #0 |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | |
| 23 | 23 | function ff_dca_lfe_fir_neon, export=1 |
| 24 | 24 | push {r4-r6,lr} |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | @ |
| 21 | 21 | |
| 22 | 22 | #include "config.h" |
| 23 | −#include "asm.S" | |
| 23 | +#include "libavutil/arm/asm.S" | |
| 24 | 24 | |
| 25 | 25 | preserve8 |
| 26 | 26 | |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | |
| 23 | 23 | preserve8 |
| 24 | 24 | |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | 22 | #include "config.h" |
| 23 | −#include "asm.S" | |
| 23 | +#include "libavutil/arm/asm.S" | |
| 24 | 24 | |
| 25 | 25 | preserve8 |
| 26 | 26 | |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | 21 | #include "config.h" |
| 22 | −#include "asm.S" | |
| 22 | +#include "libavutil/arm/asm.S" | |
| 23 | 23 | |
| 24 | 24 | /* |
| 25 | 25 | * VFP is a floating point coprocessor used in some ARM cores. VFP11 has 1 cycle |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | |
| 23 | 23 | .macro bflies d0, d1, r0, r1 |
| 24 | 24 | vrev64.32 \r0, \d1 @ t5, t6, t1, t2 |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 25 | 25 | */ |
| 26 | 26 | |
| 27 | −#include "asm.S" | |
| 27 | +#include "libavutil/arm/asm.S" | |
| 28 | 28 | |
| 29 | 29 | #define M_SQRT1_2 0.70710678118654752440 |
| 30 | 30 | |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | 22 | #include "config.h" |
| 23 | −#include "asm.S" | |
| 23 | +#include "libavutil/arm/asm.S" | |
| 24 | 24 | |
| 25 | 25 | preserve8 |
| 26 | 26 | |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | 21 | #include "config.h" |
| 22 | −#include "asm.S" | |
| 22 | +#include "libavutil/arm/asm.S" | |
| 23 | 23 | |
| 24 | 24 | /** |
| 25 | 25 | * ARM VFP optimized float to int16 conversion. |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | |
| 23 | 23 | /* chroma_mc8(uint8_t *dst, uint8_t *src, int stride, int h, int x, int y) */ |
| 24 | 24 | .macro h264_chroma_mc8 type, codec=h264 |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | #include "neon.S" |
| 23 | 23 | |
| 24 | 24 | /* H.264 loop filter */ |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | |
| 23 | 23 | preserve8 |
| 24 | 24 | |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | |
| 23 | 23 | .macro ldcol.8 rd, rs, rt, n=8, hi=0 |
| 24 | 24 | .if \n == 8 || \hi == 0 |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | −#include "asm.S" | |
| 22 | +#include "libavutil/arm/asm.S" | |
| 23 | 23 | |
| 24 | 24 | preserve8 |
| 25 | 25 | .fpu neon |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | |
| 26 | 26 | */ |
| 27 | 27 | |
| 28 | −#include "asm.S" | |
| 28 | +#include "libavutil/arm/asm.S" | |
| 29 | 29 | |
| 30 | 30 | #define FIX_0_298631336 2446 |
| 31 | 31 | #define FIX_0_541196100 4433 |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | |
| 23 | 23 | preserve8 |
| 24 | 24 | |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | −#include "asm.S" | |
| 22 | +#include "libavutil/arm/asm.S" | |
| 23 | 23 | |
| 24 | 24 | preserve8 |
| 25 | 25 | |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | |
| 23 | 23 | .macro skip args:vararg |
| 24 | 24 | .endm |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | 22 | #include "config.h" |
| 23 | −#include "asm.S" | |
| 23 | +#include "libavutil/arm/asm.S" | |
| 24 | 24 | |
| 25 | 25 | /* |
| 26 | 26 | * Special optimized version of dct_unquantize_h263_helper_c, it |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | #include "asm-offsets.h" |
| 23 | 23 | |
| 24 | 24 | function ff_dct_unquantize_h263_inter_neon, export=1 |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | −#include "asm.S" | |
| 22 | +#include "libavutil/arm/asm.S" | |
| 23 | 23 | |
| 24 | 24 | preserve8 |
| 25 | 25 | |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | #include "neon.S" |
| 23 | 23 | |
| 24 | 24 | .macro rv34_inv_transform r0 |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | −#include "asm.S" | |
| 22 | +#include "libavutil/arm/asm.S" | |
| 23 | 23 | #include "neon.S" |
| 24 | 24 | |
| 25 | 25 | .macro qpel_lowpass r0, r1, rc1, rc2, shift |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | |
| 23 | 23 | function ff_sbr_sum64x5_neon, export=1 |
| 24 | 24 | push {lr} |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 24 | 24 | */ |
| 25 | 25 | |
| 26 | −#include "asm.S" | |
| 26 | +#include "libavutil/arm/asm.S" | |
| 27 | 27 | |
| 28 | 28 | /* useful constants for the algorithm, they are save in __constant_ptr__ at */ |
| 29 | 29 | /* the end of the source code.*/ |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 22 | 22 | */ |
| 23 | 23 | |
| 24 | −#include "asm.S" | |
| 24 | +#include "libavutil/arm/asm.S" | |
| 25 | 25 | |
| 26 | 26 | #define W1 22725 /* cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5 */ |
| 27 | 27 | #define W2 21407 /* cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5 */ |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 22 | 22 | */ |
| 23 | 23 | |
| 24 | −#include "asm.S" | |
| 24 | +#include "libavutil/arm/asm.S" | |
| 25 | 25 | |
| 26 | 26 | #define W1 22725 /* cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5 */ |
| 27 | 27 | #define W2 21407 /* cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5 */ |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 24 | 24 | */ |
| 25 | 25 | |
| 26 | −#include "asm.S" | |
| 26 | +#include "libavutil/arm/asm.S" | |
| 27 | 27 | |
| 28 | 28 | #define W1 22725 //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5 |
| 29 | 29 | #define W2 21407 //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5 |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | |
| 23 | 23 | preserve8 |
| 24 | 24 | |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | |
| 23 | 23 | const vp3_idct_constants, align=4 |
| 24 | 24 | .short 64277, 60547, 54491, 46341, 36410, 25080, 12785 |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | |
| 23 | 23 | .macro vp6_edge_filter |
| 24 | 24 | vdup.16 q3, r2 @ t |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include "asm.S" | |
| 21 | +#include "libavutil/arm/asm.S" | |
| 22 | 22 | |
| 23 | 23 | .macro rac_get_prob h, bs, buf, cw, pr, t0, t1 |
| 24 | 24 | adds \bs, \bs, \t0 |
| @@ -52,7 +52,7 @@ · 51 unmodified lines | ||
| 52 | 52 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 53 | 53 | */ |
| 54 | 54 | |
| 55 | −#include "asm.S" | |
| 55 | +#include "libavutil/arm/asm.S" | |
| 56 | 56 | |
| 57 | 57 | @ idct |
| 58 | 58 | |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 22 | 22 | */ |
| 23 | 23 | |
| 24 | −#include "asm.S" | |
| 24 | +#include "libavutil/arm/asm.S" | |
| 25 | 25 | #include "neon.S" |
| 26 | 26 | |
| 27 | 27 | function ff_vp8_luma_dc_wht_neon, export=1 |
File renamed without changes.