Mercurial > mplayer.hg

changeset 2235:5eba9cbc5acf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bpp changed from bytespp to bitspp
author arpi
date Wed, 17 Oct 2001 10:55:29 +0000
parents 36fa77e785d4
children 32027d53eacb
files postproc/swscale.c postproc/swscale_template.c
diffstat 2 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/postproc/swscale.c	Wed Oct 17 10:54:34 2001 +0000
+++ b/postproc/swscale.c	Wed Oct 17 10:55:29 2001 +0000
@@ -472,7 +472,7 @@
 #ifdef HAVE_MMX
 	//FIXME write lq version with less uv ...
 	//FIXME reorder / optimize
-	if(dstbpp == 4)
+	if(dstbpp == 32)
 	{
 		asm volatile(
 
@@ -555,7 +555,7 @@
 		: "%eax"
 		);
 	}
-	else if(dstbpp==2)
+	else if(dstbpp==16)
 	{
 		asm volatile(
 
@@ -590,7 +590,7 @@
 		);
 	}
 #else
-	if(dstbpp==4 || dstbpp==3)
+	if(dstbpp==32 || dstbpp==24)
 	{
 		for(i=0;i<dstw;i++){
 			// vertical linear interpolation && yuv2rgb in a single step:
@@ -600,10 +600,10 @@
 			dest[0]=clip_table[((Y + yuvtab_3343[U]) >>13)];
 			dest[1]=clip_table[((Y + yuvtab_0c92[V] + yuvtab_1a1e[U]) >>13)];
 			dest[2]=clip_table[((Y + yuvtab_40cf[V]) >>13)];
-			dest+=dstbpp;
+			dest+=dstbpp>>3;
 		}
 	}
-	else if(dstbpp==2) //16bit
+	else if(dstbpp==16) //16bit
 	{
 		for(i=0;i<dstw;i++){
 			// vertical linear interpolation && yuv2rgb in a single step:
@@ -615,10 +615,10 @@
 				(clip_table[((Y + yuvtab_3343[U]) >>13)]>>3) |
 				(clip_table[((Y + yuvtab_0c92[V] + yuvtab_1a1e[U]) >>13)]<<3)&0x07E0 |
 				(clip_table[((Y + yuvtab_40cf[V]) >>13)]<<8)&0xF800;
-			dest+=dstbpp;
+			dest+=2;
 		}
 	}
-	else if(dstbpp==2) //15bit FIXME how do i figure out if its 15 or 16?
+	else if(dstbpp==15) //15bit FIXME how do i figure out if its 15 or 16?
 	{
 		for(i=0;i<dstw;i++){
 			// vertical linear interpolation && yuv2rgb in a single step:
@@ -630,7 +630,7 @@
 				(clip_table[((Y + yuvtab_3343[U]) >>13)]>>3) |
 				(clip_table[((Y + yuvtab_0c92[V] + yuvtab_1a1e[U]) >>13)]<<2)&0x03E0 |
 				(clip_table[((Y + yuvtab_40cf[V]) >>13)]<<7)&0x7C00;
-			dest+=dstbpp;
+			dest+=2;
 		}
 	}
 #endif
--- a/postproc/swscale_template.c	Wed Oct 17 10:54:34 2001 +0000
+++ b/postproc/swscale_template.c	Wed Oct 17 10:55:29 2001 +0000
@@ -472,7 +472,7 @@
 #ifdef HAVE_MMX
 	//FIXME write lq version with less uv ...
 	//FIXME reorder / optimize
-	if(dstbpp == 4)
+	if(dstbpp == 32)
 	{
 		asm volatile(
 
@@ -555,7 +555,7 @@
 		: "%eax"
 		);
 	}
-	else if(dstbpp==2)
+	else if(dstbpp==16)
 	{
 		asm volatile(
 
@@ -590,7 +590,7 @@
 		);
 	}
 #else
-	if(dstbpp==4 || dstbpp==3)
+	if(dstbpp==32 || dstbpp==24)
 	{
 		for(i=0;i<dstw;i++){
 			// vertical linear interpolation && yuv2rgb in a single step:
@@ -600,10 +600,10 @@
 			dest[0]=clip_table[((Y + yuvtab_3343[U]) >>13)];
 			dest[1]=clip_table[((Y + yuvtab_0c92[V] + yuvtab_1a1e[U]) >>13)];
 			dest[2]=clip_table[((Y + yuvtab_40cf[V]) >>13)];
-			dest+=dstbpp;
+			dest+=dstbpp>>3;
 		}
 	}
-	else if(dstbpp==2) //16bit
+	else if(dstbpp==16) //16bit
 	{
 		for(i=0;i<dstw;i++){
 			// vertical linear interpolation && yuv2rgb in a single step:
@@ -615,10 +615,10 @@
 				(clip_table[((Y + yuvtab_3343[U]) >>13)]>>3) |
 				(clip_table[((Y + yuvtab_0c92[V] + yuvtab_1a1e[U]) >>13)]<<3)&0x07E0 |
 				(clip_table[((Y + yuvtab_40cf[V]) >>13)]<<8)&0xF800;
-			dest+=dstbpp;
+			dest+=2;
 		}
 	}
-	else if(dstbpp==2) //15bit FIXME how do i figure out if its 15 or 16?
+	else if(dstbpp==15) //15bit FIXME how do i figure out if its 15 or 16?
 	{
 		for(i=0;i<dstw;i++){
 			// vertical linear interpolation && yuv2rgb in a single step:
@@ -630,7 +630,7 @@
 				(clip_table[((Y + yuvtab_3343[U]) >>13)]>>3) |
 				(clip_table[((Y + yuvtab_0c92[V] + yuvtab_1a1e[U]) >>13)]<<2)&0x03E0 |
 				(clip_table[((Y + yuvtab_40cf[V]) >>13)]<<7)&0x7C00;
-			dest+=dstbpp;
+			dest+=2;
 		}
 	}
 #endif