[Mplayer-cvslog] CVS: main/postproc cs_test.c,1.3,1.4 swscale.c,1.129,1.130 swscale_template.c,1.102,1.103

Gabucino gabucino at mplayerhq.hu
Sat Oct 4 19:29:10 CEST 2003


Update of /cvsroot/mplayer/main/postproc
In directory mail:/var/tmp.root/cvs-serv24410/postproc

Modified Files:
	cs_test.c swscale.c swscale_template.c 
Log Message:
many small typo and grammar fixes
Based on Bernard Leak's mail <bernard 4t brenda-arkle.demon.co.uk>


Index: cs_test.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/cs_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cs_test.c	23 May 2003 20:21:31 -0000	1.3
+++ cs_test.c	4 Oct 2003 17:29:06 -0000	1.4
@@ -72,7 +72,7 @@
 					uint8_t *dst= dstBuffer+dstOffset;
 					char *name=NULL;
 					
-					if(failed) break; //dont fill the screen with shit ...
+					if(failed) break; //don't fill the screen with shit ...
 
 					switch(funcNum){
 					case 0:

Index: swscale.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- swscale.c	26 Sep 2003 23:37:28 -0000	1.129
+++ swscale.c	4 Oct 2003 17:29:06 -0000	1.130
@@ -728,7 +728,7 @@
 
 #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)
 {
@@ -983,7 +983,7 @@
 
 			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;
 
 			// Move filter coeffs left
@@ -1702,7 +1702,7 @@
 	if(clip_table[512] != 255) globalInit();
 	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);
 	dstFormat = remove_dup_fourcc(origDstFormat);
 
@@ -1872,7 +1872,7 @@
 			c->lumXInc+= 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)
 		{
 			c->lumXInc = ((srcW-2)<<16)/(dstW-2) - 20;
@@ -1894,7 +1894,7 @@
 				 srcFilter->chrH, dstFilter->chrH);
 
 #ifdef ARCH_X86
-// cant downscale !!!
+// can't downscale !!!
 		if(c->canMMX2BeUsed && (flags & SWS_FAST_BILINEAR))
 		{
 			c->lumMmx2Filter   = (int16_t*)memalign(8, (dstW        /8+8)*sizeof(int16_t));
@@ -1920,7 +1920,7 @@
 			(flags&SWS_BICUBLIN) ? (flags|SWS_BILINEAR) : flags,
 			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->vChrBufSize= c->vChrFilterSize;
 	for(i=0; i<dstH; i++)
@@ -2079,7 +2079,7 @@
 }
 
 /**
- * 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
  */
 int sws_scale_ordered(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
@@ -2088,7 +2088,7 @@
 }
 
 /**
- * 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 srcSliceH, uint8_t* dstParam[], int dstStrideParam[]){

Index: swscale_template.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale_template.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- swscale_template.c	21 Apr 2003 23:14:21 -0000	1.102
+++ swscale_template.c	4 Oct 2003 17:29:06 -0000	1.103
@@ -950,7 +950,7 @@
 	int uvalpha1=uvalpha^4095;
 	int i;
 
-#if 0 //isnt used
+#if 0 //isn't used
 	if(flags&SWS_FULL_CHR_H_INT)
 	{
 		switch(dstFormat)
@@ -1169,7 +1169,7 @@
 #ifdef HAVE_MMX
 	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:
 			asm volatile(
 				"movl %%esp, "ESP_OFFSET"(%5)		\n\t"
@@ -2211,7 +2211,7 @@
     }
 
 #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))
 #else
     if(!(flags&SWS_FAST_BILINEAR))
@@ -2303,7 +2303,7 @@
 		: "%eax", "%ebx", "%ecx", "%edi", "%esi"
 		);
 #ifdef HAVE_MMX2
-	} //if MMX2 cant be used
+	} //if MMX2 can't be used
 #endif
 #else
 	int i;
@@ -2379,7 +2379,7 @@
     }
 
 #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))
 #else
     if(!(flags&SWS_FAST_BILINEAR))
@@ -2482,7 +2482,7 @@
 		: "%eax", "%ebx", "%ecx", "%edi", "%esi"
 		);
 #ifdef HAVE_MMX2
-	} //if MMX2 cant be used
+	} //if MMX2 can't be used
 #endif
 #else
 	int i;
@@ -2698,7 +2698,7 @@
 			//wrap buf index around to stay inside the ring buffer
 			if(lumBufIndex >= vLumBufSize ) lumBufIndex-= vLumBufSize;
 			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
@@ -2772,7 +2772,7 @@
 			}
 		}
             }
-	    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 **chrSrcPtr= chrPixBuf + chrBufIndex + firstChrSrcY - lastInChrBuf + vChrBufSize;



More information about the MPlayer-cvslog mailing list