Mercurial > libavcodec.hg
changeset 6001:f4859c13426b libavcodec
add ff_ prefix to all simple_idct symbols
| author | aurel |
|---|---|
| date | Sat, 08 Dec 2007 21:21:11 +0000 |
| parents | 791240825ac4 |
| children | 29635f7c3d9c |
| files | dct-test.c dsputil.c dv.c simple_idct.c simple_idct.h vc1.c wmv2.c |
| diffstat | 7 files changed, 27 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/dct-test.c Sat Dec 08 11:46:09 2007 +0000 +++ b/dct-test.c Sat Dec 08 21:21:11 2007 +0000 @@ -91,7 +91,7 @@ DCT_ERROR("IJG-LLM-INT", 0, ff_jpeg_fdct_islow, fdct, NO_PERM), DCT_ERROR("REF-DBL", 1, idct, idct, NO_PERM), DCT_ERROR("INT", 1, j_rev_dct, idct, MMX_PERM), - DCT_ERROR("SIMPLE-C", 1, simple_idct, idct, NO_PERM), + DCT_ERROR("SIMPLE-C", 1, ff_simple_idct, idct, NO_PERM), #ifdef HAVE_MMX DCT_ERROR("MMX", 0, ff_fdct_mmx, fdct, NO_PERM), @@ -559,7 +559,7 @@ printf("ffmpeg DCT/IDCT test\n"); if (test_248_dct) { - idct248_error("SIMPLE-C", simple_idct248_put); + idct248_error("SIMPLE-C", ff_simple_idct248_put); } else { for (i=0;algos[i].name;i++) if (algos[i].is_idct == test_idct) {
--- a/dsputil.c Sat Dec 08 11:46:09 2007 +0000 +++ b/dsputil.c Sat Dec 08 21:21:11 2007 +0000 @@ -3497,7 +3497,7 @@ s->block_last_index[0/*FIXME*/]= s->fast_dct_quantize(s, temp, 0/*FIXME*/, s->qscale, &i); s->dct_unquantize_inter(s, temp, 0, s->qscale); - simple_idct(temp); //FIXME + ff_simple_idct(temp); //FIXME for(i=0; i<64; i++) sum+= (temp[i]-bak[i])*(temp[i]-bak[i]); @@ -3987,9 +3987,9 @@ c->idct = ff_wmv2_idct_c; c->idct_permutation_type= FF_NO_IDCT_PERM; }else{ //accurate/default - c->idct_put= simple_idct_put; - c->idct_add= simple_idct_add; - c->idct = simple_idct; + c->idct_put= ff_simple_idct_put; + c->idct_add= ff_simple_idct_add; + c->idct = ff_simple_idct; c->idct_permutation_type= FF_NO_IDCT_PERM; } }
--- a/dv.c Sat Dec 08 11:46:09 2007 +0000 +++ b/dv.c Sat Dec 08 21:21:11 2007 +0000 @@ -225,7 +225,7 @@ /* 248DCT setup */ s->fdct[1] = dsp.fdct248; - s->idct_put[1] = simple_idct248_put; // FIXME: need to add it to DSP + s->idct_put[1] = ff_simple_idct248_put; // FIXME: need to add it to DSP if(avctx->lowres){ for (i=0; i<64; i++){ int j= ff_zigzag248_direct[i];
--- a/simple_idct.c Sat Dec 08 11:46:09 2007 +0000 +++ b/simple_idct.c Sat Dec 08 21:21:11 2007 +0000 @@ -387,7 +387,7 @@ col[56] = ((a0 - b0) >> COL_SHIFT); } -void simple_idct_put(uint8_t *dest, int line_size, DCTELEM *block) +void ff_simple_idct_put(uint8_t *dest, int line_size, DCTELEM *block) { int i; for(i=0; i<8; i++) @@ -397,7 +397,7 @@ idctSparseColPut(dest + i, line_size, block + i); } -void simple_idct_add(uint8_t *dest, int line_size, DCTELEM *block) +void ff_simple_idct_add(uint8_t *dest, int line_size, DCTELEM *block) { int i; for(i=0; i<8; i++) @@ -407,7 +407,7 @@ idctSparseColAdd(dest + i, line_size, block + i); } -void simple_idct(DCTELEM *block) +void ff_simple_idct(DCTELEM *block) { int i; for(i=0; i<8; i++) @@ -465,7 +465,7 @@ /* XXX: I think a 1.0/sqrt(2) normalization should be needed to compensate the extra butterfly stage - I don't have the full DV specification */ -void simple_idct248_put(uint8_t *dest, int line_size, DCTELEM *block) +void ff_simple_idct248_put(uint8_t *dest, int line_size, DCTELEM *block) { int i; DCTELEM *ptr; @@ -555,7 +555,7 @@ row[3]= (c0 - c1) >> R_SHIFT; } -void simple_idct84_add(uint8_t *dest, int line_size, DCTELEM *block) +void ff_simple_idct84_add(uint8_t *dest, int line_size, DCTELEM *block) { int i; @@ -570,7 +570,7 @@ } } -void simple_idct48_add(uint8_t *dest, int line_size, DCTELEM *block) +void ff_simple_idct48_add(uint8_t *dest, int line_size, DCTELEM *block) { int i;
--- a/simple_idct.h Sat Dec 08 11:46:09 2007 +0000 +++ b/simple_idct.h Sat Dec 08 21:21:11 2007 +0000 @@ -31,16 +31,16 @@ #include <stdint.h> #include "dsputil.h" -void simple_idct_put(uint8_t *dest, int line_size, DCTELEM *block); -void simple_idct_add(uint8_t *dest, int line_size, DCTELEM *block); +void ff_simple_idct_put(uint8_t *dest, int line_size, DCTELEM *block); +void ff_simple_idct_add(uint8_t *dest, int line_size, DCTELEM *block); void ff_simple_idct_mmx(int16_t *block); void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block); void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block); -void simple_idct(DCTELEM *block); +void ff_simple_idct(DCTELEM *block); -void simple_idct248_put(uint8_t *dest, int line_size, DCTELEM *block); +void ff_simple_idct248_put(uint8_t *dest, int line_size, DCTELEM *block); -void simple_idct84_add(uint8_t *dest, int line_size, DCTELEM *block); -void simple_idct48_add(uint8_t *dest, int line_size, DCTELEM *block); +void ff_simple_idct84_add(uint8_t *dest, int line_size, DCTELEM *block); +void ff_simple_idct48_add(uint8_t *dest, int line_size, DCTELEM *block); #endif /* FFMPEG_SIMPLE_IDCT_H */
--- a/vc1.c Sat Dec 08 11:46:09 2007 +0000 +++ b/vc1.c Sat Dec 08 21:21:11 2007 +0000 @@ -813,10 +813,10 @@ v->res_fasttx = get_bits1(gb); if (!v->res_fasttx) { - v->s.dsp.vc1_inv_trans_8x8 = simple_idct; - v->s.dsp.vc1_inv_trans_8x4 = simple_idct84_add; - v->s.dsp.vc1_inv_trans_4x8 = simple_idct48_add; -// v->s.dsp.vc1_inv_trans_4x4 = simple_idct44_add; + v->s.dsp.vc1_inv_trans_8x8 = ff_simple_idct; + v->s.dsp.vc1_inv_trans_8x4 = ff_simple_idct84_add; + v->s.dsp.vc1_inv_trans_4x8 = ff_simple_idct48_add; +// v->s.dsp.vc1_inv_trans_4x4 = ff_simple_idct44_add; } v->fastuvmc = get_bits1(gb); //common
--- a/wmv2.c Sat Dec 08 11:46:09 2007 +0000 +++ b/wmv2.c Sat Dec 08 21:21:11 2007 +0000 @@ -41,13 +41,13 @@ s->dsp.idct_add (dst, stride, block1); break; case 1: - simple_idct84_add(dst , stride, block1); - simple_idct84_add(dst + 4*stride, stride, w->abt_block2[n]); + ff_simple_idct84_add(dst , stride, block1); + ff_simple_idct84_add(dst + 4*stride, stride, w->abt_block2[n]); memset(w->abt_block2[n], 0, 64*sizeof(DCTELEM)); break; case 2: - simple_idct48_add(dst , stride, block1); - simple_idct48_add(dst + 4 , stride, w->abt_block2[n]); + ff_simple_idct48_add(dst , stride, block1); + ff_simple_idct48_add(dst + 4 , stride, w->abt_block2[n]); memset(w->abt_block2[n], 0, 64*sizeof(DCTELEM)); break; default: