annotate arm/dsputil_arm.c @ 10359:48be79afc72d libavcodec

ARM: clean up dsputil initialisation - Move v5 and v6 initialisation to separate files. - Move NEON IDCT selection to ff_dsputil_init_neon()
author mru
date Sun, 04 Oct 2009 13:12:55 +0000
parents 0905f8eed0a9
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
61
fefaa96def6e arm specific code
glantau
parents:
diff changeset
1 /*
8359
9281a8a9387a ARM: replace "armv4l" with "arm"
mru
parents: 8335
diff changeset
2 * ARM optimized DSP utils
8629
04423b2f6e0b cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents: 8596
diff changeset
3 * Copyright (c) 2001 Lionel Ulmer
61
fefaa96def6e arm specific code
glantau
parents:
diff changeset
4 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3769
diff changeset
5 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3769
diff changeset
6 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3769
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
429
718a22dc121f license/copyright change
glantau
parents: 61
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 61
diff changeset
9 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3769
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
61
fefaa96def6e arm specific code
glantau
parents:
diff changeset
11 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3769
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
61
fefaa96def6e arm specific code
glantau
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 61
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 61
diff changeset
15 * Lesser General Public License for more details.
61
fefaa96def6e arm specific code
glantau
parents:
diff changeset
16 *
429
718a22dc121f license/copyright change
glantau
parents: 61
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3769
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2979
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
61
fefaa96def6e arm specific code
glantau
parents:
diff changeset
20 */
fefaa96def6e arm specific code
glantau
parents:
diff changeset
21
6763
f7cbb7733146 Use full path for #includes from another directory.
diego
parents: 6760
diff changeset
22 #include "libavcodec/dsputil.h"
10359
48be79afc72d ARM: clean up dsputil initialisation
mru
parents: 10203
diff changeset
23 #include "dsputil_arm.h"
61
fefaa96def6e arm specific code
glantau
parents:
diff changeset
24
8250
cf4d575b1982 Delete unnecessary 'extern' keywords.
diego
parents: 8104
diff changeset
25 void j_rev_dct_ARM(DCTELEM *data);
cf4d575b1982 Delete unnecessary 'extern' keywords.
diego
parents: 8104
diff changeset
26 void simple_idct_ARM(DCTELEM *data);
61
fefaa96def6e arm specific code
glantau
parents:
diff changeset
27
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 874
diff changeset
28 /* XXX: local hack */
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 874
diff changeset
29 static void (*ff_put_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size);
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 874
diff changeset
30 static void (*ff_add_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size);
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 874
diff changeset
31
2734
aeea63c97878 Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents: 1347
diff changeset
32 void put_pixels8_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h);
aeea63c97878 Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents: 1347
diff changeset
33 void put_pixels8_x2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h);
aeea63c97878 Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents: 1347
diff changeset
34 void put_pixels8_y2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h);
aeea63c97878 Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents: 1347
diff changeset
35 void put_pixels8_xy2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h);
aeea63c97878 Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents: 1347
diff changeset
36
aeea63c97878 Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents: 1347
diff changeset
37 void put_no_rnd_pixels8_x2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h);
aeea63c97878 Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents: 1347
diff changeset
38 void put_no_rnd_pixels8_y2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h);
aeea63c97878 Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents: 1347
diff changeset
39 void put_no_rnd_pixels8_xy2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h);
aeea63c97878 Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents: 1347
diff changeset
40
aeea63c97878 Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents: 1347
diff changeset
41 void put_pixels16_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h);
aeea63c97878 Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents: 1347
diff changeset
42
2735
7f38814cffa1 cleanup
michael
parents: 2734
diff changeset
43 CALL_2X_PIXELS(put_pixels16_x2_arm , put_pixels8_x2_arm , 8)
7f38814cffa1 cleanup
michael
parents: 2734
diff changeset
44 CALL_2X_PIXELS(put_pixels16_y2_arm , put_pixels8_y2_arm , 8)
7f38814cffa1 cleanup
michael
parents: 2734
diff changeset
45 CALL_2X_PIXELS(put_pixels16_xy2_arm, put_pixels8_xy2_arm, 8)
7f38814cffa1 cleanup
michael
parents: 2734
diff changeset
46 CALL_2X_PIXELS(put_no_rnd_pixels16_x2_arm , put_no_rnd_pixels8_x2_arm , 8)
7f38814cffa1 cleanup
michael
parents: 2734
diff changeset
47 CALL_2X_PIXELS(put_no_rnd_pixels16_y2_arm , put_no_rnd_pixels8_y2_arm , 8)
7f38814cffa1 cleanup
michael
parents: 2734
diff changeset
48 CALL_2X_PIXELS(put_no_rnd_pixels16_xy2_arm, put_no_rnd_pixels8_xy2_arm, 8)
2734
aeea63c97878 Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents: 1347
diff changeset
49
8250
cf4d575b1982 Delete unnecessary 'extern' keywords.
diego
parents: 8104
diff changeset
50 void ff_add_pixels_clamped_ARM(short *block, unsigned char *dest,
8072
4b32e8762864 ARM: move add_pixels_clamped_ARM() to dsputil_arm_s.S
mru
parents: 8070
diff changeset
51 int line_size);
2734
aeea63c97878 Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents: 1347
diff changeset
52
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 874
diff changeset
53 /* XXX: those functions should be suppressed ASAP when all IDCTs are
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 874
diff changeset
54 converted */
1347
cca26199ab17 Optimized simple idct for arm by Frederic 'dilb' Boulay <dilb@handhelds.org>. Currently licensed under the GPLv2, but the author allowed to license it under the LGPL, feel free to change
al3x
parents: 1324
diff changeset
55 static void j_rev_dct_ARM_put(uint8_t *dest, int line_size, DCTELEM *block)
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 874
diff changeset
56 {
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 874
diff changeset
57 j_rev_dct_ARM (block);
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 874
diff changeset
58 ff_put_pixels_clamped(block, dest, line_size);
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 874
diff changeset
59 }
1347
cca26199ab17 Optimized simple idct for arm by Frederic 'dilb' Boulay <dilb@handhelds.org>. Currently licensed under the GPLv2, but the author allowed to license it under the LGPL, feel free to change
al3x
parents: 1324
diff changeset
60 static void j_rev_dct_ARM_add(uint8_t *dest, int line_size, DCTELEM *block)
61
fefaa96def6e arm specific code
glantau
parents:
diff changeset
61 {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 874
diff changeset
62 j_rev_dct_ARM (block);
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 874
diff changeset
63 ff_add_pixels_clamped(block, dest, line_size);
61
fefaa96def6e arm specific code
glantau
parents:
diff changeset
64 }
1347
cca26199ab17 Optimized simple idct for arm by Frederic 'dilb' Boulay <dilb@handhelds.org>. Currently licensed under the GPLv2, but the author allowed to license it under the LGPL, feel free to change
al3x
parents: 1324
diff changeset
65 static void simple_idct_ARM_put(uint8_t *dest, int line_size, DCTELEM *block)
cca26199ab17 Optimized simple idct for arm by Frederic 'dilb' Boulay <dilb@handhelds.org>. Currently licensed under the GPLv2, but the author allowed to license it under the LGPL, feel free to change
al3x
parents: 1324
diff changeset
66 {
cca26199ab17 Optimized simple idct for arm by Frederic 'dilb' Boulay <dilb@handhelds.org>. Currently licensed under the GPLv2, but the author allowed to license it under the LGPL, feel free to change
al3x
parents: 1324
diff changeset
67 simple_idct_ARM (block);
cca26199ab17 Optimized simple idct for arm by Frederic 'dilb' Boulay <dilb@handhelds.org>. Currently licensed under the GPLv2, but the author allowed to license it under the LGPL, feel free to change
al3x
parents: 1324
diff changeset
68 ff_put_pixels_clamped(block, dest, line_size);
cca26199ab17 Optimized simple idct for arm by Frederic 'dilb' Boulay <dilb@handhelds.org>. Currently licensed under the GPLv2, but the author allowed to license it under the LGPL, feel free to change
al3x
parents: 1324
diff changeset
69 }
cca26199ab17 Optimized simple idct for arm by Frederic 'dilb' Boulay <dilb@handhelds.org>. Currently licensed under the GPLv2, but the author allowed to license it under the LGPL, feel free to change
al3x
parents: 1324
diff changeset
70 static void simple_idct_ARM_add(uint8_t *dest, int line_size, DCTELEM *block)
cca26199ab17 Optimized simple idct for arm by Frederic 'dilb' Boulay <dilb@handhelds.org>. Currently licensed under the GPLv2, but the author allowed to license it under the LGPL, feel free to change
al3x
parents: 1324
diff changeset
71 {
cca26199ab17 Optimized simple idct for arm by Frederic 'dilb' Boulay <dilb@handhelds.org>. Currently licensed under the GPLv2, but the author allowed to license it under the LGPL, feel free to change
al3x
parents: 1324
diff changeset
72 simple_idct_ARM (block);
cca26199ab17 Optimized simple idct for arm by Frederic 'dilb' Boulay <dilb@handhelds.org>. Currently licensed under the GPLv2, but the author allowed to license it under the LGPL, feel free to change
al3x
parents: 1324
diff changeset
73 ff_add_pixels_clamped(block, dest, line_size);
cca26199ab17 Optimized simple idct for arm by Frederic 'dilb' Boulay <dilb@handhelds.org>. Currently licensed under the GPLv2, but the author allowed to license it under the LGPL, feel free to change
al3x
parents: 1324
diff changeset
74 }
3726
49fb1958d8e1 clean up #ifdef HAVE_IPP
mru
parents: 3036
diff changeset
75
7165
b0edd0683fc4 Define mm_support() for ARM.
benoit
parents: 6786
diff changeset
76 int mm_support(void)
b0edd0683fc4 Define mm_support() for ARM.
benoit
parents: 6786
diff changeset
77 {
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
78 return HAVE_IWMMXT * FF_MM_IWMMXT;
7165
b0edd0683fc4 Define mm_support() for ARM.
benoit
parents: 6786
diff changeset
79 }
b0edd0683fc4 Define mm_support() for ARM.
benoit
parents: 6786
diff changeset
80
8359
9281a8a9387a ARM: replace "armv4l" with "arm"
mru
parents: 8335
diff changeset
81 void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx)
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 874
diff changeset
82 {
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 874
diff changeset
83 ff_put_pixels_clamped = c->put_pixels_clamped;
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 874
diff changeset
84 ff_add_pixels_clamped = c->add_pixels_clamped;
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 874
diff changeset
85
6179
bdcb17652343 fix lowres decoding support on ARM CPUs
gpoirier
parents: 5641
diff changeset
86 if (avctx->lowres == 0) {
10359
48be79afc72d ARM: clean up dsputil initialisation
mru
parents: 10203
diff changeset
87 if(avctx->idct_algo == FF_IDCT_AUTO ||
48be79afc72d ARM: clean up dsputil initialisation
mru
parents: 10203
diff changeset
88 avctx->idct_algo == FF_IDCT_ARM){
6180
a15900739a31 fix indentation that was messed up by r11628
gpoirier
parents: 6179
diff changeset
89 c->idct_put= j_rev_dct_ARM_put;
a15900739a31 fix indentation that was messed up by r11628
gpoirier
parents: 6179
diff changeset
90 c->idct_add= j_rev_dct_ARM_add;
a15900739a31 fix indentation that was messed up by r11628
gpoirier
parents: 6179
diff changeset
91 c->idct = j_rev_dct_ARM;
8267
ebbdbb35a0cf ARM: remove some useless comments
mru
parents: 8250
diff changeset
92 c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
10359
48be79afc72d ARM: clean up dsputil initialisation
mru
parents: 10203
diff changeset
93 } else if (avctx->idct_algo==FF_IDCT_SIMPLEARM){
6180
a15900739a31 fix indentation that was messed up by r11628
gpoirier
parents: 6179
diff changeset
94 c->idct_put= simple_idct_ARM_put;
a15900739a31 fix indentation that was messed up by r11628
gpoirier
parents: 6179
diff changeset
95 c->idct_add= simple_idct_ARM_add;
a15900739a31 fix indentation that was messed up by r11628
gpoirier
parents: 6179
diff changeset
96 c->idct = simple_idct_ARM;
a15900739a31 fix indentation that was messed up by r11628
gpoirier
parents: 6179
diff changeset
97 c->idct_permutation_type= FF_NO_IDCT_PERM;
a15900739a31 fix indentation that was messed up by r11628
gpoirier
parents: 6179
diff changeset
98 }
6179
bdcb17652343 fix lowres decoding support on ARM CPUs
gpoirier
parents: 5641
diff changeset
99 }
2734
aeea63c97878 Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents: 1347
diff changeset
100
5641
1e93e637fa21 Fix put_*_xy2_arm bug and enable put_pixels16_arm and put_pixels8_y2_arm.
diego
parents: 5010
diff changeset
101 c->put_pixels_tab[0][0] = put_pixels16_arm;
8267
ebbdbb35a0cf ARM: remove some useless comments
mru
parents: 8250
diff changeset
102 c->put_pixels_tab[0][1] = put_pixels16_x2_arm;
ebbdbb35a0cf ARM: remove some useless comments
mru
parents: 8250
diff changeset
103 c->put_pixels_tab[0][2] = put_pixels16_y2_arm;
5641
1e93e637fa21 Fix put_*_xy2_arm bug and enable put_pixels16_arm and put_pixels8_y2_arm.
diego
parents: 5010
diff changeset
104 c->put_pixels_tab[0][3] = put_pixels16_xy2_arm;
1e93e637fa21 Fix put_*_xy2_arm bug and enable put_pixels16_arm and put_pixels8_y2_arm.
diego
parents: 5010
diff changeset
105 c->put_no_rnd_pixels_tab[0][0] = put_pixels16_arm;
8267
ebbdbb35a0cf ARM: remove some useless comments
mru
parents: 8250
diff changeset
106 c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_arm;
ebbdbb35a0cf ARM: remove some useless comments
mru
parents: 8250
diff changeset
107 c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_arm;
5641
1e93e637fa21 Fix put_*_xy2_arm bug and enable put_pixels16_arm and put_pixels8_y2_arm.
diego
parents: 5010
diff changeset
108 c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_arm;
8267
ebbdbb35a0cf ARM: remove some useless comments
mru
parents: 8250
diff changeset
109 c->put_pixels_tab[1][0] = put_pixels8_arm;
ebbdbb35a0cf ARM: remove some useless comments
mru
parents: 8250
diff changeset
110 c->put_pixels_tab[1][1] = put_pixels8_x2_arm;
5641
1e93e637fa21 Fix put_*_xy2_arm bug and enable put_pixels16_arm and put_pixels8_y2_arm.
diego
parents: 5010
diff changeset
111 c->put_pixels_tab[1][2] = put_pixels8_y2_arm;
1e93e637fa21 Fix put_*_xy2_arm bug and enable put_pixels16_arm and put_pixels8_y2_arm.
diego
parents: 5010
diff changeset
112 c->put_pixels_tab[1][3] = put_pixels8_xy2_arm;
8267
ebbdbb35a0cf ARM: remove some useless comments
mru
parents: 8250
diff changeset
113 c->put_no_rnd_pixels_tab[1][0] = put_pixels8_arm;
ebbdbb35a0cf ARM: remove some useless comments
mru
parents: 8250
diff changeset
114 c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_arm;
ebbdbb35a0cf ARM: remove some useless comments
mru
parents: 8250
diff changeset
115 c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_arm;
5641
1e93e637fa21 Fix put_*_xy2_arm bug and enable put_pixels16_arm and put_pixels8_y2_arm.
diego
parents: 5010
diff changeset
116 c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_arm;
2734
aeea63c97878 Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents: 1347
diff changeset
117
10359
48be79afc72d ARM: clean up dsputil initialisation
mru
parents: 10203
diff changeset
118 if (HAVE_ARMV5TE) ff_dsputil_init_armv5te(c, avctx);
48be79afc72d ARM: clean up dsputil initialisation
mru
parents: 10203
diff changeset
119 if (HAVE_ARMV6) ff_dsputil_init_armv6(c, avctx);
7688
160d5c1ae60a ARM: add prefetch function using ARMv5 PLD instruction
mru
parents: 7166
diff changeset
120
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8359
diff changeset
121 #if HAVE_IWMMXT
2734
aeea63c97878 Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents: 1347
diff changeset
122 dsputil_init_iwmmxt(c, avctx);
aeea63c97878 Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents: 1347
diff changeset
123 #endif
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8359
diff changeset
124 #if HAVE_ARMVFP
6786
18084aaa277b Add some initial optimizations for ARM VFP (floating
gpoirier
parents: 6763
diff changeset
125 ff_float_init_arm_vfp(c, avctx);
18084aaa277b Add some initial optimizations for ARM VFP (floating
gpoirier
parents: 6763
diff changeset
126 #endif
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8359
diff changeset
127 #if HAVE_NEON
8334
6bdd6dfc3574 ARM: NEON optimised put_pixels functions
mru
parents: 8267
diff changeset
128 ff_dsputil_init_neon(c, avctx);
6bdd6dfc3574 ARM: NEON optimised put_pixels functions
mru
parents: 8267
diff changeset
129 #endif
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 874
diff changeset
130 }