Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

add ff_ prefix to all simple_idct symbols

Browse Source 
Originally committed as revision 11192 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Aurelien Jacobs 17 years ago
parent 98f48ce157
commit 59e6f60a99
7 changed files with 27 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavcodec/dct-test.c
  2. 8
      libavcodec/dsputil.c
  3. 2
      libavcodec/dv.c
  4. 12
      libavcodec/simple_idct.c
  5. 12
      libavcodec/simple_idct.h
  6. 8
      libavcodec/vc1.c
  7. 8
      libavcodec/wmv2.c

4
libavcodec/dct-test.c
Unescape View File

@ -91,7 +91,7 @@ struct algo algos[] = {
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 @@ int main(int argc, char **argv)
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) {

8
libavcodec/dsputil.c
Unescape View File

@ -3497,7 +3497,7 @@ static int quant_psnr8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *s
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 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
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;
}
}

2
libavcodec/dv.c
Unescape View File

@ -225,7 +225,7 @@ static int dvvideo_init(AVCodecContext *avctx)
/* 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];

12
libavcodec/simple_idct.c
Unescape View File

@ -387,7 +387,7 @@ static inline void idctSparseCol (DCTELEM * col)
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 @@ void simple_idct_put(uint8_t *dest, int line_size, DCTELEM *block)
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 @@ void simple_idct_add(uint8_t *dest, int line_size, DCTELEM *block)
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 @@ static inline void idct4col_put(uint8_t *dest, int line_size, const DCTELEM *col
/* 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 @@ static inline void idct4row(DCTELEM *row)
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_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_idct48_add(uint8_t *dest, int line_size, DCTELEM *block)
{
int i;

12
libavcodec/simple_idct.h
Unescape View File

@ -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 */

8
libavcodec/vc1.c
Unescape View File

@ -813,10 +813,10 @@ static int decode_sequence_header(AVCodecContext *avctx, GetBitContext *gb)
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

8
libavcodec/wmv2.c
Unescape View File

@ -41,13 +41,13 @@ static void wmv2_add_block(Wmv2Context *w, DCTELEM *block1, uint8_t *dst, int st
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:

Write Preview
Loading…
Cancel
Save