piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-06-28 09:59:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

camera: trigger DMA when reaching the end of a frame (fixes issues when the frame height isn't a multiple of the DMA interval)

Browse Source
This commit is contained in:
Arisotura
2025-06-22 23:58:30 +02:00
parent 83b8f1ae47
commit 8e163296d3
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/DSi_Camera.cpp
View File

@ -128,6 +128,7 @@ void DSi_CamModule::TransferScanline(u32 line)
u32 tmpbuf[512]; u32 tmpbuf[512];
int datalen = CurCamera->TransferScanline(tmpbuf, 512); int datalen = CurCamera->TransferScanline(tmpbuf, 512);
u32 numscan;
// TODO: must be tweaked such that each block has enough time to transfer // TODO: must be tweaked such that each block has enough time to transfer
u32 delay = datalen*4 + 16; u32 delay = datalen*4 + 16;
@ -142,12 +143,7 @@ void DSi_CamModule::TransferScanline(u32 line)
int ystart = (CropStart >> 16) & 0x1FF; int ystart = (CropStart >> 16) & 0x1FF;
int yend = (CropEnd >> 16) & 0x1FF; int yend = (CropEnd >> 16) & 0x1FF;
if (line < ystart || line > yend) if (line < ystart || line > yend)
{ goto skip_line;
if (!CurCamera->TransferDone())
DSi.ScheduleEvent(Event_DSi_CamTransfer, false, delay, 0, line+1);
return;
}
int xstart = (CropStart >> 1) & 0x1FF; int xstart = (CropStart >> 1) & 0x1FF;
int xend = (CropEnd >> 1) & 0x1FF; int xend = (CropEnd >> 1) & 0x1FF;
@ -206,7 +202,7 @@ void DSi_CamModule::TransferScanline(u32 line)
memcpy(dstbuf, &tmpbuf[copystart], copylen*sizeof(u32)); memcpy(dstbuf, &tmpbuf[copystart], copylen*sizeof(u32));
} }
u32 numscan = Cnt & 0x000F; numscan = Cnt & 0x000F;
if (BufferNumLines >= numscan) if (BufferNumLines >= numscan)
{ {
BufferReadPos = 0; // checkme BufferReadPos = 0; // checkme
@ -221,8 +217,21 @@ void DSi_CamModule::TransferScanline(u32 line)
BufferNumLines++; BufferNumLines++;
} }
skip_line:
if (CurCamera->TransferDone()) if (CurCamera->TransferDone())
{
// when the frame is finished, transfer any remaining data if needed
// (if the frame height isn't a multiple of the DMA interval)
if (BufferNumLines > 0)
{
BufferReadPos = 0;
BufferWritePos = 0;
BufferNumLines = 0;
DSi.CheckNDMAs(0, 0x0B);
}
return; return;
}
DSi.ScheduleEvent(Event_DSi_CamTransfer, false, delay, 0, line+1); DSi.ScheduleEvent(Event_DSi_CamTransfer, false, delay, 0, line+1);
} }