History

lavu: move LOCAL_ALIGNED from internal.h to mem_internal.h

That is a more appropriate place for it.

Anton Khirnov committed 6 years ago

Commit c8c2dfb1 parent 54cd02587 files · +141 −37Browse files

Unified · Split

87 files
  1. libavcodec/aacps.c +1 −0
  2. libavcodec/aacsbr.c +1 −0
  3. libavcodec/aarch64/vp9dsp_init_16bpp_aarch64_template.c +1 −0
  4. libavcodec/aarch64/vp9dsp_init_aarch64.c +1 −0
  5. libavcodec/ac3enc.c +1 −0
  6. libavcodec/ac3enc_template.c +1 −0
  7. libavcodec/arm/vp9dsp_init_16bpp_arm_template.c +1 −0
  8. libavcodec/arm/vp9dsp_init_arm.c +1 −0
  9. libavcodec/atrac3plusdsp.c +2 −0
  10. libavcodec/bink.c +1 −0
  11. libavcodec/dca_lbr.c +1 −0
  12. libavcodec/dcadsp.c +1 −0
  13. libavcodec/dcaenc.c +1 −0
  14. libavcodec/dnxhdenc.c +1 −0
  15. libavcodec/dolby_e.c +1 −0
  16. libavcodec/dvdec.c +1 −0
  17. libavcodec/dvenc.c +1 −0
  18. libavcodec/h264_loopfilter.c +1 −0
  19. libavcodec/imc.c +2 −0
  20. libavcodec/ituh263dec.c +1 −0
  21. libavcodec/lpc.c +1 −0
  22. libavcodec/me_cmp.c +1 −0
  23. libavcodec/mips/aacsbr_mips.c +1 −0
  24. libavcodec/mips/vc1dsp_mmi.c +1 −0
  25. libavcodec/mpc7.c +2 −0
  26. libavcodec/mpegvideo_enc.c +1 −0
  27. libavcodec/mpegvideo_motion.c +2 −0
  28. libavcodec/ppc/mpegaudiodsp_altivec.c +1 −0
  29. libavcodec/proresdec2.c +2 −0
  30. libavcodec/proresenc_anatoliy.c +1 −0
  31. libavcodec/ra288.c +1 −0
  32. libavcodec/rv34.c +1 −0
  33. libavcodec/speedhq.c +1 −0
  34. libavcodec/tests/dct.c +1 −0
  35. libavcodec/tests/x86/dct.c +2 −0
  36. libavcodec/vp8.c +1 −0
  37. libavcodec/vp9recon.c +1 −0
  38. libavcodec/x86/cavsdsp.c +1 −0
  39. libavcodec/x86/h264_qpel.c +1 −0
  40. libavcodec/x86/hevcdsp_init.c +1 −0
  41. libavcodec/x86/mpegaudiodsp.c +1 −0
  42. libavcodec/x86/mpegvideoenc_template.c +1 −0
  43. libavcodec/x86/rv40dsp_init.c +1 −0
  44. libavcodec/x86/vc1dsp_mmx.c +1 −0
  45. libavcodec/x86/vp8dsp_init.c +1 −0
  46. libavcodec/x86/vp9dsp_init.h +2 −0
  47. libavfilter/af_arnndn.c +1 −0
  48. libavutil/internal.h +0 −37
  49. libavutil/mem_internal.h +42 −0
  50. libavutil/mips/mmiutils.h +2 −0
  51. libavutil/tests/lls.c +1 −0
  52. libswscale/ppc/swscale_ppc_template.c +2 −0
  53. libswscale/ppc/swscale_vsx.c +1 −0
  54. tests/checkasm/aacpsdsp.c +1 −0
  55. tests/checkasm/af_afir.c +1 −0
  56. tests/checkasm/alacdsp.c +1 −0
  57. tests/checkasm/audiodsp.c +1 −0
  58. tests/checkasm/blockdsp.c +1 −0
  59. tests/checkasm/bswapdsp.c +1 −0
  60. tests/checkasm/exrdsp.c +1 −0
  61. tests/checkasm/fixed_dsp.c +1 −0
  62. tests/checkasm/flacdsp.c +1 −0
  63. tests/checkasm/float_dsp.c +2 −0
  64. tests/checkasm/fmtconvert.c +2 −0
  65. tests/checkasm/h264dsp.c +1 −0
  66. tests/checkasm/h264pred.c +1 −0
  67. tests/checkasm/h264qpel.c +1 −0
  68. tests/checkasm/hevc_add_res.c +1 −0
  69. tests/checkasm/hevc_idct.c +1 −0
  70. tests/checkasm/hevc_sao.c +1 −0
  71. tests/checkasm/jpeg2000dsp.c +1 −0
  72. tests/checkasm/llviddspenc.c +1 −0
  73. tests/checkasm/opusdsp.c +2 −0
  74. tests/checkasm/pixblockdsp.c +1 −0
  75. tests/checkasm/sbrdsp.c +2 −0
  76. tests/checkasm/sw_rgb.c +1 −0
  77. tests/checkasm/sw_scale.c +1 −0
  78. tests/checkasm/synth_filter.c +2 −0
  79. tests/checkasm/utvideodsp.c +1 −0
  80. tests/checkasm/v210enc.c +1 −0
  81. tests/checkasm/vf_colorspace.c +1 −0
  82. tests/checkasm/vf_eq.c +1 −0
  83. tests/checkasm/vf_hflip.c +1 −0
  84. tests/checkasm/vf_threshold.c +1 −0
  85. tests/checkasm/videodsp.c +1 −0
  86. tests/checkasm/vp8dsp.c +1 −0
  87. tests/checkasm/vp9dsp.c +1 −0
