generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sws: fix rgb -> 16bit

Browse Source
This commit is contained in:
Michael Niedermayer 2011-07-03 02:08:45 +02:00
parent b5ff61695f
commit 987e4c1787
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libswscale/swscale.c
View File

@ -1979,6 +1979,9 @@ static void hScale16_c(SwsContext *c, int16_t *_dst, int dstW, const uint8_t *_s
int bits = av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1; int bits = av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1;
int sh = (bits <= 7) ? 11 : (bits - 4); int sh = (bits <= 7) ? 11 : (bits - 4);
if((isAnyRGB(c->srcFormat) || c->srcFormat==PIX_FMT_PAL8) && av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1<15)
sh= 9;
for (i = 0; i < dstW; i++) { for (i = 0; i < dstW; i++) {
int j; int j;
int srcPos = filterPos[i]; int srcPos = filterPos[i];
@ -2154,7 +2157,7 @@ static av_always_inline void hyscale(SwsContext *c, int16_t *dst, int dstWidth,
src= formatConvBuffer; src= formatConvBuffer;
} }
if (av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1 < 8 && c->scalingBpp == 16) { if (av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1 < 8 && c->scalingBpp == 16 && !isAnyRGB(c->srcFormat)) {
c->scale8To16Rv((uint16_t *) formatConvBuffer, src, srcW); c->scale8To16Rv((uint16_t *) formatConvBuffer, src, srcW);
src = formatConvBuffer; src = formatConvBuffer;
} }
@ -2208,7 +2211,7 @@ static av_always_inline void hcscale(SwsContext *c, int16_t *dst1, int16_t *dst2
src2= buf2; src2= buf2;
} }
if (av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1 < 8 && c->scalingBpp == 16) { if (av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1 < 8 && c->scalingBpp == 16 && !isAnyRGB(c->srcFormat)) {
uint8_t *buf2 = (formatConvBuffer + FFALIGN(srcW * 2+78, 16)); uint8_t *buf2 = (formatConvBuffer + FFALIGN(srcW * 2+78, 16));
c->scale8To16Rv((uint16_t *) formatConvBuffer, src1, srcW); c->scale8To16Rv((uint16_t *) formatConvBuffer, src1, srcW);
c->scale8To16Rv((uint16_t *) buf2, src2, srcW); c->scale8To16Rv((uint16_t *) buf2, src2, srcW);
@ -2878,8 +2881,8 @@ static av_cold void sws_init_swScale_c(SwsContext *c)
} }
} }
if((isAnyRGB(c->srcFormat) && av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1<15) if(((isAnyRGB(c->srcFormat) && av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1<15)
|| c->srcFormat == PIX_FMT_PAL8) || c->srcFormat == PIX_FMT_PAL8) && c->scalingBpp == 8)
c->hScale16= hScale16N_c; c->hScale16= hScale16N_c;
if (c->scalingBpp == 8) { if (c->scalingBpp == 8) {

2
libswscale/x86/swscale_template.c
View File

@ -2438,6 +2438,6 @@ static av_cold void RENAME(sws_init_swScale)(SwsContext *c)
} }
} }
#endif /* !COMPILE_TEMPLATE_MMX2 */ #endif /* !COMPILE_TEMPLATE_MMX2 */
if(isAnyRGB(c->srcFormat) && av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1<15) if(isAnyRGB(c->srcFormat) && av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1<15 && c->scalingBpp == 8)
c->hScale16= RENAME(hScale16); c->hScale16= RENAME(hScale16);
} }