Mercurial > mplayer.hg
comparison libswscale/swscale_template.c @ 29409:4b0a12d0e5bd
Indent.
author | ramiro |
---|---|
date | Tue, 28 Jul 2009 05:14:47 +0000 |
parents | 45759bfb13d6 |
children | 0673fad0546f |
comparison
equal
deleted
inserted
replaced
29408:45759bfb13d6 | 29409:4b0a12d0e5bd |
---|---|
2718 if (!enough_lines) { | 2718 if (!enough_lines) { |
2719 lastLumSrcY = srcSliceY + srcSliceH - 1; | 2719 lastLumSrcY = srcSliceY + srcSliceH - 1; |
2720 lastChrSrcY = chrSrcSliceY + chrSrcSliceH - 1; | 2720 lastChrSrcY = chrSrcSliceY + chrSrcSliceH - 1; |
2721 } | 2721 } |
2722 | 2722 |
2723 /* printf("%d %d Last:%d %d LastInBuf:%d %d Index:%d %d Y:%d FSize: %d %d BSize: %d %d\n", | 2723 /* printf("%d %d Last:%d %d LastInBuf:%d %d Index:%d %d Y:%d FSize: %d %d BSize: %d %d\n", |
2724 firstChrSrcY,firstLumSrcY,lastChrSrcY,lastLumSrcY, | 2724 firstChrSrcY,firstLumSrcY,lastChrSrcY,lastLumSrcY, |
2725 lastInChrBuf,lastInLumBuf,chrBufIndex,lumBufIndex,dstY,vChrFilterSize,vLumFilterSize, | 2725 lastInChrBuf,lastInLumBuf,chrBufIndex,lumBufIndex,dstY,vChrFilterSize,vLumFilterSize, |
2726 vChrBufSize, vLumBufSize);*/ | 2726 vChrBufSize, vLumBufSize);*/ |
2727 | 2727 |
2728 //Do horizontal scaling | 2728 //Do horizontal scaling |
2729 while(lastInLumBuf < lastLumSrcY) | 2729 while(lastInLumBuf < lastLumSrcY) |
2730 { | 2730 { |
2731 uint8_t *src1= src[0]+(lastInLumBuf + 1 - srcSliceY)*srcStride[0]; | 2731 uint8_t *src1= src[0]+(lastInLumBuf + 1 - srcSliceY)*srcStride[0]; |
2732 uint8_t *src2= src[3]+(lastInLumBuf + 1 - srcSliceY)*srcStride[3]; | 2732 uint8_t *src2= src[3]+(lastInLumBuf + 1 - srcSliceY)*srcStride[3]; |
2733 lumBufIndex++; | 2733 lumBufIndex++; |
2734 //printf("%d %d %d %d\n", lumBufIndex, vLumBufSize, lastInLumBuf, lastLumSrcY); | 2734 //printf("%d %d %d %d\n", lumBufIndex, vLumBufSize, lastInLumBuf, lastLumSrcY); |
2735 assert(lumBufIndex < 2*vLumBufSize); | 2735 assert(lumBufIndex < 2*vLumBufSize); |
2736 assert(lastInLumBuf + 1 - srcSliceY < srcSliceH); | 2736 assert(lastInLumBuf + 1 - srcSliceY < srcSliceH); |
2737 assert(lastInLumBuf + 1 - srcSliceY >= 0); | 2737 assert(lastInLumBuf + 1 - srcSliceY >= 0); |
2738 //printf("%d %d\n", lumBufIndex, vLumBufSize); | 2738 //printf("%d %d\n", lumBufIndex, vLumBufSize); |
2739 RENAME(hyscale)(c, lumPixBuf[ lumBufIndex ], dstW, src1, srcW, lumXInc, | 2739 RENAME(hyscale)(c, lumPixBuf[ lumBufIndex ], dstW, src1, srcW, lumXInc, |
2740 flags, hLumFilter, hLumFilterPos, hLumFilterSize, | |
2741 c->srcFormat, formatConvBuffer, | |
2742 pal, 0); | |
2743 if (CONFIG_SWSCALE_ALPHA && alpPixBuf) | |
2744 RENAME(hyscale)(c, alpPixBuf[ lumBufIndex ], dstW, src2, srcW, lumXInc, | |
2740 flags, hLumFilter, hLumFilterPos, hLumFilterSize, | 2745 flags, hLumFilter, hLumFilterPos, hLumFilterSize, |
2741 c->srcFormat, formatConvBuffer, | 2746 c->srcFormat, formatConvBuffer, |
2742 pal, 0); | 2747 pal, 1); |
2743 if (CONFIG_SWSCALE_ALPHA && alpPixBuf) | 2748 lastInLumBuf++; |
2744 RENAME(hyscale)(c, alpPixBuf[ lumBufIndex ], dstW, src2, srcW, lumXInc, | 2749 } |
2745 flags, hLumFilter, hLumFilterPos, hLumFilterSize, | 2750 while(lastInChrBuf < lastChrSrcY) |
2746 c->srcFormat, formatConvBuffer, | 2751 { |
2747 pal, 1); | 2752 uint8_t *src1= src[1]+(lastInChrBuf + 1 - chrSrcSliceY)*srcStride[1]; |
2748 lastInLumBuf++; | 2753 uint8_t *src2= src[2]+(lastInChrBuf + 1 - chrSrcSliceY)*srcStride[2]; |
2749 } | 2754 chrBufIndex++; |
2750 while(lastInChrBuf < lastChrSrcY) | 2755 assert(chrBufIndex < 2*vChrBufSize); |
2751 { | 2756 assert(lastInChrBuf + 1 - chrSrcSliceY < (chrSrcSliceH)); |
2752 uint8_t *src1= src[1]+(lastInChrBuf + 1 - chrSrcSliceY)*srcStride[1]; | 2757 assert(lastInChrBuf + 1 - chrSrcSliceY >= 0); |
2753 uint8_t *src2= src[2]+(lastInChrBuf + 1 - chrSrcSliceY)*srcStride[2]; | 2758 //FIXME replace parameters through context struct (some at least) |
2754 chrBufIndex++; | 2759 |
2755 assert(chrBufIndex < 2*vChrBufSize); | 2760 if (!(isGray(srcFormat) || isGray(dstFormat))) |
2756 assert(lastInChrBuf + 1 - chrSrcSliceY < (chrSrcSliceH)); | 2761 RENAME(hcscale)(c, chrPixBuf[ chrBufIndex ], chrDstW, src1, src2, chrSrcW, chrXInc, |
2757 assert(lastInChrBuf + 1 - chrSrcSliceY >= 0); | 2762 flags, hChrFilter, hChrFilterPos, hChrFilterSize, |
2758 //FIXME replace parameters through context struct (some at least) | 2763 c->srcFormat, formatConvBuffer, |
2759 | 2764 pal); |
2760 if (!(isGray(srcFormat) || isGray(dstFormat))) | 2765 lastInChrBuf++; |
2761 RENAME(hcscale)(c, chrPixBuf[ chrBufIndex ], chrDstW, src1, src2, chrSrcW, chrXInc, | 2766 } |
2762 flags, hChrFilter, hChrFilterPos, hChrFilterSize, | 2767 //wrap buf index around to stay inside the ring buffer |
2763 c->srcFormat, formatConvBuffer, | 2768 if (lumBufIndex >= vLumBufSize) lumBufIndex-= vLumBufSize; |
2764 pal); | 2769 if (chrBufIndex >= vChrBufSize) chrBufIndex-= vChrBufSize; |
2765 lastInChrBuf++; | 2770 if (!enough_lines) |
2766 } | |
2767 //wrap buf index around to stay inside the ring buffer | |
2768 if (lumBufIndex >= vLumBufSize) lumBufIndex-= vLumBufSize; | |
2769 if (chrBufIndex >= vChrBufSize) chrBufIndex-= vChrBufSize; | |
2770 if (!enough_lines) | |
2771 break; //we can't output a dstY line so let's try with the next slice | 2771 break; //we can't output a dstY line so let's try with the next slice |
2772 | 2772 |
2773 #if COMPILE_TEMPLATE_MMX | 2773 #if COMPILE_TEMPLATE_MMX |
2774 c->blueDither= ff_dither8[dstY&1]; | 2774 c->blueDither= ff_dither8[dstY&1]; |
2775 if (c->dstFormat == PIX_FMT_RGB555 || c->dstFormat == PIX_FMT_BGR555) | 2775 if (c->dstFormat == PIX_FMT_RGB555 || c->dstFormat == PIX_FMT_BGR555) |