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

TITANIC: Change AVISurface _framePixels from ManagedSurface to bool

Browse Source
This commit is contained in:
Paul Gilbert 2017-09-18 21:19:06 -04:00
parent 0362b70225
commit 1f1a4427f5
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ AVISurface::AVISurface(const CResourceKey &key) : _movieName(key.getString()) {
_videoSurface = nullptr;
_streamCount = 0;
_movieFrameSurface[0] = _movieFrameSurface[1] = nullptr;
_framePixels = nullptr;
_framePixels = false;
_priorFrameTime = 0;
// Reset current frame. We need to keep track of frames separately from the decoder,
@ -75,7 +75,6 @@ AVISurface::AVISurface(const CResourceKey &key) : _movieName(key.getString()) {
AVISurface::~AVISurface() {
if (_videoSurface)
_videoSurface->_flipVertically = false;
delete _framePixels;
delete _movieFrameSurface[0];
delete _movieFrameSurface[1];
delete _decoder;
@ -292,8 +291,7 @@ void AVISurface::setupDecompressor() {
}
if (!flag) {
_framePixels = new Graphics::ManagedSurface(_decoder->getWidth(), _decoder->getHeight(),
_decoder->getVideoTrack(0).getPixelFormat());
_framePixels = true;
} else if (idx == 0) {
// The original developers used a vertical flipped playback to indicate
// an incompatibility between source video and dest surface bit-depths,

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

@ -104,7 +104,7 @@ private:
CMovieRangeInfoList _movieRangeInfo;
int _streamCount;
Graphics::ManagedSurface *_movieFrameSurface[2];
Graphics::ManagedSurface *_framePixels;
bool _framePixels;
double _frameRate;
int _currentFrame, _priorFrame;
uint32 _priorFrameTime;