History

ppc: Centralize compiler-specific altivec.h #include handling in one place

Also move #includes into canonical order where appropriate.

Diego Biurrun committed 9 years ago

Commit ea7ee4b1 parent 39929e523 files · +45 −67Browse files

Unified · Split

23 files
  1. libavcodec/ppc/apedsp_altivec.c +2 −4
  2. libavcodec/ppc/audiodsp.c +1 −4
  3. libavcodec/ppc/blockdsp.c +3 −4
  4. libavcodec/ppc/fdctdsp.c +3 −3
  5. libavcodec/ppc/h264chroma_init.c +2 −1
  6. libavcodec/ppc/h264dsp.c +0 −1
  7. libavcodec/ppc/h264qpel.c +3 −1
  8. libavcodec/ppc/hevcdsp.c +1 −4
  9. libavcodec/ppc/hpeldsp_altivec.c +2 −5
  10. libavcodec/ppc/huffyuvdsp_altivec.c +1 −4
  11. libavcodec/ppc/idctdsp.c +4 −5
  12. libavcodec/ppc/mdct_init.c +2 −1
  13. libavcodec/ppc/me_cmp.c +1 −4
  14. libavcodec/ppc/mpegvideo_altivec.c +2 −1
  15. libavcodec/ppc/mpegvideodsp.c +1 −1
  16. libavcodec/ppc/mpegvideoencdsp.c +2 −4
  17. libavcodec/ppc/pixblockdsp.c +1 −4
  18. libavcodec/ppc/svq1enc_altivec.c +3 −6
  19. libavcodec/ppc/vc1dsp_altivec.c +2 −1
  20. libavcodec/ppc/vorbisdsp_altivec.c +3 −3
  21. libavcodec/ppc/vp3dsp_altivec.c +2 −1
  22. libavcodec/ppc/vp8dsp_altivec.c +3 −1
  23. libswscale/swscale_internal.h +1 −4
