Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rtc: Cleanup and simplify date struct handling #14374

Merged
merged 1 commit into from Apr 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions Core/HLE/sceKernelMbx.cpp
Expand Up @@ -423,11 +423,10 @@ int sceKernelSendMbx(SceUID id, u32 packetAddr)
bool inserted = false;
if (m->nmb.attr & SCE_KERNEL_MBA_MSPRI)
{
NativeMbxPacket p;
for (int i = 0, n = m->nmb.numMessages; i < n; i++)
{
Memory::ReadStructUnchecked<NativeMbxPacket>(next, &p);
if (addPacket->priority < p.priority)
auto p = PSPPointer<NativeMbxPacket>::Create(next);
if (addPacket->priority < p->priority)
{
if (i == 0)
m->AddFirstMessage(prev, packetAddr);
Expand All @@ -438,7 +437,7 @@ int sceKernelSendMbx(SceUID id, u32 packetAddr)
}

prev = next;
next = Memory::Read_U32(next);
next = p->next;
}
}
if (!inserted)
Expand Down
5 changes: 2 additions & 3 deletions Core/HLE/sceMpeg.cpp
Expand Up @@ -962,11 +962,10 @@ static bool decodePmpVideo(PSPPointer<SceMpegRingBuffer> ringbuffer, u32 pmpctxA
pmpframes = new H264Frames;

// joint all blocks into H264Frames
SceMpegLLI lli;
for (int i = 0; i < pmp_nBlocks; i++){
Memory::ReadStructUnchecked(pmp_videoSource, &lli);
auto lli = PSPPointer<SceMpegLLI>::Create(pmp_videoSource);
// add source block into pmpframes
pmpframes->add(Memory::GetPointer(lli.pSrc), lli.iSize);
pmpframes->add(Memory::GetPointer(lli->pSrc), lli->iSize);
// get next block
pmp_videoSource += sizeof(SceMpegLLI);
}
Expand Down