libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-25 13:42:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VIDEO: Force an update after a seek

Browse Source
This commit is contained in:
Matthew Hoops 2012-07-26 23:42:35 -04:00
parent 84462fa088
commit df5d6f7d08
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
video/video_decoder.cpp
View File

@ -101,6 +101,7 @@ AdvancedVideoDecoder::AdvancedVideoDecoder() {
_audioVolume = Audio::Mixer::kMaxChannelVolume;
_audioBalance = 0;
_pauseLevel = 0;
_needsUpdate = false;
// Find the best format for output
_defaultHighColorFormat = g_system->getScreenFormat();
@ -124,6 +125,7 @@ void AdvancedVideoDecoder::close() {
_audioVolume = Audio::Mixer::kMaxChannelVolume;
_audioBalance = 0;
_pauseLevel = 0;
_needsUpdate = false;
}
bool AdvancedVideoDecoder::isVideoLoaded() const {
@ -155,6 +157,8 @@ Graphics::PixelFormat AdvancedVideoDecoder::getPixelFormat() const {
}
const Graphics::Surface *AdvancedVideoDecoder::decodeNextFrame() {
_needsUpdate = false;
readNextPacket();
VideoTrack *track = findNextVideoTrack();
@ -215,7 +219,7 @@ uint32 AdvancedVideoDecoder::getTime() const {
}
uint32 AdvancedVideoDecoder::getTimeToNextFrame() const {
if (endOfVideo())
if (endOfVideo() || _needsUpdate)
return 0;
const VideoTrack *track = findNextVideoTrack();
@ -310,6 +314,7 @@ bool AdvancedVideoDecoder::seek(const Audio::Timestamp &time) {
_audioStartOffset = time;
_startTime = g_system->getMillis() - time.msecs();
_needsUpdate = true;
return true;
}
@ -337,6 +342,7 @@ void AdvancedVideoDecoder::stop() {
_audioStartOffset = 0;
_palette = 0;
_dirtyPalette = false;
_needsUpdate = false;
stopAllTracks();

2
video/video_decoder.h
View File

@ -766,7 +766,7 @@ private:
TrackList _tracks;
// Current playback status
bool _isPlaying, _needsRewind;
bool _isPlaying, _needsRewind, _needsUpdate;
Audio::Timestamp _audioStartOffset;
// Palette settings from individual tracks