Mercurial > libavcodec.hg
changeset 11398:00b80bf84ad9 libavcodec
bfin: fix function prototypes
Move prototypes to header files, add missing prototypes,
make some functions static.
| author | mru |
|---|---|
| date | Mon, 08 Mar 2010 02:36:11 +0000 |
| parents | 58c4d851d1c7 |
| children | bb19a598f066 |
| files | bfin/dsputil_bfin.c bfin/dsputil_bfin.h bfin/vp3_bfin.c mpegvideo.h |
| diffstat | 4 files changed, 34 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/bfin/dsputil_bfin.c Mon Mar 08 02:36:07 2010 +0000 +++ b/bfin/dsputil_bfin.c Mon Mar 08 02:36:11 2010 +0000 @@ -27,38 +27,6 @@ int off; - -void ff_bfin_idct (DCTELEM *block) attribute_l1_text; -void ff_bfin_fdct (DCTELEM *block) attribute_l1_text; -void ff_bfin_vp3_idct (DCTELEM *block); -void ff_bfin_vp3_idct_put (uint8_t *dest, int line_size, DCTELEM *block); -void ff_bfin_vp3_idct_add (uint8_t *dest, int line_size, DCTELEM *block); -void ff_bfin_add_pixels_clamped (const DCTELEM *block, uint8_t *dest, int line_size) attribute_l1_text; -void ff_bfin_put_pixels_clamped (const DCTELEM *block, uint8_t *dest, int line_size) attribute_l1_text; -void ff_bfin_diff_pixels (DCTELEM *block, const uint8_t *s1, const uint8_t *s2, int stride) attribute_l1_text; -void ff_bfin_get_pixels (DCTELEM *restrict block, const uint8_t *pixels, int line_size) attribute_l1_text; -int ff_bfin_pix_norm1 (uint8_t * pix, int line_size) attribute_l1_text; -int ff_bfin_z_sad8x8 (uint8_t *blk1, uint8_t *blk2, int dsz, int line_size, int h) attribute_l1_text; -int ff_bfin_z_sad16x16 (uint8_t *blk1, uint8_t *blk2, int dsz, int line_size, int h) attribute_l1_text; - -void ff_bfin_z_put_pixels16_xy2 (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text; -void ff_bfin_z_put_pixels8_xy2 (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text; -void ff_bfin_put_pixels16_xy2_nornd (uint8_t *block, const uint8_t *s0, int line_size, int h) attribute_l1_text; -void ff_bfin_put_pixels8_xy2_nornd (uint8_t *block, const uint8_t *s0, int line_size, int h) attribute_l1_text; - - -int ff_bfin_pix_sum (uint8_t *p, int stride) attribute_l1_text; - -void ff_bfin_put_pixels8uc (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int dest_size, int line_size, int h) attribute_l1_text; -void ff_bfin_put_pixels16uc (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int dest_size, int line_size, int h) attribute_l1_text; -void ff_bfin_put_pixels8uc_nornd (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int line_size, int h) attribute_l1_text; -void ff_bfin_put_pixels16uc_nornd (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int line_size, int h) attribute_l1_text; - -int ff_bfin_sse4 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) attribute_l1_text; -int ff_bfin_sse8 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) attribute_l1_text; -int ff_bfin_sse16 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) attribute_l1_text; - - static void bfin_idct_add (uint8_t *dest, int line_size, DCTELEM *block) { ff_bfin_idct (block); @@ -127,7 +95,7 @@ ff_bfin_z_put_pixels16_xy2 (block,s0,line_size, line_size, h); } -void bfin_put_pixels8_nornd (uint8_t *block, const uint8_t *pixels, int line_size, int h) +static void bfin_put_pixels8_nornd (uint8_t *block, const uint8_t *pixels, int line_size, int h) { ff_bfin_put_pixels8uc_nornd (block, pixels, pixels, line_size, h); } @@ -143,7 +111,7 @@ } -void bfin_put_pixels16_nornd (uint8_t *block, const uint8_t *pixels, int line_size, int h) +static void bfin_put_pixels16_nornd (uint8_t *block, const uint8_t *pixels, int line_size, int h) { ff_bfin_put_pixels16uc_nornd (block, pixels, pixels, line_size, h); }
--- a/bfin/dsputil_bfin.h Mon Mar 08 02:36:07 2010 +0000 +++ b/bfin/dsputil_bfin.h Mon Mar 08 02:36:11 2010 +0000 @@ -32,6 +32,37 @@ #define attribute_l1_data_b #endif +void ff_bfin_idct (DCTELEM *block) attribute_l1_text; +void ff_bfin_fdct (DCTELEM *block) attribute_l1_text; +void ff_bfin_vp3_idct (DCTELEM *block); +void ff_bfin_vp3_idct_put (uint8_t *dest, int line_size, DCTELEM *block); +void ff_bfin_vp3_idct_add (uint8_t *dest, int line_size, DCTELEM *block); +void ff_bfin_add_pixels_clamped (const DCTELEM *block, uint8_t *dest, int line_size) attribute_l1_text; +void ff_bfin_put_pixels_clamped (const DCTELEM *block, uint8_t *dest, int line_size) attribute_l1_text; +void ff_bfin_diff_pixels (DCTELEM *block, const uint8_t *s1, const uint8_t *s2, int stride) attribute_l1_text; +void ff_bfin_get_pixels (DCTELEM *restrict block, const uint8_t *pixels, int line_size) attribute_l1_text; +int ff_bfin_pix_norm1 (uint8_t * pix, int line_size) attribute_l1_text; +int ff_bfin_z_sad8x8 (uint8_t *blk1, uint8_t *blk2, int dsz, int line_size, int h) attribute_l1_text; +int ff_bfin_z_sad16x16 (uint8_t *blk1, uint8_t *blk2, int dsz, int line_size, int h) attribute_l1_text; + +void ff_bfin_z_put_pixels16_xy2 (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text; +void ff_bfin_z_put_pixels8_xy2 (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text; +void ff_bfin_put_pixels16_xy2_nornd (uint8_t *block, const uint8_t *s0, int line_size, int h) attribute_l1_text; +void ff_bfin_put_pixels8_xy2_nornd (uint8_t *block, const uint8_t *s0, int line_size, int h) attribute_l1_text; + + +int ff_bfin_pix_sum (uint8_t *p, int stride) attribute_l1_text; + +void ff_bfin_put_pixels8uc (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int dest_size, int line_size, int h) attribute_l1_text; +void ff_bfin_put_pixels16uc (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int dest_size, int line_size, int h) attribute_l1_text; +void ff_bfin_put_pixels8uc_nornd (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int line_size, int h) attribute_l1_text; +void ff_bfin_put_pixels16uc_nornd (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int line_size, int h) attribute_l1_text; + +int ff_bfin_sse4 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) attribute_l1_text; +int ff_bfin_sse8 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) attribute_l1_text; +int ff_bfin_sse16 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) attribute_l1_text; + + #ifdef BFIN_PROFILE static double Telem[16];
--- a/bfin/vp3_bfin.c Mon Mar 08 02:36:07 2010 +0000 +++ b/bfin/vp3_bfin.c Mon Mar 08 02:36:11 2010 +0000 @@ -22,11 +22,6 @@ #include "libavcodec/dsputil.h" #include "dsputil_bfin.h" -void ff_bfin_vp3_idct (DCTELEM *block) attribute_l1_text; -void ff_bfin_idct (DCTELEM *block) attribute_l1_text; -void ff_bfin_add_pixels_clamped (DCTELEM *block, uint8_t *dest, int line_size) attribute_l1_text; -void ff_bfin_put_pixels_clamped (DCTELEM *block, uint8_t *dest, int line_size) attribute_l1_text; - /* Intra iDCT offset 128 */ void ff_bfin_vp3_idct_put (uint8_t *dest, int line_size, DCTELEM *block) {
--- a/mpegvideo.h Mon Mar 08 02:36:07 2010 +0000 +++ b/mpegvideo.h Mon Mar 08 02:36:11 2010 +0000 @@ -692,6 +692,7 @@ void MPV_common_init_mmi(MpegEncContext *s); void MPV_common_init_arm(MpegEncContext *s); void MPV_common_init_altivec(MpegEncContext *s); +void MPV_common_init_bfin(MpegEncContext *s); void ff_clean_intra_table_entries(MpegEncContext *s); void ff_draw_horiz_band(MpegEncContext *s, int y, int h); void ff_mpeg_flush(AVCodecContext *avctx);