falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Add av_ prefix to clip functions 

Originally committed as revision 22339 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
tags/v0.5
Reimar Döffinger 18 years ago
parent
f66e4f5f9e
commit
adcec46a83
4 changed files with 16 additions and 16 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +9
    -9
      libswscale/swscale.c
  2. +5
    -5
      libswscale/swscale_altivec_template.c
  3. +1
    -1
      libswscale/swscale_template.c
  4. +1
    -1
      libswscale/yuv2rgb_init.c

+ 9
- 9
libswscale/swscale.c View File

@@ -316,7 +316,7 @@ static inline void yuv2yuvXinC(int16_t *lumFilter, int16_t **lumSrc, int lumFilt
for(j=0; j<lumFilterSize; j++) for(j=0; j<lumFilterSize; j++)
val += lumSrc[j][i] * lumFilter[j]; val += lumSrc[j][i] * lumFilter[j];


dest[i]= clip_uint8(val>>19);
dest[i]= av_clip_uint8(val>>19);
} }


if(uDest != NULL) if(uDest != NULL)
@@ -331,8 +331,8 @@ static inline void yuv2yuvXinC(int16_t *lumFilter, int16_t **lumSrc, int lumFilt
v += chrSrc[j][i + 2048] * chrFilter[j]; v += chrSrc[j][i + 2048] * chrFilter[j];
} }


uDest[i]= clip_uint8(u>>19);
vDest[i]= clip_uint8(v>>19);
uDest[i]= av_clip_uint8(u>>19);
vDest[i]= av_clip_uint8(v>>19);
} }
} }


@@ -349,7 +349,7 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil
for(j=0; j<lumFilterSize; j++) for(j=0; j<lumFilterSize; j++)
val += lumSrc[j][i] * lumFilter[j]; val += lumSrc[j][i] * lumFilter[j];


dest[i]= clip_uint8(val>>19);
dest[i]= av_clip_uint8(val>>19);
} }


if(uDest == NULL) if(uDest == NULL)
@@ -367,8 +367,8 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil
v += chrSrc[j][i + 2048] * chrFilter[j]; v += chrSrc[j][i + 2048] * chrFilter[j];
} }


uDest[2*i]= clip_uint8(u>>19);
uDest[2*i+1]= clip_uint8(v>>19);
uDest[2*i]= av_clip_uint8(u>>19);
uDest[2*i+1]= av_clip_uint8(v>>19);
} }
else else
for(i=0; i<chrDstW; i++) for(i=0; i<chrDstW; i++)
@@ -382,8 +382,8 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil
v += chrSrc[j][i + 2048] * chrFilter[j]; v += chrSrc[j][i + 2048] * chrFilter[j];
} }


uDest[2*i]= clip_uint8(v>>19);
uDest[2*i+1]= clip_uint8(u>>19);
uDest[2*i]= av_clip_uint8(v>>19);
uDest[2*i+1]= av_clip_uint8(u>>19);
} }
} }


@@ -1465,7 +1465,7 @@ static void globalInit(void){
// generating tables: // generating tables:
int i; int i;
for(i=0; i<768; i++){ for(i=0; i<768; i++){
int c= clip_uint8(i-256);
int c= av_clip_uint8(i-256);
clip_table[i]=c; clip_table[i]=c;
} }
} }


+ 5
- 5
libswscale/swscale_altivec_template.c View File

@@ -226,7 +226,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int
for(j=0; j<filterSize; j++) { for(j=0; j<filterSize; j++) {
val += ((int)src[srcPos + j])*filter[filterSize*i + j]; val += ((int)src[srcPos + j])*filter[filterSize*i + j];
} }
dst[i] = clip(val>>7, 0, (1<<15)-1);
dst[i] = av_clip(val>>7, 0, (1<<15)-1);
} }
} }
else else
@@ -265,7 +265,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int
val_vEven = vec_mule(src_v, filter_v); val_vEven = vec_mule(src_v, filter_v);
val_s = vec_sums(val_vEven, vzero); val_s = vec_sums(val_vEven, vzero);
vec_st(val_s, 0, tempo); vec_st(val_s, 0, tempo);
dst[i] = clip(tempo[3]>>7, 0, (1<<15)-1);
dst[i] = av_clip(tempo[3]>>7, 0, (1<<15)-1);
} }
} }
break; break;
@@ -292,7 +292,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int
val_v = vec_msums(src_v, filter_v, (vector signed int)vzero); val_v = vec_msums(src_v, filter_v, (vector signed int)vzero);
val_s = vec_sums(val_v, vzero); val_s = vec_sums(val_v, vzero);
vec_st(val_s, 0, tempo); vec_st(val_s, 0, tempo);
dst[i] = clip(tempo[3]>>7, 0, (1<<15)-1);
dst[i] = av_clip(tempo[3]>>7, 0, (1<<15)-1);
} }
} }
break; break;
@@ -321,7 +321,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int
vector signed int val_s = vec_sums(val_v, vzero); vector signed int val_s = vec_sums(val_v, vzero);


vec_st(val_s, 0, tempo); vec_st(val_s, 0, tempo);
dst[i] = clip(tempo[3]>>7, 0, (1<<15)-1);
dst[i] = av_clip(tempo[3]>>7, 0, (1<<15)-1);
} }
} }
break; break;
@@ -383,7 +383,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int
val_s = vec_sums(val_v, vzero); val_s = vec_sums(val_v, vzero);
vec_st(val_s, 0, tempo); vec_st(val_s, 0, tempo);
dst[i] = clip(tempo[3]>>7, 0, (1<<15)-1);
dst[i] = av_clip(tempo[3]>>7, 0, (1<<15)-1);
} }
} }


+ 1
- 1
libswscale/swscale_template.c View File

@@ -2488,7 +2488,7 @@ static inline void RENAME(hScale)(int16_t *dst, int dstW, uint8_t *src, int srcW
val += ((int)src[srcPos + j])*filter[filterSize*i + j]; val += ((int)src[srcPos + j])*filter[filterSize*i + j];
} }
// filter += hFilterSize; // filter += hFilterSize;
dst[i] = clip(val>>7, 0, (1<<15)-1); // the cubic equation does overflow ...
dst[i] = av_clip(val>>7, 0, (1<<15)-1); // the cubic equation does overflow ...
// dst[i] = val>>7; // dst[i] = val>>7;
} }
#endif #endif


+ 1
- 1
libswscale/yuv2rgb_init.c View File

@@ -277,7 +277,7 @@ int yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int fullRange,


for (i = 0; i < 1024; i++) { for (i = 0; i < 1024; i++) {
value = (cy*(((i - YTABLE_MIN)<<16) - oy) + (1<<31))>>32; value = (cy*(((i - YTABLE_MIN)<<16) - oy) + (1<<31))>>32;
ytable[i] = clip_uint8(value);
ytable[i] = av_clip_uint8(value);
} }


entry_size = get_entry_size(fmt_depth(c->dstFormat)); entry_size = get_entry_size(fmt_depth(c->dstFormat));


Write Preview
Loading…
Cancel
Save