This is done similarly for all other architectures.
Unified · Split
| @@ -21,10 +21,41 @@ · 20 unmodified lines | ||
| 21 | 21 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 22 | 22 | */ |
| 23 | 23 | |
| 24 | +#include <stdint.h> | |
| 25 | + | |
| 26 | +#include "config.h" | |
| 24 | 27 | #include "libavutil/attributes.h" |
| 28 | +#include "libavutil/bfin/attributes.h" | |
| 25 | 29 | #include "libavcodec/avcodec.h" |
| 26 | 30 | #include "libavcodec/dsputil.h" |
| 27 | −#include "dsputil_bfin.h" | |
| 31 | + | |
| 32 | +void ff_bfin_idct(int16_t *block) attribute_l1_text; | |
| 33 | +void ff_bfin_fdct(int16_t *block) attribute_l1_text; | |
| 34 | + | |
| 35 | +void ff_bfin_add_pixels_clamped(const int16_t *block, uint8_t *dest, | |
| 36 | + int line_size) attribute_l1_text; | |
| 37 | +void ff_bfin_put_pixels_clamped(const int16_t *block, uint8_t *dest, | |
| 38 | + int line_size) attribute_l1_text; | |
| 39 | + | |
| 40 | +void ff_bfin_diff_pixels(int16_t *block, const uint8_t *s1, const uint8_t *s2, | |
| 41 | + int stride) attribute_l1_text; | |
| 42 | +void ff_bfin_get_pixels(int16_t *restrict block, const uint8_t *pixels, | |
| 43 | + int line_size) attribute_l1_text; | |
| 44 | + | |
| 45 | +int ff_bfin_pix_norm1(uint8_t *pix, int line_size) attribute_l1_text; | |
| 46 | +int ff_bfin_pix_sum(uint8_t *p, int stride) attribute_l1_text; | |
| 47 | + | |
| 48 | +int ff_bfin_z_sad8x8(uint8_t *blk1, uint8_t *blk2, int dsz, | |
| 49 | + int line_size, int h) attribute_l1_text; | |
| 50 | +int ff_bfin_z_sad16x16(uint8_t *blk1, uint8_t *blk2, int dsz, | |
| 51 | + int line_size, int h) attribute_l1_text; | |
| 52 | + | |
| 53 | +int ff_bfin_sse4(void *v, uint8_t *pix1, uint8_t *pix2, | |
| 54 | + int line_size, int h) attribute_l1_text; | |
| 55 | +int ff_bfin_sse8(void *v, uint8_t *pix1, uint8_t *pix2, | |
| 56 | + int line_size, int h) attribute_l1_text; | |
| 57 | +int ff_bfin_sse16(void *v, uint8_t *pix1, uint8_t *pix2, | |
| 58 | + int line_size, int h) attribute_l1_text; | |
| 28 | 59 | |
| 29 | 60 | static void bfin_idct_add(uint8_t *dest, int line_size, int16_t *block) |
| 30 | 61 | { |
| @@ -1,59 +0,0 @@ | ||
| 1 | −/* | |
| 2 | − * BlackFin DSPUTILS COMMON OPTIMIZATIONS HEADER | |
| 3 | − * | |
| 4 | − * Copyright (C) 2007 Marc Hoffman <mmh@pleasantst.com> | |
| 5 | − * | |
| 6 | − * This file is part of Libav. | |
| 7 | − * | |
| 8 | − * Libav is free software; you can redistribute it and/or | |
| 9 | − * modify it under the terms of the GNU Lesser General Public | |
| 10 | − * License as published by the Free Software Foundation; either | |
| 11 | − * version 2.1 of the License, or (at your option) any later version. | |
| 12 | − * | |
| 13 | − * Libav is distributed in the hope that it will be useful, | |
| 14 | − * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 | − * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 16 | − * Lesser General Public License for more details. | |
| 17 | − * | |
| 18 | − * You should have received a copy of the GNU Lesser General Public | |
| 19 | − * License along with Libav; if not, write to the Free Software | |
| 20 | − * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
| 21 | − */ | |
| 22 | − | |
| 23 | −#ifndef AVCODEC_BFIN_DSPUTIL_BFIN_H | |
| 24 | −#define AVCODEC_BFIN_DSPUTIL_BFIN_H | |
| 25 | − | |
| 26 | −#include <stdint.h> | |
| 27 | − | |
| 28 | −#include "config.h" | |
| 29 | −#include "libavutil/bfin/attributes.h" | |
| 30 | − | |
| 31 | −void ff_bfin_idct(int16_t *block) attribute_l1_text; | |
| 32 | −void ff_bfin_fdct(int16_t *block) attribute_l1_text; | |
| 33 | − | |
| 34 | −void ff_bfin_add_pixels_clamped(const int16_t *block, uint8_t *dest, | |
| 35 | − int line_size) attribute_l1_text; | |
| 36 | −void ff_bfin_put_pixels_clamped(const int16_t *block, uint8_t *dest, | |
| 37 | − int line_size) attribute_l1_text; | |
| 38 | − | |
| 39 | −void ff_bfin_diff_pixels(int16_t *block, const uint8_t *s1, const uint8_t *s2, | |
| 40 | − int stride) attribute_l1_text; | |
| 41 | −void ff_bfin_get_pixels(int16_t *restrict block, const uint8_t *pixels, | |
| 42 | − int line_size) attribute_l1_text; | |
| 43 | − | |
| 44 | −int ff_bfin_pix_norm1(uint8_t *pix, int line_size) attribute_l1_text; | |
| 45 | −int ff_bfin_pix_sum(uint8_t *p, int stride) attribute_l1_text; | |
| 46 | − | |
| 47 | −int ff_bfin_z_sad8x8(uint8_t *blk1, uint8_t *blk2, int dsz, | |
| 48 | − int line_size, int h) attribute_l1_text; | |
| 49 | −int ff_bfin_z_sad16x16(uint8_t *blk1, uint8_t *blk2, int dsz, | |
| 50 | − int line_size, int h) attribute_l1_text; | |
| 51 | − | |
| 52 | −int ff_bfin_sse4(void *v, uint8_t *pix1, uint8_t *pix2, | |
| 53 | − int line_size, int h) attribute_l1_text; | |
| 54 | −int ff_bfin_sse8(void *v, uint8_t *pix1, uint8_t *pix2, | |
| 55 | − int line_size, int h) attribute_l1_text; | |
| 56 | −int ff_bfin_sse16(void *v, uint8_t *pix1, uint8_t *pix2, | |
| 57 | − int line_size, int h) attribute_l1_text; | |
| 58 | − | |
| 59 | −#endif /* AVCODEC_BFIN_DSPUTIL_BFIN_H */ | |
| @@ -25,9 +25,17 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <stdint.h> |
| 26 | 26 | |
| 27 | 27 | #include "libavutil/attributes.h" |
| 28 | +#include "libavutil/bfin/attributes.h" | |
| 28 | 29 | #include "libavcodec/hpeldsp.h" |
| 29 | 30 | #include "hpeldsp_bfin.h" |
| 30 | 31 | |
| 32 | +void ff_bfin_put_pixels8uc_nornd(uint8_t *block, const uint8_t *s0, | |
| 33 | + const uint8_t *s1, int line_size, | |
| 34 | + int h) attribute_l1_text; | |
| 35 | +void ff_bfin_put_pixels16uc_nornd(uint8_t *block, const uint8_t *s0, | |
| 36 | + const uint8_t *s1, int line_size, | |
| 37 | + int h) attribute_l1_text; | |
| 38 | + | |
| 31 | 39 | static void bfin_put_pixels8(uint8_t *block, const uint8_t *pixels, |
| 32 | 40 | ptrdiff_t line_size, int h) |
| 33 | 41 | { |
| @@ -36,11 +36,5 @@ void ff_bfin_put_pixels8uc(uint8_t *block, const uint8_t *s0, · 35 unmodified lines | ||
| 36 | 36 | void ff_bfin_put_pixels16uc(uint8_t *block, const uint8_t *s0, |
| 37 | 37 | const uint8_t *s1, int dest_size, int line_size, |
| 38 | 38 | int h) attribute_l1_text; |
| 39 | −void ff_bfin_put_pixels8uc_nornd(uint8_t *block, const uint8_t *s0, | |
| 40 | − const uint8_t *s1, int line_size, | |
| 41 | − int h) attribute_l1_text; | |
| 42 | −void ff_bfin_put_pixels16uc_nornd(uint8_t *block, const uint8_t *s0, | |
| 43 | − const uint8_t *s1, int line_size, | |
| 44 | − int h) attribute_l1_text; | |
| 45 | 39 | |
| 46 | 40 | #endif /* AVCODEC_BFIN_HPELDSP_BFIN_H */ |
| @@ -18,14 +18,15 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | +#include <stdint.h> | |
| 21 | 22 | #include <string.h> |
| 22 | 23 | |
| 23 | 24 | #include "libavutil/attributes.h" |
| 24 | 25 | #include "libavcodec/avcodec.h" |
| 25 | 26 | #include "libavcodec/vp3dsp.h" |
| 26 | 27 | #include "libavcodec/dsputil.h" |
| 27 | −#include "dsputil_bfin.h" | |
| 28 | −#include "vp3_bfin.h" | |
| 28 | + | |
| 29 | +void ff_bfin_vp3_idct(int16_t *block); | |
| 29 | 30 | |
| 30 | 31 | /* Intra iDCT offset 128 */ |
| 31 | 32 | static void bfin_vp3_idct_put(uint8_t *dest, int line_size, int16_t *block) |
| @@ -1,27 +0,0 @@ | ||
| 1 | −/* | |
| 2 | − * This file is part of Libav. | |
| 3 | − * | |
| 4 | − * Libav is free software; you can redistribute it and/or | |
| 5 | − * modify it under the terms of the GNU Lesser General Public | |
| 6 | − * License as published by the Free Software Foundation; either | |
| 7 | − * version 2.1 of the License, or (at your option) any later version. | |
| 8 | − * | |
| 9 | − * Libav is distributed in the hope that it will be useful, | |
| 10 | − * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 11 | − * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 12 | − * Lesser General Public License for more details. | |
| 13 | − * | |
| 14 | − * You should have received a copy of the GNU Lesser General Public | |
| 15 | − * License along with Libav; if not, write to the Free Software | |
| 16 | − * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
| 17 | − */ | |
| 18 | − | |
| 19 | − | |
| 20 | −#ifndef AVCODEC_BFIN_VP3_BFIN_H | |
| 21 | −#define AVCODEC_BFIN_VP3_BFIN_H | |
| 22 | − | |
| 23 | −#include <stdint.h> | |
| 24 | − | |
| 25 | −void ff_bfin_vp3_idct(int16_t *block); | |
| 26 | − | |
| 27 | −#endif /* AVCODEC_BFIN_VP3_BFIN_H */ | |