diff --git a/Core/HLE/scePsmf.cpp b/Core/HLE/scePsmf.cpp index 8f3583ada9..97ccfae66f 100644 --- a/Core/HLE/scePsmf.cpp +++ b/Core/HLE/scePsmf.cpp @@ -52,7 +52,6 @@ const int PSMF_PLAYER_WARMUP_FRAMES = 3; static const int VIDEO_FRAME_DURATION_TS = 3003; -int psmfMaxAheadTimestamp = 40000; int audioSamples = 2048; int audioSamplesBytes = audioSamples * 4; int videoPixelMode = GE_CMODE_32BIT_ABGR8888; @@ -140,10 +139,6 @@ struct PsmfEntry { int EPPicOffset; }; -static int getMaxAheadTimestamp(int packets) { - return std::max(40000, packets * 700); -} - // Some of our platforms don't play too nice with direct unaligned access. static u32 ReadUnalignedU32BE(const u8 *p) { return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | (p[3] << 0); @@ -258,7 +253,6 @@ public: int displayBuffer; int displayBufferSize; int playbackThreadPriority; - int psmfMaxAheadTimestamp; int totalVideoStreams; int totalAudioStreams; int playerVersion; @@ -456,7 +450,8 @@ void PsmfPlayer::DoState(PointerWrap &p) { p.Do(displayBuffer); p.Do(displayBufferSize); p.Do(playbackThreadPriority); - p.Do(psmfMaxAheadTimestamp); + int oldMaxAheadTimestamp = 0; + p.Do(oldMaxAheadTimestamp); if (s >= 4) { p.Do(totalDurationTimestamp); } else { @@ -1033,7 +1028,6 @@ static int scePsmfPlayerCreate(u32 psmfPlayer, u32 dataPtr) videoPixelMode = GE_CMODE_32BIT_ABGR8888; videoLoopStatus = PSMF_PLAYER_CONFIG_NO_LOOP; - psmfplayer->psmfMaxAheadTimestamp = getMaxAheadTimestamp(581); psmfplayer->status = PSMF_PLAYER_STATUS_INIT; return hleDelayResult(0, "player create", 20000); } diff --git a/ext/native/ui/ui.cpp b/ext/native/ui/ui.cpp index 437ec4b30b..67aa9db0aa 100644 --- a/ext/native/ui/ui.cpp +++ b/ext/native/ui/ui.cpp @@ -15,9 +15,6 @@ DrawBuffer ui_draw2d; DrawBuffer ui_draw2d_front; -// Theme. -static const Atlas *themeAtlas; - void UIBegin(Thin3DShaderSet *shaderSet) { ui_draw2d.Begin(shaderSet); ui_draw2d_front.Begin(shaderSet);