diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-24 17:48:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-25 04:08:08 +0200 |
| commit | 8050dfdfb284874e3989301771e8011422e78c7a (patch) | |
| tree | d0cacab1c2be6734e8d9d17819e00281f78e2779 | |
| parent | 040e1c67edab57177adb88a7dd1cc9ed38d2b74e (diff) | |
| download | ffmpeg-8050dfdfb284874e3989301771e8011422e78c7a.tar.gz | |
swscale: Switch to ronalds yuv2yuvX16inC_template() its very similar to baptsites
and supports alpha
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswscale/swscale.c | 46 |
1 files changed, 1 insertions, 45 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 0bfa3537fd..c048180e1d 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -421,50 +421,6 @@ static av_always_inline void yuv2yuvX16inC_template(const int16_t *lumFilter, co } } -static av_always_inline void yuv2yuvXNinC_template(const int16_t *lumFilter, const int16_t **lumSrc, int lumFilterSize, - const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize, - const int16_t **alpSrc, uint16_t *dest, uint16_t *uDest, uint16_t *vDest, uint16_t *aDest, - int dstW, int chrDstW, int big_endian, int depth) -{ - //FIXME Optimize (just quickly written not optimized..) - int i; - - for (i = 0; i < dstW; i++) { - int val = 1 << (26-depth); - int j; - - for (j = 0; j < lumFilterSize; j++) - val += lumSrc[j][i] * lumFilter[j]; - - if (big_endian) { - AV_WB16(&dest[i], av_clip(val >> (27-depth), 0, (1<<depth)-1)); - } else { - AV_WL16(&dest[i], av_clip(val >> (27-depth), 0, (1<<depth)-1)); - } - } - - if (uDest) { - for (i = 0; i < chrDstW; i++) { - int u = 1 << (26-depth); - int v = 1 << (26-depth); - int j; - - for (j = 0; j < chrFilterSize; j++) { - u += chrSrc[j][i ] * chrFilter[j]; - v += chrSrc[j][i + VOFW] * chrFilter[j]; - } - - if (big_endian) { - AV_WB16(&uDest[i], av_clip(u >> (27-depth), 0, (1<<depth)-1)); - AV_WB16(&vDest[i], av_clip(v >> (27-depth), 0, (1<<depth)-1)); - } else { - AV_WL16(&uDest[i], av_clip(u >> (27-depth), 0, (1<<depth)-1)); - AV_WL16(&vDest[i], av_clip(v >> (27-depth), 0, (1<<depth)-1)); - } - } - } -} - static inline void yuv2yuvX16inC(const int16_t *lumFilter, const int16_t **lumSrc, int lumFilterSize, const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize, const int16_t **alpSrc, uint16_t *dest, uint16_t *uDest, uint16_t *vDest, uint16_t *aDest, int dstW, int chrDstW, @@ -472,7 +428,7 @@ static inline void yuv2yuvX16inC(const int16_t *lumFilter, const int16_t **lumSr { if (isNBPS(dstFormat)) { const int depth = av_pix_fmt_descriptors[dstFormat].comp[0].depth_minus1+1; - yuv2yuvXNinC_template(lumFilter, lumSrc, lumFilterSize, + yuv2yuvX16inC_template(lumFilter, lumSrc, lumFilterSize, chrFilter, chrSrc, chrFilterSize, alpSrc, dest, uDest, vDest, aDest, |