Mercurial > libavcodec.hg
annotate arm/dsputil_init_arm.c @ 12530:63edd10ad4bc libavcodec tip
Try to fix crashes introduced by r25218
r25218 made assumptions about the existence of past reference frames that
weren't necessarily true.
| author | darkshikari |
|---|---|
| date | Tue, 28 Sep 2010 09:06:22 +0000 |
| parents | 9fef0a8ddd63 |
| children |
| rev | line source |
|---|---|
| 61 | 1 /* |
| 8359 | 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 | 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 | 8 * modify it under the terms of the GNU Lesser General Public |
| 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 | 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 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 429 | 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 15 * Lesser General Public License for more details. | |
| 61 | 16 * |
| 429 | 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 | 20 */ |
| 21 | |
| 6763 | 22 #include "libavcodec/dsputil.h" |
| 10359 | 23 #include "dsputil_arm.h" |
| 61 | 24 |
| 10374 | 25 void ff_j_rev_dct_arm(DCTELEM *data); |
| 26 void ff_simple_idct_arm(DCTELEM *data); | |
| 61 | 27 |
| 1092 | 28 /* XXX: local hack */ |
| 29 static void (*ff_put_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size); | |
| 30 static void (*ff_add_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size); | |
| 31 | |
| 10363 | 32 void ff_put_pixels8_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h); |
| 33 void ff_put_pixels8_x2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h); | |
| 34 void ff_put_pixels8_y2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h); | |
| 35 void ff_put_pixels8_xy2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h); | |
|
2734
aeea63c97878
Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents:
1347
diff
changeset
|
36 |
| 10363 | 37 void ff_put_no_rnd_pixels8_x2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h); |
| 38 void ff_put_no_rnd_pixels8_y2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h); | |
| 39 void ff_put_no_rnd_pixels8_xy2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h); | |
|
2734
aeea63c97878
Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents:
1347
diff
changeset
|
40 |
| 10363 | 41 void ff_put_pixels16_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h); |
|
2734
aeea63c97878
Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents:
1347
diff
changeset
|
42 |
| 10363 | 43 CALL_2X_PIXELS(ff_put_pixels16_x2_arm, ff_put_pixels8_x2_arm, 8) |
| 44 CALL_2X_PIXELS(ff_put_pixels16_y2_arm, ff_put_pixels8_y2_arm, 8) | |
| 45 CALL_2X_PIXELS(ff_put_pixels16_xy2_arm, ff_put_pixels8_xy2_arm, 8) | |
| 46 CALL_2X_PIXELS(ff_put_no_rnd_pixels16_x2_arm, ff_put_no_rnd_pixels8_x2_arm, 8) | |
| 47 CALL_2X_PIXELS(ff_put_no_rnd_pixels16_y2_arm, ff_put_no_rnd_pixels8_y2_arm, 8) | |
| 48 CALL_2X_PIXELS(ff_put_no_rnd_pixels16_xy2_arm, ff_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 |
| 10374 | 50 void ff_add_pixels_clamped_arm(const DCTELEM *block, uint8_t *dest, |
| 10373 | 51 int line_size); |
|
2734
aeea63c97878
Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents:
1347
diff
changeset
|
52 |
| 1092 | 53 /* XXX: those functions should be suppressed ASAP when all IDCTs are |
| 54 converted */ | |
| 10374 | 55 static void j_rev_dct_arm_put(uint8_t *dest, int line_size, DCTELEM *block) |
| 1092 | 56 { |
| 10374 | 57 ff_j_rev_dct_arm (block); |
| 1092 | 58 ff_put_pixels_clamped(block, dest, line_size); |
| 59 } | |
| 10374 | 60 static void j_rev_dct_arm_add(uint8_t *dest, int line_size, DCTELEM *block) |
| 61 | 61 { |
| 10374 | 62 ff_j_rev_dct_arm (block); |
| 1092 | 63 ff_add_pixels_clamped(block, dest, line_size); |
| 61 | 64 } |
| 10374 | 65 static void simple_idct_arm_put(uint8_t *dest, int line_size, DCTELEM *block) |
|
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
|
66 { |
| 10374 | 67 ff_simple_idct_arm (block); |
|
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
|
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 } |
| 10374 | 70 static void simple_idct_arm_add(uint8_t *dest, int line_size, DCTELEM *block) |
|
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
|
71 { |
| 10374 | 72 ff_simple_idct_arm (block); |
|
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
|
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 | 75 |
| 8359 | 76 void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx) |
| 1092 | 77 { |
| 78 ff_put_pixels_clamped = c->put_pixels_clamped; | |
| 79 ff_add_pixels_clamped = c->add_pixels_clamped; | |
| 80 | |
| 10362 | 81 if (!avctx->lowres) { |
| 10359 | 82 if(avctx->idct_algo == FF_IDCT_AUTO || |
| 83 avctx->idct_algo == FF_IDCT_ARM){ | |
| 10374 | 84 c->idct_put = j_rev_dct_arm_put; |
| 85 c->idct_add = j_rev_dct_arm_add; | |
| 86 c->idct = ff_j_rev_dct_arm; | |
| 10362 | 87 c->idct_permutation_type = FF_LIBMPEG2_IDCT_PERM; |
| 88 } else if (avctx->idct_algo == FF_IDCT_SIMPLEARM){ | |
| 10374 | 89 c->idct_put = simple_idct_arm_put; |
| 90 c->idct_add = simple_idct_arm_add; | |
| 91 c->idct = ff_simple_idct_arm; | |
| 10362 | 92 c->idct_permutation_type = FF_NO_IDCT_PERM; |
| 6180 | 93 } |
| 6179 | 94 } |
|
2734
aeea63c97878
Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents:
1347
diff
changeset
|
95 |
| 10374 | 96 c->add_pixels_clamped = ff_add_pixels_clamped_arm; |
| 10373 | 97 |
| 10363 | 98 c->put_pixels_tab[0][0] = ff_put_pixels16_arm; |
| 99 c->put_pixels_tab[0][1] = ff_put_pixels16_x2_arm; | |
| 100 c->put_pixels_tab[0][2] = ff_put_pixels16_y2_arm; | |
| 101 c->put_pixels_tab[0][3] = ff_put_pixels16_xy2_arm; | |
| 102 c->put_pixels_tab[1][0] = ff_put_pixels8_arm; | |
| 103 c->put_pixels_tab[1][1] = ff_put_pixels8_x2_arm; | |
| 104 c->put_pixels_tab[1][2] = ff_put_pixels8_y2_arm; | |
| 105 c->put_pixels_tab[1][3] = ff_put_pixels8_xy2_arm; | |
| 10362 | 106 |
| 10363 | 107 c->put_no_rnd_pixels_tab[0][0] = ff_put_pixels16_arm; |
| 108 c->put_no_rnd_pixels_tab[0][1] = ff_put_no_rnd_pixels16_x2_arm; | |
| 109 c->put_no_rnd_pixels_tab[0][2] = ff_put_no_rnd_pixels16_y2_arm; | |
| 110 c->put_no_rnd_pixels_tab[0][3] = ff_put_no_rnd_pixels16_xy2_arm; | |
| 111 c->put_no_rnd_pixels_tab[1][0] = ff_put_pixels8_arm; | |
| 112 c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_arm; | |
| 113 c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_arm; | |
| 114 c->put_no_rnd_pixels_tab[1][3] = ff_put_no_rnd_pixels8_xy2_arm; | |
|
2734
aeea63c97878
Better ARM support for mplayer/ffmpeg, ported from atty fork
michael
parents:
1347
diff
changeset
|
115 |
| 10359 | 116 if (HAVE_ARMV5TE) ff_dsputil_init_armv5te(c, avctx); |
| 117 if (HAVE_ARMV6) ff_dsputil_init_armv6(c, avctx); | |
| 10363 | 118 if (HAVE_IWMMXT) ff_dsputil_init_iwmmxt(c, avctx); |
| 10361 | 119 if (HAVE_ARMVFP) ff_dsputil_init_vfp(c, avctx); |
| 120 if (HAVE_NEON) ff_dsputil_init_neon(c, avctx); | |
| 1092 | 121 } |
