RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

many small typo and grammar fixes 

Based on Bernard Leak's mail <bernard 4t brenda-arkle.demon.co.uk>

Originally committed as revision 11001 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
This commit is contained in:
Gabucino 2003-10-04 17:29:08 +00:00
parent 29d48296a7
commit 77a416e8aa
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
postproc/cs_test.c
View File

@ -72,7 +72,7 @@ main(int argc, char **argv)
uint8_t *dst= dstBuffer+dstOffset; uint8_t *dst= dstBuffer+dstOffset;
char *name=NULL; char *name=NULL;
if(failed) break; //dont fill the screen with shit ... if(failed) break; //don't fill the screen with shit ...
switch(funcNum){ switch(funcNum){
case 0: case 0:

16
postproc/swscale.c
View File

@ -728,7 +728,7 @@ static inline void yuv2packedXinC(SwsContext *c, int16_t *lumFilter, int16_t **l
#endif //ARCH_X86 #endif //ARCH_X86
// minor note: the HAVE_xyz is messed up after that line so dont use it // minor note: the HAVE_xyz is messed up after that line so don't use it
static double getSplineCoeff(double a, double b, double c, double d, double dist) static double getSplineCoeff(double a, double b, double c, double d, double dist)
{ {
@ -983,7 +983,7 @@ static inline void initFilter(int16_t **outFilter, int16_t **filterPos, int *out
if(cutOff > SWS_MAX_REDUCE_CUTOFF) break; if(cutOff > SWS_MAX_REDUCE_CUTOFF) break;
/* preserve Monotonicity because the core cant handle the filter otherwise */ /* preserve Monotonicity because the core can't handle the filter otherwise */
if(i<dstW-1 && (*filterPos)[i] >= (*filterPos)[i+1]) break; if(i<dstW-1 && (*filterPos)[i] >= (*filterPos)[i+1]) break;
// Move filter coeffs left // Move filter coeffs left
@ -1702,7 +1702,7 @@ SwsContext *sws_getContext(int srcW, int srcH, int origSrcFormat, int dstW, int
if(clip_table[512] != 255) globalInit(); if(clip_table[512] != 255) globalInit();
if(rgb15to16 == NULL) sws_rgb2rgb_init(flags); if(rgb15to16 == NULL) sws_rgb2rgb_init(flags);
/* avoid dupplicate Formats, so we dont need to check to much */ /* avoid duplicate Formats, so we don't need to check to much */
srcFormat = remove_dup_fourcc(origSrcFormat); srcFormat = remove_dup_fourcc(origSrcFormat);
dstFormat = remove_dup_fourcc(origDstFormat); dstFormat = remove_dup_fourcc(origDstFormat);
@ -1872,7 +1872,7 @@ SwsContext *sws_getContext(int srcW, int srcH, int origSrcFormat, int dstW, int
c->lumXInc+= 20; c->lumXInc+= 20;
c->chrXInc+= 20; c->chrXInc+= 20;
} }
//we dont use the x86asm scaler if mmx is available //we don't use the x86asm scaler if mmx is available
else if(flags & SWS_CPU_CAPS_MMX) else if(flags & SWS_CPU_CAPS_MMX)
{ {
c->lumXInc = ((srcW-2)<<16)/(dstW-2) - 20; c->lumXInc = ((srcW-2)<<16)/(dstW-2) - 20;
@ -1894,7 +1894,7 @@ SwsContext *sws_getContext(int srcW, int srcH, int origSrcFormat, int dstW, int
srcFilter->chrH, dstFilter->chrH); srcFilter->chrH, dstFilter->chrH);
#ifdef ARCH_X86 #ifdef ARCH_X86
// cant downscale !!! // can't downscale !!!
if(c->canMMX2BeUsed && (flags & SWS_FAST_BILINEAR)) if(c->canMMX2BeUsed && (flags & SWS_FAST_BILINEAR))
{ {
c->lumMmx2Filter = (int16_t*)memalign(8, (dstW /8+8)*sizeof(int16_t)); c->lumMmx2Filter = (int16_t*)memalign(8, (dstW /8+8)*sizeof(int16_t));
@ -1920,7 +1920,7 @@ SwsContext *sws_getContext(int srcW, int srcH, int origSrcFormat, int dstW, int
(flags&SWS_BICUBLIN) ? (flags|SWS_BILINEAR) : flags, (flags&SWS_BICUBLIN) ? (flags|SWS_BILINEAR) : flags,
srcFilter->chrV, dstFilter->chrV); srcFilter->chrV, dstFilter->chrV);
// Calculate Buffer Sizes so that they wont run out while handling these damn slices // Calculate Buffer Sizes so that they won't run out while handling these damn slices
c->vLumBufSize= c->vLumFilterSize; c->vLumBufSize= c->vLumFilterSize;
c->vChrBufSize= c->vChrFilterSize; c->vChrBufSize= c->vChrFilterSize;
for(i=0; i<dstH; i++) for(i=0; i<dstH; i++)
@ -2079,7 +2079,7 @@ SwsContext *sws_getContext(int srcW, int srcH, int origSrcFormat, int dstW, int
} }
/** /**
* swscale warper, so we dont need to export the SwsContext. * swscale warper, so we don't need to export the SwsContext.
* assumes planar YUV to be in YUV order instead of YVU * assumes planar YUV to be in YUV order instead of YVU
*/ */
int sws_scale_ordered(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, int sws_scale_ordered(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
@ -2088,7 +2088,7 @@ int sws_scale_ordered(SwsContext *c, uint8_t* src[], int srcStride[], int srcSli
} }
/** /**
* swscale warper, so we dont need to export the SwsContext * swscale warper, so we don't need to export the SwsContext
*/ */
int sws_scale(SwsContext *c, uint8_t* srcParam[], int srcStrideParam[], int srcSliceY, int sws_scale(SwsContext *c, uint8_t* srcParam[], int srcStrideParam[], int srcSliceY,
int srcSliceH, uint8_t* dstParam[], int dstStrideParam[]){ int srcSliceH, uint8_t* dstParam[], int dstStrideParam[]){

16
postproc/swscale_template.c
View File

@ -950,7 +950,7 @@ static inline void RENAME(yuv2packed2)(SwsContext *c, uint16_t *buf0, uint16_t *
int uvalpha1=uvalpha^4095; int uvalpha1=uvalpha^4095;
int i; int i;
#if 0 //isnt used #if 0 //isn't used
if(flags&SWS_FULL_CHR_H_INT) if(flags&SWS_FULL_CHR_H_INT)
{ {
switch(dstFormat) switch(dstFormat)
@ -1169,7 +1169,7 @@ FULL_YSCALEYUV2RGB
#ifdef HAVE_MMX #ifdef HAVE_MMX
switch(c->dstFormat) switch(c->dstFormat)
{ {
//Note 8280 == DSTW_OFFSET but the preprocessor cant handle that there :( //Note 8280 == DSTW_OFFSET but the preprocessor can't handle that there :(
case IMGFMT_BGR32: case IMGFMT_BGR32:
asm volatile( asm volatile(
"movl %%esp, "ESP_OFFSET"(%5) \n\t" "movl %%esp, "ESP_OFFSET"(%5) \n\t"
@ -2211,7 +2211,7 @@ static inline void RENAME(hyscale)(uint16_t *dst, int dstWidth, uint8_t *src, in
} }
#ifdef HAVE_MMX #ifdef HAVE_MMX
// use the new MMX scaler if th mmx2 cant be used (its faster than the x86asm one) // use the new MMX scaler if the mmx2 can't be used (its faster than the x86asm one)
if(!(flags&SWS_FAST_BILINEAR) || (!canMMX2BeUsed)) if(!(flags&SWS_FAST_BILINEAR) || (!canMMX2BeUsed))
#else #else
if(!(flags&SWS_FAST_BILINEAR)) if(!(flags&SWS_FAST_BILINEAR))
@ -2303,7 +2303,7 @@ FUNNY_Y_CODE
: "%eax", "%ebx", "%ecx", "%edi", "%esi" : "%eax", "%ebx", "%ecx", "%edi", "%esi"
); );
#ifdef HAVE_MMX2 #ifdef HAVE_MMX2
} //if MMX2 cant be used } //if MMX2 can't be used
#endif #endif
#else #else
int i; int i;
@ -2379,7 +2379,7 @@ inline static void RENAME(hcscale)(uint16_t *dst, int dstWidth, uint8_t *src1, u
} }
#ifdef HAVE_MMX #ifdef HAVE_MMX
// use the new MMX scaler if th mmx2 cant be used (its faster than the x86asm one) // use the new MMX scaler if the mmx2 can't be used (its faster than the x86asm one)
if(!(flags&SWS_FAST_BILINEAR) || (!canMMX2BeUsed)) if(!(flags&SWS_FAST_BILINEAR) || (!canMMX2BeUsed))
#else #else
if(!(flags&SWS_FAST_BILINEAR)) if(!(flags&SWS_FAST_BILINEAR))
@ -2482,7 +2482,7 @@ FUNNY_UV_CODE
: "%eax", "%ebx", "%ecx", "%edi", "%esi" : "%eax", "%ebx", "%ecx", "%edi", "%esi"
); );
#ifdef HAVE_MMX2 #ifdef HAVE_MMX2
} //if MMX2 cant be used } //if MMX2 can't be used
#endif #endif
#else #else
int i; int i;
@ -2698,7 +2698,7 @@ i--;
//wrap buf index around to stay inside the ring buffer //wrap buf index around to stay inside the ring buffer
if(lumBufIndex >= vLumBufSize ) lumBufIndex-= vLumBufSize; if(lumBufIndex >= vLumBufSize ) lumBufIndex-= vLumBufSize;
if(chrBufIndex >= vChrBufSize ) chrBufIndex-= vChrBufSize; if(chrBufIndex >= vChrBufSize ) chrBufIndex-= vChrBufSize;
break; //we cant output a dstY line so lets try with the next slice break; //we can't output a dstY line so let's try with the next slice
} }
#ifdef HAVE_MMX #ifdef HAVE_MMX
@ -2772,7 +2772,7 @@ i--;
} }
} }
} }
else // hmm looks like we cant use MMX here without overwriting this arrays tail else // hmm looks like we can't use MMX here without overwriting this array's tail
{ {
int16_t **lumSrcPtr= lumPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize; int16_t **lumSrcPtr= lumPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize;
int16_t **chrSrcPtr= chrPixBuf + chrBufIndex + firstChrSrcY - lastInChrBuf + vChrBufSize; int16_t **chrSrcPtr= chrPixBuf + chrBufIndex + firstChrSrcY - lastInChrBuf + vChrBufSize;