diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-03-21 08:09:19 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-03-21 08:09:19 +0000 |
| commit | ce894d34418f20f937ca1dfa532fa3f9afb61fee (patch) | |
| tree | 2ef6ed6709f868bfeb9d18875e368a8fb2020a3f | |
| parent | f594c0bd1bc3eb2900c55b78e97eaa1634f25297 (diff) | |
| download | pcsxr-ce894d34418f20f937ca1dfa532fa3f9afb61fee.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@42608 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | libpcsxcore/mdec.c | 8 |
2 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,7 @@ +March 21, 2010 Wei Mingzhi <whistler_wmz@users.sf.net> + + * libpcsxcore/mdec.c: Minor cleanup. + March 18, 2010 Wei Mingzhi <whistler_wmz@users.sf.net> * macosx/plugins/HIDInput/src/PlugPAD.c: Commented out calls to diff --git a/libpcsxcore/mdec.c b/libpcsxcore/mdec.c index cabc1db7..64a3f4dd 100644 --- a/libpcsxcore/mdec.c +++ b/libpcsxcore/mdec.c @@ -316,7 +316,7 @@ static void putquadrgb15(unsigned short *image, int *Yblk, int Cr, int Cb) { int Y, R, G, B; int A = (mdec.reg0 & MDEC0_STP) ? 0x8000 : 0; R = MULR(Cr); - G = MULG2(Cb,Cr); + G = MULG2(Cb, Cr); B = MULB(Cb); // added transparency @@ -330,7 +330,7 @@ static void putquadrgb15(unsigned short *image, int *Yblk, int Cr, int Cb) { image[17] = MAKERGB15(CLAMP_SCALE5(Y + R), CLAMP_SCALE5(Y + G), CLAMP_SCALE5(Y + B), A); } -static void yuv2rgb15(int *blk,unsigned short *image) { +static void yuv2rgb15(int *blk, unsigned short *image) { int x, y; int *Yblk = blk + DSIZE2 * 2; int *Crblk = blk; @@ -478,7 +478,7 @@ void psxDma0(u32 adr, u32 bcr, u32 chcr) { case 0x4: // quantization table upload { - u8 *p = (u8*)PSXM(adr); + u8 *p = (u8 *)PSXM(adr); // printf("uploading new quantization table\n"); // printmatrixu8(p); // printmatrixu8(p + 64); @@ -508,7 +508,7 @@ void psxDma1(u32 adr, u32 bcr, u32 chcr) { #ifdef CDR_LOG CDR_LOG("DMA1 %08x %08x %08x (cmd = %08x)\n", adr, bcr, chcr, mdec.reg0); #endif - + if (chcr != 0x01000200) return; size = (bcr >> 16) * (bcr & 0xffff); |