libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-03-03 06:06:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7639 from unknownbrackets/minor

Browse Source 
Update ffmpeg, clean up some state on reset
This commit is contained in:
Henrik Rydgård 2015-03-28 22:00:50 +01:00
commit 0edfb75bfb
6 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/Dialog/PSPGamedataInstallDialog.cpp
View File

@ -132,7 +132,7 @@ int PSPGamedataInstallDialog::Shutdown(bool force) {
if (status != SCE_UTILITY_STATUS_FINISHED && !force)
return SCE_ERROR_UTILITY_INVALID_STATUS;
return PSPDialog::Shutdown();
return PSPDialog::Shutdown(force);
}
std::string PSPGamedataInstallDialog::GetGameDataInstallFileName(SceUtilityGamedataInstallParam *param, std::string filename){

2
Core/Dialog/PSPNetconfDialog.cpp
View File

@ -114,7 +114,7 @@ int PSPNetconfDialog::Shutdown(bool force) {
if (status != SCE_UTILITY_STATUS_FINISHED && !force)
return SCE_ERROR_UTILITY_INVALID_STATUS;
return PSPDialog::Shutdown();
return PSPDialog::Shutdown(force);
}
void PSPNetconfDialog::DoState(PointerWrap &p) {

2
Core/HLE/sceDisplay.cpp
View File

@ -187,6 +187,7 @@ void __DisplayInit() {
framebuf.topaddr = 0x04000000;
framebuf.pspFramebufFormat = GE_FORMAT_8888;
framebuf.pspFramebufLinesize = 480; // ??
memset(&latchedFramebuf, 0, sizeof(latchedFramebuf));
lastFlipCycles = 0;
lastFlipsTooFrequent = 0;
wasPaused = false;
@ -200,6 +201,7 @@ void __DisplayInit() {
CoreTiming::ScheduleEvent(msToCycles(frameMs - vblankMs), enterVblankEvent, 0);
isVblank = 0;
frameStartTicks = 0;
vCount = 0;
hCountBase = 0;
curFrameTime = 0.0;

1
Core/HLE/sceKernelThread.cpp
View File

@ -240,6 +240,7 @@ public:
delete it->second;
}
calls_.clear();
types_.clear();
idGen_ = 0;
}

6
Core/HW/SasAudio.h
View File

@ -91,7 +91,9 @@ enum VoiceType {
// It compresses 28 16-bit samples into a block of 16 bytes.
class VagDecoder {
public:
VagDecoder() : data_(0), read_(0), end_(true) {}
VagDecoder() : data_(0), read_(0), end_(true) {
memset(samples, 0, sizeof(samples));
}
void Start(u32 dataPtr, u32 vagSize, bool loopEnabled);
void GetSamples(s16 *outSamples, int numSamples);
@ -202,6 +204,8 @@ struct SasVoice {
vagSize(0),
pcmAddr(0),
pcmSize(0),
pcmIndex(0),
pcmLoopPos(0),
sampleRate(44100),
sampleFrac(0),
pitch(PSP_SAS_PITCH_BASE),

2
ffmpeg

@ -1 +1 @@
Subproject commit 04d6e3ef7c25b6e9badcc63f006b251736a2d437
Subproject commit 7b0a230df520c232bf608e3b21aa1f2bea2f0098