libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-01 06:14:07 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

TITANIC: Further AVISurface fixes for reverse movie playback

Browse Source
This commit is contained in:
Paul Gilbert 2016-12-07 19:09:14 -05:00
parent 7e1dc617c4
commit 203a239ee3
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
engines/titanic/support/avi_surface.cpp
View File

@ -132,18 +132,21 @@ bool AVISurface::startAtFrame(int frameNumber) {
if (frameNumber == -1)
// Default to starting frame of first movie range
frameNumber = _movieRangeInfo.front()->_startFrame;
if (_isReversed && frameNumber == _decoder->getFrameCount())
if (_isReversed && frameNumber == (int)_decoder->getFrameCount())
--frameNumber;
// Get the initial frame
seekToFrame(frameNumber);
renderFrame();
// Start the playback
_decoder->start();
// Seek to the starting frame
seekToFrame(frameNumber);
// If we're in reverse playback, set the decoder to play in reverse
if (_isReversed)
_decoder->setRate(-1.0);
renderFrame();
return true;
}
@ -155,12 +158,9 @@ void AVISurface::seekToFrame(uint frameNumber) {
_decoder->seekToFrame(frameNumber);
_currentFrame = (int)frameNumber;
}
renderFrame();
}
void AVISurface::setReversed(bool isReversed) {
_decoder->setReverse(isReversed);
_isReversed = isReversed;
}
@ -196,8 +196,8 @@ bool AVISurface::handleEvents(CMovieEventList &events) {
if (isPlaying()) {
if (newFrame != getFrame()) {
// The frame has been changed, so move to new position
setReversed(info->_isReversed);
seekToFrame(newFrame);
renderFrame();
}
// Get any events for the given position

5
engines/titanic/support/avi_surface.h
View File

@ -178,6 +178,11 @@ public:
*/
int getFrame() const { return _currentFrame; }
/**
* Returns true if the surface is playing in reverse
*/
bool isReversed() const { return _isReversed; }
/**
* Add a movie event
*/