libavcodec/aacps.c+1−0
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525 #include <stdint.h>
2626 #include "libavutil/common.h"
2727 #include "libavutil/mathematics.h"
28+#include "libavutil/mem_internal.h"
2829 #include "avcodec.h"
2930 #include "aacps.h"
3031 #if USE_FIXED
libavcodec/aacsbr.c+1−0
@@ -38,6 +38,7 @@ · 37 unmodified lines
3838 #include "libavutil/internal.h"
3939 #include "libavutil/libm.h"
4040 #include "libavutil/avassert.h"
41+#include "libavutil/mem_internal.h"
4142
4243 #include <stdint.h>
4344 #include <float.h>
libavcodec/aarch64/vp9dsp_init_16bpp_aarch64_template.c+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222
2323 #include "libavutil/attributes.h"
2424 #include "libavutil/internal.h"
25+#include "libavutil/mem_internal.h"
2526 #include "libavutil/aarch64/cpu.h"
2627 #include "vp9dsp_init.h"
2728
libavcodec/aarch64/vp9dsp_init_aarch64.c+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222
2323 #include "libavutil/attributes.h"
2424 #include "libavutil/internal.h"
25+#include "libavutil/mem_internal.h"
2526 #include "libavutil/aarch64/cpu.h"
2627 #include "libavcodec/vp9dsp.h"
2728 #include "vp9dsp_init.h"
libavcodec/ac3enc.c+1−0
@@ -34,6 +34,7 @@ · 33 unmodified lines
3434 #include "libavutil/channel_layout.h"
3535 #include "libavutil/crc.h"
3636 #include "libavutil/internal.h"
37+#include "libavutil/mem_internal.h"
3738 #include "libavutil/opt.h"
3839 #include "avcodec.h"
3940 #include "internal.h"
libavcodec/ac3enc_template.c+1−0
@@ -30,6 +30,7 @@ · 29 unmodified lines
3030
3131 #include "libavutil/attributes.h"
3232 #include "libavutil/internal.h"
33+#include "libavutil/mem_internal.h"
3334
3435 #include "audiodsp.h"
3536 #include "internal.h"
libavcodec/arm/vp9dsp_init_16bpp_arm_template.c+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222
2323 #include "libavutil/attributes.h"
2424 #include "libavutil/internal.h"
25+#include "libavutil/mem_internal.h"
2526 #include "libavutil/arm/cpu.h"
2627 #include "vp9dsp_init.h"
2728
libavcodec/arm/vp9dsp_init_arm.c+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222
2323 #include "libavutil/attributes.h"
2424 #include "libavutil/internal.h"
25+#include "libavutil/mem_internal.h"
2526 #include "libavutil/arm/cpu.h"
2627 #include "libavcodec/vp9dsp.h"
2728 #include "vp9dsp_init.h"
libavcodec/atrac3plusdsp.c+2−0
@@ -29,6 +29,8 @@ · 28 unmodified lines
2929
3030 #include "libavutil/float_dsp.h"
3131 #include "libavutil/libm.h"
32+#include "libavutil/mem_internal.h"
33+
3234 #include "avcodec.h"
3335 #include "sinewin.h"
3436 #include "fft.h"
libavcodec/bink.c+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #include "libavutil/attributes.h"
2424 #include "libavutil/imgutils.h"
2525 #include "libavutil/internal.h"
26+#include "libavutil/mem_internal.h"
2627
2728 #define BITSTREAM_READER_LE
2829 #include "avcodec.h"
libavcodec/dca_lbr.c+1−0
@@ -21,6 +21,7 @@ · 20 unmodified lines
2121 #define BITSTREAM_READER_LE
2222
2323 #include "libavutil/channel_layout.h"
24+#include "libavutil/mem_internal.h"
2425
2526 #include "dcadec.h"
2627 #include "dcadata.h"
libavcodec/dcadsp.c+1−0
@@ -19,6 +19,7 @@ · 18 unmodified lines
1919 */
2020
2121 #include "libavutil/mem.h"
22+#include "libavutil/mem_internal.h"
2223
2324 #include "dcadsp.h"
2425 #include "dcamath.h"
libavcodec/dcaenc.c+1−0
@@ -28,6 +28,7 @@ · 27 unmodified lines
2828 #include "libavutil/channel_layout.h"
2929 #include "libavutil/common.h"
3030 #include "libavutil/ffmath.h"
31+#include "libavutil/mem_internal.h"
3132 #include "libavutil/opt.h"
3233 #include "avcodec.h"
3334 #include "dca.h"
libavcodec/dnxhdenc.c+1−0
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525
2626 #include "libavutil/attributes.h"
2727 #include "libavutil/internal.h"
28+#include "libavutil/mem_internal.h"
2829 #include "libavutil/opt.h"
2930
3031 #include "avcodec.h"
libavcodec/dolby_e.c+1−0
@@ -21,6 +21,7 @@ · 20 unmodified lines
2121 #include "libavutil/float_dsp.h"
2222 #include "libavutil/thread.h"
2323 #include "libavutil/mem.h"
24+#include "libavutil/mem_internal.h"
2425
2526 #include "internal.h"
2627 #include "get_bits.h"
libavcodec/dvdec.c+1−0
@@ -38,6 +38,7 @@ · 37 unmodified lines
3838 #include "libavutil/avassert.h"
3939 #include "libavutil/imgutils.h"
4040 #include "libavutil/internal.h"
41+#include "libavutil/mem_internal.h"
4142 #include "libavutil/pixdesc.h"
4243
4344 #include "avcodec.h"
libavcodec/dvenc.c+1−0
@@ -30,6 +30,7 @@ · 29 unmodified lines
3030
3131 #include "libavutil/attributes.h"
3232 #include "libavutil/internal.h"
33+#include "libavutil/mem_internal.h"
3334 #include "libavutil/opt.h"
3435 #include "libavutil/pixdesc.h"
3536
libavcodec/h264_loopfilter.c+1−0
@@ -27,6 +27,7 @@ · 26 unmodified lines
2727
2828 #include "libavutil/internal.h"
2929 #include "libavutil/intreadwrite.h"
30+#include "libavutil/mem_internal.h"
3031 #include "internal.h"
3132 #include "avcodec.h"
3233 #include "h264dec.h"
libavcodec/imc.c+2−0
@@ -38,7 +38,9 @@ · 37 unmodified lines
3838 #include "libavutil/ffmath.h"
3939 #include "libavutil/float_dsp.h"
4040 #include "libavutil/internal.h"
41+#include "libavutil/mem_internal.h"
4142 #include "libavutil/thread.h"
43+
4244 #include "avcodec.h"
4345 #include "bswapdsp.h"
4446 #include "get_bits.h"
libavcodec/ituh263dec.c+1−0
@@ -34,6 +34,7 @@ · 33 unmodified lines
3434 #include "libavutil/imgutils.h"
3535 #include "libavutil/internal.h"
3636 #include "libavutil/mathematics.h"
37+#include "libavutil/mem_internal.h"
3738 #include "avcodec.h"
3839 #include "mpegvideo.h"
3940 #include "h263.h"
libavcodec/lpc.c+1−0
@@ -21,6 +21,7 @@ · 20 unmodified lines
2121
2222 #include "libavutil/common.h"
2323 #include "libavutil/lls.h"
24+#include "libavutil/mem_internal.h"
2425
2526 #define LPC_USE_DOUBLE
2627 #include "lpc.h"
libavcodec/me_cmp.c+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222
2323 #include "libavutil/attributes.h"
2424 #include "libavutil/internal.h"
25+#include "libavutil/mem_internal.h"
2526 #include "avcodec.h"
2627 #include "copy_block.h"
2728 #include "simple_idct.h"
libavcodec/mips/aacsbr_mips.c+1−0
@@ -53,6 +53,7 @@ · 52 unmodified lines
5353
5454 #include "libavcodec/aac.h"
5555 #include "libavcodec/aacsbr.h"
56+#include "libavutil/mem_internal.h"
5657 #include "libavutil/mips/asmdefs.h"
5758
5859 #define ENVELOPE_ADJUSTMENT_OFFSET 2
libavcodec/mips/vc1dsp_mmi.c+1−0
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525 #include "constants.h"
2626 #include "vc1dsp_mips.h"
2727 #include "hpeldsp_mips.h"
28+#include "libavutil/mem_internal.h"
2829 #include "libavutil/mips/mmiutils.h"
2930
3031 #define VC1_INV_TRANCS_8_TYPE1(o1, o2, r1, r2, r3, r4, c0) \
libavcodec/mpc7.c+2−0
@@ -28,7 +28,9 @@ · 27 unmodified lines
2828 #include "libavutil/channel_layout.h"
2929 #include "libavutil/internal.h"
3030 #include "libavutil/lfg.h"
31+#include "libavutil/mem_internal.h"
3132 #include "libavutil/thread.h"
33+
3234 #include "avcodec.h"
3335 #include "get_bits.h"
3436 #include "internal.h"
libavcodec/mpegvideo_enc.c+1−0
@@ -36,6 +36,7 @@ · 35 unmodified lines
3636 #include "libavutil/internal.h"
3737 #include "libavutil/intmath.h"
3838 #include "libavutil/mathematics.h"
39+#include "libavutil/mem_internal.h"
3940 #include "libavutil/pixdesc.h"
4041 #include "libavutil/opt.h"
4142 #include "avcodec.h"
libavcodec/mpegvideo_motion.c+2−0
@@ -25,6 +25,8 @@ · 24 unmodified lines
2525
2626 #include "libavutil/avassert.h"
2727 #include "libavutil/internal.h"
28+#include "libavutil/mem_internal.h"
29+
2830 #include "avcodec.h"
2931 #include "h261.h"
3032 #include "mpegutils.h"
libavcodec/ppc/mpegaudiodsp_altivec.c+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #include "libavutil/attributes.h"
2424 #include "libavutil/cpu.h"
2525 #include "libavutil/internal.h"
26+#include "libavutil/mem_internal.h"
2627 #include "libavutil/ppc/cpu.h"
2728 #include "libavutil/ppc/util_altivec.h"
2829 #include "libavcodec/mpegaudiodsp.h"
libavcodec/proresdec2.c+2−0
@@ -29,6 +29,8 @@ · 28 unmodified lines
2929 #define LONG_BITSTREAM_READER
3030
3131 #include "libavutil/internal.h"
32+#include "libavutil/mem_internal.h"
33+
3234 #include "avcodec.h"
3335 #include "get_bits.h"
3436 #include "idctdsp.h"
libavcodec/proresenc_anatoliy.c+1−0
@@ -27,6 +27,7 @@ · 26 unmodified lines
2727 * Known FOURCCs: 'ap4h' (444), 'apch' (HQ), 'apcn' (422), 'apcs' (LT), 'acpo' (Proxy)
2828 */
2929
30+#include "libavutil/mem_internal.h"
3031 #include "libavutil/opt.h"
3132 #include "avcodec.h"
3233 #include "dct.h"
libavcodec/ra288.c+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222 #include "libavutil/channel_layout.h"
2323 #include "libavutil/float_dsp.h"
2424 #include "libavutil/internal.h"
25+#include "libavutil/mem_internal.h"
2526
2627 #define BITSTREAM_READER_LE
2728 #include "avcodec.h"
libavcodec/rv34.c+1−0
@@ -27,6 +27,7 @@ · 26 unmodified lines
2727 #include "libavutil/avassert.h"
2828 #include "libavutil/imgutils.h"
2929 #include "libavutil/internal.h"
30+#include "libavutil/mem_internal.h"
3031 #include "libavutil/thread.h"
3132
3233 #include "avcodec.h"
libavcodec/speedhq.c+1−0
@@ -28,6 +28,7 @@ · 27 unmodified lines
2828
2929 #include "config.h"
3030 #include "libavutil/attributes.h"
31+#include "libavutil/mem_internal.h"
3132
3233 #include "avcodec.h"
3334 #include "get_bits.h"
libavcodec/tests/dct.c+1−0
@@ -38,6 +38,7 @@ · 37 unmodified lines
3838 #include "libavutil/common.h"
3939 #include "libavutil/internal.h"
4040 #include "libavutil/lfg.h"
41+#include "libavutil/mem_internal.h"
4142 #include "libavutil/time.h"
4243
4344 #include "libavcodec/dct.h"
libavcodec/tests/x86/dct.c+2−0
@@ -18,6 +18,8 @@ · 17 unmodified lines
1818
1919 #include "config.h"
2020
21+#include "libavutil/mem_internal.h"
22+
2123 #include "libavcodec/x86/fdct.h"
2224 #include "libavcodec/x86/xvididct.h"
2325 #include "libavcodec/x86/simple_idct.h"
libavcodec/vp8.c+1−0
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525 */
2626
2727 #include "libavutil/imgutils.h"
28+#include "libavutil/mem_internal.h"
2829
2930 #include "avcodec.h"
3031 #include "hwconfig.h"
libavcodec/vp9recon.c+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222 */
2323
2424 #include "libavutil/avassert.h"
25+#include "libavutil/mem_internal.h"
2526
2627 #include "avcodec.h"
2728 #include "internal.h"
libavcodec/x86/cavsdsp.c+1−0
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525 #include "libavutil/attributes.h"
2626 #include "libavutil/common.h"
2727 #include "libavutil/cpu.h"
28+#include "libavutil/mem_internal.h"
2829 #include "libavutil/x86/asm.h"
2930 #include "libavutil/x86/cpu.h"
3031 #include "libavcodec/cavsdsp.h"
libavcodec/x86/h264_qpel.c+1−0
@@ -21,6 +21,7 @@ · 20 unmodified lines
2121
2222 #include "libavutil/attributes.h"
2323 #include "libavutil/cpu.h"
24+#include "libavutil/mem_internal.h"
2425 #include "libavutil/x86/asm.h"
2526 #include "libavutil/x86/cpu.h"
2627 #include "libavcodec/h264dec.h"
libavcodec/x86/hevcdsp_init.c+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222 #include "config.h"
2323
2424 #include "libavutil/cpu.h"
25+#include "libavutil/mem_internal.h"
2526 #include "libavutil/x86/asm.h"
2627 #include "libavutil/x86/cpu.h"
2728 #include "libavcodec/get_bits.h" /* required for hevcdsp.h GetBitContext */
libavcodec/x86/mpegaudiodsp.c+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222 #include "libavutil/attributes.h"
2323 #include "libavutil/cpu.h"
2424 #include "libavutil/internal.h"
25+#include "libavutil/mem_internal.h"
2526 #include "libavutil/x86/asm.h"
2627 #include "libavutil/x86/cpu.h"
2728 #include "libavcodec/mpegaudiodsp.h"
libavcodec/x86/mpegvideoenc_template.c+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #include <stdint.h>
2424
2525 #include "libavutil/internal.h"
26+#include "libavutil/mem_internal.h"
2627 #include "libavutil/x86/asm.h"
2728 #include "libavcodec/mpegutils.h"
2829 #include "libavcodec/mpegvideo.h"
libavcodec/x86/rv40dsp_init.c+1−0
@@ -29,6 +29,7 @@ · 28 unmodified lines
2929 #include "libavcodec/rv34dsp.h"
3030 #include "libavutil/attributes.h"
3131 #include "libavutil/mem.h"
32+#include "libavutil/mem_internal.h"
3233 #include "libavutil/x86/cpu.h"
3334 #include "hpeldsp.h"
3435
libavcodec/x86/vc1dsp_mmx.c+1−0
@@ -26,6 +26,7 @@ · 25 unmodified lines
2626
2727 #include "libavutil/cpu.h"
2828 #include "libavutil/mem.h"
29+#include "libavutil/mem_internal.h"
2930 #include "libavutil/x86/asm.h"
3031 #include "libavutil/x86/cpu.h"
3132 #include "libavcodec/vc1dsp.h"
libavcodec/x86/vp8dsp_init.c+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #include "libavutil/attributes.h"
2424 #include "libavutil/cpu.h"
2525 #include "libavutil/mem.h"
26+#include "libavutil/mem_internal.h"
2627 #include "libavutil/x86/cpu.h"
2728 #include "libavcodec/vp8dsp.h"
2829
libavcodec/x86/vp9dsp_init.h+2−0
@@ -23,6 +23,8 @@ · 22 unmodified lines
2323 #ifndef AVCODEC_X86_VP9DSP_INIT_H
2424 #define AVCODEC_X86_VP9DSP_INIT_H
2525
26+#include "libavutil/mem_internal.h"
27+
2628 #include "libavcodec/vp9dsp.h"
2729
2830 // hack to force-expand BPC
libavfilter/af_arnndn.c+1−0
@@ -36,6 +36,7 @@ · 35 unmodified lines
3636 #include "libavutil/avassert.h"
3737 #include "libavutil/avstring.h"
3838 #include "libavutil/float_dsp.h"
39+#include "libavutil/mem_internal.h"
3940 #include "libavutil/opt.h"
4041 #include "libavutil/tx.h"
4142 #include "avfilter.h"
libavutil/internal.h+0−37
@@ -92,10 +92,6 @@ · 91 unmodified lines
9292 type av_##name##_get_##field(const str *s) { return s->field; } \
9393 void av_##name##_set_##field(str *s, type v) { s->field = v; }
9494
95−// Some broken preprocessors need a second expansion
96−// to be forced to tokenize __VA_ARGS__
97−#define E1(x) x
98−
9995 /* Check if the hard coded offset of a struct member still matches reality.
10096 * Induce a compilation failure if not.
10197 */
@@ -103,39 +99,6 @@ · 1 unmodified line
10399 int x_##o[offsetof(s, m) == o? 1: -1]; \
104100 }
105101
106−#define LOCAL_ALIGNED_A(a, t, v, s, o, ...) \
107− uint8_t la_##v[sizeof(t s o) + (a)]; \
108− t (*v) o = (void *)FFALIGN((uintptr_t)la_##v, a)
109−
110−#define LOCAL_ALIGNED_D(a, t, v, s, o, ...) \
111− DECLARE_ALIGNED(a, t, la_##v) s o; \
112− t (*v) o = la_##v
113−
114−#define LOCAL_ALIGNED(a, t, v, ...) LOCAL_ALIGNED_##a(t, v, __VA_ARGS__)
115−
116−#if HAVE_LOCAL_ALIGNED
117−# define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_D(4, t, v, __VA_ARGS__,,))
118−#else
119−# define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_A(4, t, v, __VA_ARGS__,,))
120−#endif
121−
122−#if HAVE_LOCAL_ALIGNED
123−# define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,))
124−#else
125−# define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_A(8, t, v, __VA_ARGS__,,))
126−#endif
127−
128−#if HAVE_LOCAL_ALIGNED
129−# define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,))
130−#else
131−# define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_A(16, t, v, __VA_ARGS__,,))
132−#endif
133−
134−#if HAVE_LOCAL_ALIGNED
135−# define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_D(32, t, v, __VA_ARGS__,,))
136−#else
137−# define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_A(32, t, v, __VA_ARGS__,,))
138−#endif
139102
140103 #define FF_ALLOC_TYPED_ARRAY(p, nelem) (p = av_malloc_array(nelem, sizeof(*p)))
141104 #define FF_ALLOCZ_TYPED_ARRAY(p, nelem) (p = av_mallocz_array(nelem, sizeof(*p)))
libavutil/mem_internal.h+42−0
@@ -21,9 +21,51 @@ · 20 unmodified lines
2121 #ifndef AVUTIL_MEM_INTERNAL_H
2222 #define AVUTIL_MEM_INTERNAL_H
2323
24+#include "config.h"
25+
26+#include <stdint.h>
27+
2428 #include "avassert.h"
2529 #include "mem.h"
2630
31+// Some broken preprocessors need a second expansion
32+// to be forced to tokenize __VA_ARGS__
33+#define E1(x) x
34+
35+#define LOCAL_ALIGNED_A(a, t, v, s, o, ...) \
36+ uint8_t la_##v[sizeof(t s o) + (a)]; \
37+ t (*v) o = (void *)FFALIGN((uintptr_t)la_##v, a)
38+
39+#define LOCAL_ALIGNED_D(a, t, v, s, o, ...) \
40+ DECLARE_ALIGNED(a, t, la_##v) s o; \
41+ t (*v) o = la_##v
42+
43+#define LOCAL_ALIGNED(a, t, v, ...) LOCAL_ALIGNED_##a(t, v, __VA_ARGS__)
44+
45+#if HAVE_LOCAL_ALIGNED
46+# define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_D(4, t, v, __VA_ARGS__,,))
47+#else
48+# define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_A(4, t, v, __VA_ARGS__,,))
49+#endif
50+
51+#if HAVE_LOCAL_ALIGNED
52+# define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,))
53+#else
54+# define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_A(8, t, v, __VA_ARGS__,,))
55+#endif
56+
57+#if HAVE_LOCAL_ALIGNED
58+# define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,))
59+#else
60+# define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_A(16, t, v, __VA_ARGS__,,))
61+#endif
62+
63+#if HAVE_LOCAL_ALIGNED
64+# define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_D(32, t, v, __VA_ARGS__,,))
65+#else
66+# define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_A(32, t, v, __VA_ARGS__,,))
67+#endif
68+
2769 static inline int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc)
2870 {
2971 void *val;
libavutil/mips/mmiutils.h+2−0
@@ -25,6 +25,8 @@ · 24 unmodified lines
2525 #define AVUTIL_MIPS_MMIUTILS_H
2626
2727 #include "config.h"
28+
29+#include "libavutil/mem_internal.h"
2830 #include "libavutil/mips/asmdefs.h"
2931
3032 #if HAVE_LOONGSON2
libavutil/tests/lls.c+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222 #include "libavutil/internal.h"
2323 #include "libavutil/lfg.h"
2424 #include "libavutil/lls.h"
25+#include "libavutil/mem_internal.h"
2526
2627 int main(void)
2728 {
libswscale/ppc/swscale_ppc_template.c+2−0
@@ -21,6 +21,8 @@ · 20 unmodified lines
2121 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2222 */
2323
24+#include "libavutil/mem_internal.h"
25+
2426 static void FUNC(yuv2planeX_8_16)(const int16_t *filter, int filterSize,
2527 const int16_t **src, uint8_t *dest,
2628 const uint8_t *dither, int offset, int x)
libswscale/ppc/swscale_vsx.c+1−0
@@ -28,6 +28,7 @@ · 27 unmodified lines
2828 #include "libswscale/swscale_internal.h"
2929 #include "libavutil/attributes.h"
3030 #include "libavutil/cpu.h"
31+#include "libavutil/mem_internal.h"
3132 #include "yuv2rgb_altivec.h"
3233 #include "libavutil/ppc/util_altivec.h"
3334
tests/checkasm/aacpsdsp.c+1−0
@@ -18,6 +18,7 @@ · 17 unmodified lines
1818
1919 #include "libavcodec/aacpsdsp.h"
2020 #include "libavutil/intfloat.h"
21+#include "libavutil/mem_internal.h"
2122
2223 #include "checkasm.h"
2324
tests/checkasm/af_afir.c+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323
2424 #include "libavfilter/af_afir.h"
2525 #include "libavutil/internal.h"
26+#include "libavutil/mem_internal.h"
2627 #include "checkasm.h"
2728
2829 #define LEN 256
tests/checkasm/alacdsp.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "libavcodec/mathops.h"
2525 #include "libavutil/common.h"
2626 #include "libavutil/internal.h"
27+#include "libavutil/mem_internal.h"
2728
2829 #define BUF_SIZE 256
2930 #define MAX_CHANNELS 2
tests/checkasm/audiodsp.c+1−0
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525
2626 #include "libavutil/common.h"
2727 #include "libavutil/intreadwrite.h"
28+#include "libavutil/mem_internal.h"
2829
2930 #include "checkasm.h"
3031
tests/checkasm/blockdsp.c+1−0
@@ -27,6 +27,7 @@ · 26 unmodified lines
2727 #include "libavutil/common.h"
2828 #include "libavutil/internal.h"
2929 #include "libavutil/intreadwrite.h"
30+#include "libavutil/mem_internal.h"
3031
3132 #define randomize_buffers(size) \
3233 do { \
tests/checkasm/bswapdsp.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "libavutil/common.h"
2525 #include "libavutil/internal.h"
2626 #include "libavutil/intreadwrite.h"
27+#include "libavutil/mem_internal.h"
2728
2829 #define BUF_SIZE 512
2930
tests/checkasm/exrdsp.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "libavcodec/avcodec.h"
2525 #include "libavcodec/exrdsp.h"
2626 #include "libavutil/intreadwrite.h"
27+#include "libavutil/mem_internal.h"
2728
2829 #define BUF_SIZE 5120
2930 #define PADDED_BUF_SIZE BUF_SIZE+AV_INPUT_BUFFER_PADDING_SIZE*2
tests/checkasm/fixed_dsp.c+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #include "libavutil/fixed_dsp.h"
2424 #include "libavutil/internal.h"
2525 #include "libavutil/mem.h"
26+#include "libavutil/mem_internal.h"
2627
2728 #define BUF_SIZE 256
2829
tests/checkasm/flacdsp.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "libavutil/common.h"
2525 #include "libavutil/internal.h"
2626 #include "libavutil/intreadwrite.h"
27+#include "libavutil/mem_internal.h"
2728
2829 #define BUF_SIZE 256
2930 #define MAX_CHANNELS 8
tests/checkasm/float_dsp.c+2−0
@@ -23,6 +23,8 @@ · 22 unmodified lines
2323
2424 #include "libavutil/float_dsp.h"
2525 #include "libavutil/internal.h"
26+#include "libavutil/mem_internal.h"
27+
2628 #include "checkasm.h"
2729
2830 #define LEN 256
tests/checkasm/fmtconvert.c+2−0
@@ -24,6 +24,8 @@ · 23 unmodified lines
2424
2525 #include "libavutil/internal.h"
2626 #include "libavutil/common.h"
27+#include "libavutil/mem_internal.h"
28+
2729 #include "libavcodec/fmtconvert.h"
2830
2931 #include "checkasm.h"
tests/checkasm/h264dsp.c+1−0
@@ -26,6 +26,7 @@ · 25 unmodified lines
2626 #include "libavutil/common.h"
2727 #include "libavutil/internal.h"
2828 #include "libavutil/intreadwrite.h"
29+#include "libavutil/mem_internal.h"
2930
3031 static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff };
3132 static const uint32_t pixel_mask_lf[3] = { 0xff0fff0f, 0x01ff000f, 0x03ff000f };
tests/checkasm/h264pred.c+1−0
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525 #include "libavutil/common.h"
2626 #include "libavutil/internal.h"
2727 #include "libavutil/intreadwrite.h"
28+#include "libavutil/mem_internal.h"
2829
2930 static const int codec_ids[4] = { AV_CODEC_ID_H264, AV_CODEC_ID_VP8, AV_CODEC_ID_RV40, AV_CODEC_ID_SVQ3 };
3031
tests/checkasm/h264qpel.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "libavutil/common.h"
2525 #include "libavutil/internal.h"
2626 #include "libavutil/intreadwrite.h"
27+#include "libavutil/mem_internal.h"
2728
2829 static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff };
2930
tests/checkasm/hevc_add_res.c+1−0
@@ -21,6 +21,7 @@ · 20 unmodified lines
2121 #include <string.h>
2222
2323 #include "libavutil/intreadwrite.h"
24+#include "libavutil/mem_internal.h"
2425
2526 #include "libavcodec/hevcdsp.h"
2627
tests/checkasm/hevc_idct.c+1−0
@@ -21,6 +21,7 @@ · 20 unmodified lines
2121 #include <string.h>
2222
2323 #include "libavutil/intreadwrite.h"
24+#include "libavutil/mem_internal.h"
2425
2526 #include "libavcodec/hevcdsp.h"
2627
tests/checkasm/hevc_sao.c+1−0
@@ -21,6 +21,7 @@ · 20 unmodified lines
2121 #include <string.h>
2222
2323 #include "libavutil/intreadwrite.h"
24+#include "libavutil/mem_internal.h"
2425
2526 #include "libavcodec/avcodec.h"
2627
tests/checkasm/jpeg2000dsp.c+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #include "libavutil/common.h"
2424 #include "libavutil/internal.h"
2525 #include "libavutil/intreadwrite.h"
26+#include "libavutil/mem_internal.h"
2627
2728 #define BUF_SIZE 512
2829
tests/checkasm/llviddspenc.c+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #include "libavutil/common.h"
2424 #include "libavutil/intreadwrite.h"
2525 #include "libavutil/mem.h"
26+#include "libavutil/mem_internal.h"
2627
2728 #include "libavcodec/lossless_videoencdsp.h"
2829
tests/checkasm/opusdsp.c+2−0
@@ -16,6 +16,8 @@ · 15 unmodified lines
1616 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1717 */
1818
19+#include "libavutil/mem_internal.h"
20+
1921 #include "libavcodec/opusdsp.h"
2022
2123 #include "checkasm.h"
tests/checkasm/pixblockdsp.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "libavutil/common.h"
2525 #include "libavutil/internal.h"
2626 #include "libavutil/intreadwrite.h"
27+#include "libavutil/mem_internal.h"
2728
2829 #define BUF_UNITS 8
2930 #define BUF_SIZE (BUF_UNITS * 128 + 8 * BUF_UNITS)
tests/checkasm/sbrdsp.c+2−0
@@ -16,6 +16,8 @@ · 15 unmodified lines
1616 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1717 */
1818
19+#include "libavutil/mem_internal.h"
20+
1921 #include "libavcodec/sbrdsp.h"
2022 #include <float.h>
2123
tests/checkasm/sw_rgb.c+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222 #include "libavutil/common.h"
2323 #include "libavutil/intreadwrite.h"
2424 #include "libavutil/mem.h"
25+#include "libavutil/mem_internal.h"
2526
2627 #include "libswscale/rgb2rgb.h"
2728
tests/checkasm/sw_scale.c+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222 #include "libavutil/common.h"
2323 #include "libavutil/intreadwrite.h"
2424 #include "libavutil/mem.h"
25+#include "libavutil/mem_internal.h"
2526
2627 #include "libswscale/swscale.h"
2728 #include "libswscale/swscale_internal.h"
tests/checkasm/synth_filter.c+2−0
@@ -25,6 +25,8 @@ · 24 unmodified lines
2525
2626 #include "libavutil/internal.h"
2727 #include "libavutil/intfloat.h"
28+#include "libavutil/mem_internal.h"
29+
2830 #include "libavcodec/dcadata.h"
2931 #include "libavcodec/synth_filter.h"
3032
tests/checkasm/utvideodsp.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "libavcodec/avcodec.h"
2525 #include "libavcodec/utvideodsp.h"
2626 #include "libavutil/intreadwrite.h"
27+#include "libavutil/mem_internal.h"
2728
2829 #define WIDTH 240
2930 #define HEIGHT 120
tests/checkasm/v210enc.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "libavutil/common.h"
2525 #include "libavutil/internal.h"
2626 #include "libavutil/intreadwrite.h"
27+#include "libavutil/mem_internal.h"
2728
2829 #define BUF_SIZE 512
2930
tests/checkasm/vf_colorspace.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "libavutil/common.h"
2525 #include "libavutil/internal.h"
2626 #include "libavutil/intreadwrite.h"
27+#include "libavutil/mem_internal.h"
2728
2829 #define W 64
2930 #define H 64
tests/checkasm/vf_eq.c+1−0
@@ -21,6 +21,7 @@ · 20 unmodified lines
2121 #include "libavfilter/avfilter.h"
2222 #include "libavfilter/vf_eq.h"
2323 #include "libavutil/intreadwrite.h"
24+#include "libavutil/mem_internal.h"
2425
2526 #define WIDTH 256
2627 #define HEIGHT 256
tests/checkasm/vf_hflip.c+1−0
@@ -20,6 +20,7 @@ · 19 unmodified lines
2020 #include "checkasm.h"
2121 #include "libavfilter/hflip.h"
2222 #include "libavutil/intreadwrite.h"
23+#include "libavutil/mem_internal.h"
2324
2425 #define WIDTH 256
2526 #define WIDTH_PADDED 256 + 32
tests/checkasm/vf_threshold.c+1−0
@@ -20,6 +20,7 @@ · 19 unmodified lines
2020 #include "checkasm.h"
2121 #include "libavfilter/threshold.h"
2222 #include "libavutil/intreadwrite.h"
23+#include "libavutil/mem_internal.h"
2324
2425 #define WIDTH 256
2526 #define WIDTH_PADDED 256 + 32
tests/checkasm/videodsp.c+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #include "libavcodec/videodsp.h"
2424 #include "libavutil/internal.h"
2525 #include "libavutil/intreadwrite.h"
26+#include "libavutil/mem_internal.h"
2627
2728 #define randomize_buffers(w, h) \
2829 do { \
tests/checkasm/vp8dsp.c+1−0
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525
2626 #include "libavutil/common.h"
2727 #include "libavutil/intreadwrite.h"
28+#include "libavutil/mem_internal.h"
2829
2930 #include "checkasm.h"
3031
tests/checkasm/vp9dsp.c+1−0
@@ -27,6 +27,7 @@ · 26 unmodified lines
2727 #include "libavutil/internal.h"
2828 #include "libavutil/intreadwrite.h"
2929 #include "libavutil/mathematics.h"
30+#include "libavutil/mem_internal.h"
3031
3132 static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff };
3233 #define SIZEOF_PIXEL ((bit_depth + 7) / 8)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t