diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-19 10:52:11 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-19 10:52:11 +0000 |
| commit | 0956549379a239182714ca5f06bb40748e3a54a5 (patch) | |
| tree | f3b4e0b2e5ef1125940ad6ae029ffdf066063484 /libpcsxcore/mdec.c | |
| parent | b24d4d3cd394aa86691d69156f3fb108c3537582 (diff) | |
| download | pcsxr-0956549379a239182714ca5f06bb40748e3a54a5.tar.gz | |
Use SDL for sound plugin, reverted the change to BIAS in r48024. (and I'm too lazy to hunt down the bug with x64 dynarec :( feel free to revert this revert if not preferred :P)
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@48308 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore/mdec.c')
| -rw-r--r-- | libpcsxcore/mdec.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libpcsxcore/mdec.c b/libpcsxcore/mdec.c index 8048cf32..7165af4b 100644 --- a/libpcsxcore/mdec.c +++ b/libpcsxcore/mdec.c @@ -516,18 +516,18 @@ void psxDma1(u32 adr, u32 bcr, u32 chcr) { image = (u16 *)PSXM(adr); if (mdec.reg0 & MDEC0_RGB24) { // 15-b decoding - // MDECOUTDMA_INT(((size * (1000000 / 9000)) / 4) /** 4*/); - MDECOUTDMA_INT((size / 4)); + // MDECOUTDMA_INT(((size * (1000000 / 9000)) / 4) /** 4*/ / BIAS); + MDECOUTDMA_INT((size / 4) / BIAS); size = size / ((16 * 16) / 2); for (; size > 0; size--, image += (16 * 16)) { mdec.rl = rl2blk(blk, mdec.rl); yuv2rgb15(blk, image); } } else { // 24-b decoding - // MDECOUTDMA_INT(((size * (1000000 / 9000)) / 4) /** 4*/); - MDECOUTDMA_INT((size / 4)); + // MDECOUTDMA_INT(((size * (1000000 / 9000)) / 4) /** 4*/ / BIAS); + MDECOUTDMA_INT((size / 4) / BIAS); size = size / ((24 * 16) / 2); - for (; size>0; size--, image += (24 * 16)) { + for (; size > 0; size--, image += (24 * 16)) { mdec.rl = rl2blk(blk, mdec.rl); yuv2rgb24(blk, (u8 *)image); } @@ -546,9 +546,9 @@ void mdec1Interrupt() { // PSXCLK / 1000 seems good for FF9. (for FF9 need < ~28000) // CAUTION: commented interrupt-handling may lead to problems, keep an eye ;-) MDECOUTDMA_INT(PSXCLK / 1000); - // psxRegs.interrupt |= 0x02000000; - // psxRegs.intCycle[5 + 24 + 1] *= 8; - // psxRegs.intCycle[5 + 24] = psxRegs.cycle; +// psxRegs.interrupt |= 0x02000000; +// psxRegs.intCycle[5 + 24 + 1] *= 8; +// psxRegs.intCycle[5 + 24] = psxRegs.cycle; HW_DMA1_CHCR &= SWAP32(~0x01000000); DMA_INTERRUPT(1); } else { |