libavcodec/ppc/apedsp_altivec.c+2−4
@@ -19,14 +19,12 @@ · 18 unmodified lines
19 */19 */
20 20
21#include "config.h"21#include "config.h"
22#if HAVE_ALTIVEC_H
23#include <altivec.h>
24#endif
25 22
26#include "libavutil/attributes.h"23#include "libavutil/attributes.h"
27#include "libavutil/cpu.h"24#include "libavutil/cpu.h"
28#include "libavutil/ppc/cpu.h"25#include "libavutil/ppc/cpu.h"
29#include "libavutil/ppc/types_altivec.h"26#include "libavutil/ppc/util_altivec.h"
27
30#include "libavcodec/apedsp.h"28#include "libavcodec/apedsp.h"
31 29
32#if HAVE_ALTIVEC && HAVE_BIGENDIAN30#if HAVE_ALTIVEC && HAVE_BIGENDIAN
libavcodec/ppc/audiodsp.c+1−4
@@ -24,15 +24,12 @@ · 23 unmodified lines
24 */24 */
25 25
26#include "config.h"26#include "config.h"
27#if HAVE_ALTIVEC_H
28#include <altivec.h>
29#endif
30 27
31#include "libavutil/attributes.h"28#include "libavutil/attributes.h"
32#include "libavutil/cpu.h"29#include "libavutil/cpu.h"
33#include "libavutil/ppc/cpu.h"30#include "libavutil/ppc/cpu.h"
34#include "libavutil/ppc/types_altivec.h"
35#include "libavutil/ppc/util_altivec.h"31#include "libavutil/ppc/util_altivec.h"
32
36#include "libavcodec/audiodsp.h"33#include "libavcodec/audiodsp.h"
37 34
38#if HAVE_ALTIVEC && HAVE_BIGENDIAN35#if HAVE_ALTIVEC && HAVE_BIGENDIAN
libavcodec/ppc/blockdsp.c+3−4
@@ -21,16 +21,15 @@ · 20 unmodified lines
21 */21 */
22 22
23#include "config.h"23#include "config.h"
24#if HAVE_ALTIVEC_H24
25#include <altivec.h>
26#endif
27#include <string.h>25#include <string.h>
28 26
29#include "libavutil/attributes.h"27#include "libavutil/attributes.h"
30#include "libavutil/cpu.h"28#include "libavutil/cpu.h"
31#include "libavutil/mem.h"29#include "libavutil/mem.h"
32#include "libavutil/ppc/cpu.h"30#include "libavutil/ppc/cpu.h"
33#include "libavutil/ppc/types_altivec.h"31#include "libavutil/ppc/util_altivec.h"
32
34#include "libavcodec/blockdsp.h"33#include "libavcodec/blockdsp.h"
35 34
36/* ***** WARNING ***** WARNING ***** WARNING ***** */35/* ***** WARNING ***** WARNING ***** WARNING ***** */
libavcodec/ppc/fdctdsp.c+3−3
@@ -19,14 +19,14 @@ · 18 unmodified lines
19 */19 */
20 20
21#include "config.h"21#include "config.h"
22#if HAVE_ALTIVEC_H
23#include <altivec.h>
24#endif
25 22
26#include "libavutil/attributes.h"23#include "libavutil/attributes.h"
27#include "libavutil/cpu.h"24#include "libavutil/cpu.h"
28#include "libavutil/ppc/cpu.h"25#include "libavutil/ppc/cpu.h"
26#include "libavutil/ppc/util_altivec.h"
27
29#include "libavcodec/fdctdsp.h"28#include "libavcodec/fdctdsp.h"
29
30#include "fdct.h"30#include "fdct.h"
31 31
32#if HAVE_ALTIVEC && HAVE_BIGENDIAN32#if HAVE_ALTIVEC && HAVE_BIGENDIAN
libavcodec/ppc/h264chroma_init.c+2−1
@@ -19,12 +19,13 @@ · 18 unmodified lines
19 */19 */
20 20
21#include "config.h"21#include "config.h"
22
22#include "libavutil/attributes.h"23#include "libavutil/attributes.h"
23#include "libavutil/cpu.h"24#include "libavutil/cpu.h"
24#include "libavutil/intreadwrite.h"25#include "libavutil/intreadwrite.h"
25#include "libavutil/ppc/cpu.h"26#include "libavutil/ppc/cpu.h"
26#include "libavutil/ppc/types_altivec.h"
27#include "libavutil/ppc/util_altivec.h"27#include "libavutil/ppc/util_altivec.h"
28
28#include "libavcodec/h264chroma.h"29#include "libavcodec/h264chroma.h"
29 30
30#if HAVE_ALTIVEC && HAVE_BIGENDIAN31#if HAVE_ALTIVEC && HAVE_BIGENDIAN
libavcodec/ppc/h264dsp.c+0−1
@@ -28,7 +28,6 @@ · 27 unmodified lines
28#include "libavutil/intreadwrite.h"28#include "libavutil/intreadwrite.h"
29#include "libavutil/mem.h"29#include "libavutil/mem.h"
30#include "libavutil/ppc/cpu.h"30#include "libavutil/ppc/cpu.h"
31#include "libavutil/ppc/types_altivec.h"
32#include "libavutil/ppc/util_altivec.h"31#include "libavutil/ppc/util_altivec.h"
33 32
34#include "libavcodec/h264dec.h"33#include "libavcodec/h264dec.h"
libavcodec/ppc/h264qpel.c+3−1
@@ -19,13 +19,15 @@ · 18 unmodified lines
19 */19 */
20 20
21#include "config.h"21#include "config.h"
22
22#include "libavutil/attributes.h"23#include "libavutil/attributes.h"
23#include "libavutil/cpu.h"24#include "libavutil/cpu.h"
24#include "libavutil/intreadwrite.h"25#include "libavutil/intreadwrite.h"
25#include "libavutil/ppc/cpu.h"26#include "libavutil/ppc/cpu.h"
26#include "libavutil/ppc/types_altivec.h"
27#include "libavutil/ppc/util_altivec.h"27#include "libavutil/ppc/util_altivec.h"
28
28#include "libavcodec/h264qpel.h"29#include "libavcodec/h264qpel.h"
30
29#include "hpeldsp_altivec.h"31#include "hpeldsp_altivec.h"
30 32
31#if HAVE_ALTIVEC && HAVE_BIGENDIAN33#if HAVE_ALTIVEC && HAVE_BIGENDIAN
libavcodec/ppc/hevcdsp.c+1−4
@@ -19,13 +19,10 @@ · 18 unmodified lines
19 */19 */
20 20
21#include "config.h"21#include "config.h"
22#if HAVE_ALTIVEC_H
23#include <altivec.h>
24#endif
25 22
23#include "libavutil/attributes.h"
26#include "libavutil/cpu.h"24#include "libavutil/cpu.h"
27#include "libavutil/ppc/cpu.h"25#include "libavutil/ppc/cpu.h"
28#include "libavutil/ppc/types_altivec.h"
29#include "libavutil/ppc/util_altivec.h"26#include "libavutil/ppc/util_altivec.h"
30 27
31#include "libavcodec/hevcdsp.h"28#include "libavcodec/hevcdsp.h"
libavcodec/ppc/hpeldsp_altivec.c+2−5
@@ -22,16 +22,13 @@ · 21 unmodified lines
22 22
23#include "config.h"23#include "config.h"
24 24
25#if HAVE_ALTIVEC_H
26#include <altivec.h>
27#endif
28
29#include "libavutil/attributes.h"25#include "libavutil/attributes.h"
30#include "libavutil/cpu.h"26#include "libavutil/cpu.h"
31#include "libavutil/ppc/cpu.h"27#include "libavutil/ppc/cpu.h"
32#include "libavutil/ppc/types_altivec.h"
33#include "libavutil/ppc/util_altivec.h"28#include "libavutil/ppc/util_altivec.h"
29
34#include "libavcodec/hpeldsp.h"30#include "libavcodec/hpeldsp.h"
31
35#include "hpeldsp_altivec.h"32#include "hpeldsp_altivec.h"
36 33
37#if HAVE_ALTIVEC && HAVE_BIGENDIAN34#if HAVE_ALTIVEC && HAVE_BIGENDIAN
libavcodec/ppc/huffyuvdsp_altivec.c+1−4
@@ -21,15 +21,12 @@ · 20 unmodified lines
21 */21 */
22 22
23#include "config.h"23#include "config.h"
24#if HAVE_ALTIVEC_H
25#include <altivec.h>
26#endif
27 24
28#include "libavutil/attributes.h"25#include "libavutil/attributes.h"
29#include "libavutil/cpu.h"26#include "libavutil/cpu.h"
30#include "libavutil/ppc/cpu.h"27#include "libavutil/ppc/cpu.h"
31#include "libavutil/ppc/types_altivec.h"
32#include "libavutil/ppc/util_altivec.h"28#include "libavutil/ppc/util_altivec.h"
29
33#include "libavcodec/huffyuvdsp.h"30#include "libavcodec/huffyuvdsp.h"
34 31
35#if HAVE_ALTIVEC32#if HAVE_ALTIVEC
libavcodec/ppc/idctdsp.c+4−5
@@ -30,17 +30,16 @@ · 29 unmodified lines
30 * IDCT function itself was to factor out the partial transposition, and to30 * IDCT function itself was to factor out the partial transposition, and to
31 * perform a full transpose at the end of the function. */31 * perform a full transpose at the end of the function. */
32 32
33#include "config.h"
34
33#include <stdlib.h>35#include <stdlib.h>
34#include <string.h>36#include <string.h>
35#include "config.h"
36#if HAVE_ALTIVEC_H
37#include <altivec.h>
38#endif
39 37
40#include "libavutil/attributes.h"38#include "libavutil/attributes.h"
41#include "libavutil/cpu.h"39#include "libavutil/cpu.h"
42#include "libavutil/ppc/cpu.h"40#include "libavutil/ppc/cpu.h"
43#include "libavutil/ppc/types_altivec.h"41#include "libavutil/ppc/util_altivec.h"
42
44#include "libavcodec/idctdsp.h"43#include "libavcodec/idctdsp.h"
45 44
46#if HAVE_ALTIVEC && HAVE_BIGENDIAN45#if HAVE_ALTIVEC && HAVE_BIGENDIAN
libavcodec/ppc/mdct_init.c+2−1
@@ -21,10 +21,11 @@ · 20 unmodified lines
21 */21 */
22 22
23#include "config.h"23#include "config.h"
24
24#include "libavutil/cpu.h"25#include "libavutil/cpu.h"
25#include "libavutil/ppc/cpu.h"26#include "libavutil/ppc/cpu.h"
26#include "libavutil/ppc/types_altivec.h"
27#include "libavutil/ppc/util_altivec.h"27#include "libavutil/ppc/util_altivec.h"
28
28#include "libavcodec/fft.h"29#include "libavcodec/fft.h"
29 30
30/**31/**
libavcodec/ppc/me_cmp.c+1−4
@@ -21,15 +21,12 @@ · 20 unmodified lines
21 */21 */
22 22
23#include "config.h"23#include "config.h"
24#if HAVE_ALTIVEC_H
25#include <altivec.h>
26#endif
27 24
28#include "libavutil/attributes.h"25#include "libavutil/attributes.h"
29#include "libavutil/cpu.h"26#include "libavutil/cpu.h"
30#include "libavutil/ppc/cpu.h"27#include "libavutil/ppc/cpu.h"
31#include "libavutil/ppc/types_altivec.h"
32#include "libavutil/ppc/util_altivec.h"28#include "libavutil/ppc/util_altivec.h"
29
33#include "libavcodec/avcodec.h"30#include "libavcodec/avcodec.h"
34#include "libavcodec/mpegvideo.h"31#include "libavcodec/mpegvideo.h"
35#include "libavcodec/me_cmp.h"32#include "libavcodec/me_cmp.h"
libavcodec/ppc/mpegvideo_altivec.c+2−1
@@ -25,11 +25,12 @@ · 24 unmodified lines
25#include <stdio.h>25#include <stdio.h>
26 26
27#include "config.h"27#include "config.h"
28
28#include "libavutil/attributes.h"29#include "libavutil/attributes.h"
29#include "libavutil/cpu.h"30#include "libavutil/cpu.h"
30#include "libavutil/ppc/cpu.h"31#include "libavutil/ppc/cpu.h"
31#include "libavutil/ppc/types_altivec.h"
32#include "libavutil/ppc/util_altivec.h"32#include "libavutil/ppc/util_altivec.h"
33
33#include "libavcodec/mpegvideo.h"34#include "libavcodec/mpegvideo.h"
34 35
35#if HAVE_ALTIVEC && HAVE_BIGENDIAN36#if HAVE_ALTIVEC && HAVE_BIGENDIAN
libavcodec/ppc/mpegvideodsp.c+1−1
@@ -23,8 +23,8 @@ · 22 unmodified lines
23#include "libavutil/cpu.h"23#include "libavutil/cpu.h"
24#include "libavutil/mem.h"24#include "libavutil/mem.h"
25#include "libavutil/ppc/cpu.h"25#include "libavutil/ppc/cpu.h"
26#include "libavutil/ppc/types_altivec.h"
27#include "libavutil/ppc/util_altivec.h"26#include "libavutil/ppc/util_altivec.h"
27
28#include "libavcodec/mpegvideodsp.h"28#include "libavcodec/mpegvideodsp.h"
29 29
30#if HAVE_ALTIVEC && HAVE_BIGENDIAN30#if HAVE_ALTIVEC && HAVE_BIGENDIAN
libavcodec/ppc/mpegvideoencdsp.c+2−4
@@ -17,16 +17,14 @@ · 16 unmodified lines
17 */17 */
18 18
19#include "config.h"19#include "config.h"
20
20#include <stdint.h>21#include <stdint.h>
21#if HAVE_ALTIVEC_H
22#include <altivec.h>
23#endif
24 22
25#include "libavutil/attributes.h"23#include "libavutil/attributes.h"
26#include "libavutil/cpu.h"24#include "libavutil/cpu.h"
27#include "libavutil/ppc/cpu.h"25#include "libavutil/ppc/cpu.h"
28#include "libavutil/ppc/types_altivec.h"
29#include "libavutil/ppc/util_altivec.h"26#include "libavutil/ppc/util_altivec.h"
27
30#include "libavcodec/mpegvideoencdsp.h"28#include "libavcodec/mpegvideoencdsp.h"
31 29
32#if HAVE_ALTIVEC && HAVE_BIGENDIAN30#if HAVE_ALTIVEC && HAVE_BIGENDIAN
libavcodec/ppc/pixblockdsp.c+1−4
@@ -21,15 +21,12 @@ · 20 unmodified lines
21 */21 */
22 22
23#include "config.h"23#include "config.h"
24#if HAVE_ALTIVEC_H
25#include <altivec.h>
26#endif
27 24
28#include "libavutil/attributes.h"25#include "libavutil/attributes.h"
29#include "libavutil/cpu.h"26#include "libavutil/cpu.h"
30#include "libavutil/ppc/cpu.h"27#include "libavutil/ppc/cpu.h"
31#include "libavutil/ppc/types_altivec.h"
32#include "libavutil/ppc/util_altivec.h"28#include "libavutil/ppc/util_altivec.h"
29
33#include "libavcodec/avcodec.h"30#include "libavcodec/avcodec.h"
34#include "libavcodec/pixblockdsp.h"31#include "libavcodec/pixblockdsp.h"
35 32
libavcodec/ppc/svq1enc_altivec.c+3−6
@@ -18,18 +18,15 @@ · 17 unmodified lines
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 */19 */
20 20
21#include <stdint.h>
22
23#include "config.h"21#include "config.h"
24#if HAVE_ALTIVEC_H22
25#include <altivec.h>23#include <stdint.h>
26#endif
27 24
28#include "libavutil/attributes.h"25#include "libavutil/attributes.h"
29#include "libavutil/cpu.h"26#include "libavutil/cpu.h"
30#include "libavutil/ppc/cpu.h"27#include "libavutil/ppc/cpu.h"
31#include "libavutil/ppc/types_altivec.h"
32#include "libavutil/ppc/util_altivec.h"28#include "libavutil/ppc/util_altivec.h"
29
33#include "libavcodec/svq1enc.h"30#include "libavcodec/svq1enc.h"
34 31
35#if HAVE_ALTIVEC && HAVE_BIGENDIAN32#if HAVE_ALTIVEC && HAVE_BIGENDIAN
libavcodec/ppc/vc1dsp_altivec.c+2−1
@@ -20,11 +20,12 @@ · 19 unmodified lines
20 */20 */
21 21
22#include "config.h"22#include "config.h"
23
23#include "libavutil/attributes.h"24#include "libavutil/attributes.h"
24#include "libavutil/cpu.h"25#include "libavutil/cpu.h"
25#include "libavutil/ppc/cpu.h"26#include "libavutil/ppc/cpu.h"
26#include "libavutil/ppc/types_altivec.h"
27#include "libavutil/ppc/util_altivec.h"27#include "libavutil/ppc/util_altivec.h"
28
28#include "libavcodec/vc1dsp.h"29#include "libavcodec/vc1dsp.h"
29 30
30#if HAVE_ALTIVEC && HAVE_BIGENDIAN31#if HAVE_ALTIVEC && HAVE_BIGENDIAN
libavcodec/ppc/vorbisdsp_altivec.c+3−3
@@ -19,12 +19,12 @@ · 18 unmodified lines
19 */19 */
20 20
21#include "config.h"21#include "config.h"
22#if HAVE_ALTIVEC_H22
23#include <altivec.h>
24#endif
25#include "libavutil/attributes.h"23#include "libavutil/attributes.h"
26#include "libavutil/cpu.h"24#include "libavutil/cpu.h"
27#include "libavutil/ppc/cpu.h"25#include "libavutil/ppc/cpu.h"
26#include "libavutil/ppc/util_altivec.h"
27
28#include "libavcodec/vorbisdsp.h"28#include "libavcodec/vorbisdsp.h"
29 29
30#if HAVE_ALTIVEC && HAVE_BIGENDIAN30#if HAVE_ALTIVEC && HAVE_BIGENDIAN
libavcodec/ppc/vp3dsp_altivec.c+2−1
@@ -21,11 +21,12 @@ · 20 unmodified lines
21#include <string.h>21#include <string.h>
22 22
23#include "config.h"23#include "config.h"
24
24#include "libavutil/attributes.h"25#include "libavutil/attributes.h"
25#include "libavutil/cpu.h"26#include "libavutil/cpu.h"
26#include "libavutil/ppc/cpu.h"27#include "libavutil/ppc/cpu.h"
27#include "libavutil/ppc/types_altivec.h"
28#include "libavutil/ppc/util_altivec.h"28#include "libavutil/ppc/util_altivec.h"
29
29#include "libavcodec/vp3dsp.h"30#include "libavcodec/vp3dsp.h"
30 31
31#if HAVE_ALTIVEC && HAVE_BIGENDIAN32#if HAVE_ALTIVEC && HAVE_BIGENDIAN
libavcodec/ppc/vp8dsp_altivec.c+3−1
@@ -21,12 +21,14 @@ · 20 unmodified lines
21 */21 */
22 22
23#include "config.h"23#include "config.h"
24
24#include "libavutil/cpu.h"25#include "libavutil/cpu.h"
25#include "libavutil/mem.h"26#include "libavutil/mem.h"
26#include "libavutil/ppc/cpu.h"27#include "libavutil/ppc/cpu.h"
27#include "libavutil/ppc/types_altivec.h"
28#include "libavutil/ppc/util_altivec.h"28#include "libavutil/ppc/util_altivec.h"
29
29#include "libavcodec/vp8dsp.h"30#include "libavcodec/vp8dsp.h"
31
30#include "hpeldsp_altivec.h"32#include "hpeldsp_altivec.h"
31 33
32#if HAVE_ALTIVEC && HAVE_BIGENDIAN34#if HAVE_ALTIVEC && HAVE_BIGENDIAN
libswscale/swscale_internal.h+1−4
@@ -23,16 +23,13 @@ · 22 unmodified lines
23 23
24#include "config.h"24#include "config.h"
25 25
26#if HAVE_ALTIVEC_H
27#include <altivec.h>
28#endif
29
30#include "libavutil/avassert.h"26#include "libavutil/avassert.h"
31#include "libavutil/avutil.h"27#include "libavutil/avutil.h"
32#include "libavutil/common.h"28#include "libavutil/common.h"
33#include "libavutil/log.h"29#include "libavutil/log.h"
34#include "libavutil/pixfmt.h"30#include "libavutil/pixfmt.h"
35#include "libavutil/pixdesc.h"31#include "libavutil/pixdesc.h"
32#include "libavutil/ppc/util_altivec.h"
36 33
37#define STR(s) AV_TOSTRING(s) // AV_STRINGIFY is too long34#define STR(s) AV_TOSTRING(s) // AV_STRINGIFY is too long
38 35

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