diff options
author | Scott Thomas | 2009-12-24 08:33:37 +0000 |
---|---|---|
committer | Scott Thomas | 2009-12-24 08:33:37 +0000 |
commit | b2ae0e56c5f2870cdbcab20d89b9068d6be5f2f8 (patch) | |
tree | 3efb75fa5581976692aaf7ee27a8086037472f2f /engines | |
parent | b63cbe2577a6091fc832e5cdaadcc70109c664c8 (diff) | |
download | scummvm-rg350-b2ae0e56c5f2870cdbcab20d89b9068d6be5f2f8.tar.gz scummvm-rg350-b2ae0e56c5f2870cdbcab20d89b9068d6be5f2f8.tar.bz2 scummvm-rg350-b2ae0e56c5f2870cdbcab20d89b9068d6be5f2f8.zip |
Tweak Groovie2 video buffer handling
svn-id: r46523
Diffstat (limited to 'engines')
-rw-r--r-- | engines/groovie/roq.cpp | 15 | ||||
-rw-r--r-- | engines/groovie/roq.h | 5 |
2 files changed, 8 insertions, 12 deletions
diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp index 3ff852934d..5f16f9c935 100644 --- a/engines/groovie/roq.cpp +++ b/engines/groovie/roq.cpp @@ -43,7 +43,8 @@ ROQPlayer::ROQPlayer(GroovieEngine *vm) : #ifdef DITHER _dither(NULL), #endif - VideoPlayer(vm), _codingTypeCount(0) { + VideoPlayer(vm), _codingTypeCount(0), + _fg(&_vm->_graphicsMan->_foreground), _bg(&_vm->_graphicsMan->_background) { // Create the work surfaces _currBuf = new Graphics::Surface(); @@ -103,7 +104,6 @@ ROQPlayer::~ROQPlayer() { delete _currBuf; _prevBuf->free(); delete _prevBuf; - _showBuf.free(); #ifdef DITHER // Free the dithering algorithm @@ -158,10 +158,10 @@ void ROQPlayer::buildShowBuf() { _dither->newFrame(); #endif - for (int line = 0; line < _showBuf.h; line++) { - byte *out = (byte *)_showBuf.getBasePtr(0, line); + for (int line = 0; line < _bg->h; line++) { + byte *out = (byte *)_bg->getBasePtr(0, line); byte *in = (byte *)_currBuf->getBasePtr(0, line / _scaleY); - for (int x = 0; x < _showBuf.w; x++) { + for (int x = 0; x < _bg->w; x++) { if (_vm->_mode8bit) { #ifdef DITHER *out = _dither->dither(*in, *(in + 1), *(in + 2), x); @@ -214,7 +214,7 @@ bool ROQPlayer::playFrameInternal() { if (_dirty) { // Update the screen - _syst->copyRectToScreen((byte *)_showBuf.getBasePtr(0, 0), _showBuf.pitch, 0, (_syst->getHeight() - _showBuf.h) / 2, _showBuf.w, _showBuf.h); + _syst->copyRectToScreen((byte *)_bg->getBasePtr(0, 0), _bg->pitch, 0, (_syst->getHeight() - _bg->h) / 2, _bg->w, _bg->h); _syst->updateScreen(); // Clear the dirty flag @@ -333,12 +333,10 @@ bool ROQPlayer::processBlockInfo(ROQBlockHeader &blockHeader) { // Free the previous surfaces _currBuf->free(); _prevBuf->free(); - _showBuf.free(); // Allocate new buffers _currBuf->create(width, height, 3); _prevBuf->create(width, height, 3); - _showBuf.create(width * _scaleX, height * _scaleY, _vm->_pixelFormat.bytesPerPixel); // Clear the buffers with black YUV values byte *ptr1 = (byte *)_currBuf->getBasePtr(0, 0); @@ -503,7 +501,6 @@ bool ROQPlayer::processBlockStill(ROQBlockHeader &blockHeader) { *ptr++ = *u++; *ptr++ = *v++; } - memcpy(_prevBuf->getBasePtr(0, 0), _currBuf->getBasePtr(0, 0), _prevBuf->w * _prevBuf->h * 3); delete jpg; return true; diff --git a/engines/groovie/roq.h b/engines/groovie/roq.h index a238b3249a..fd5af9300c 100644 --- a/engines/groovie/roq.h +++ b/engines/groovie/roq.h @@ -84,9 +84,8 @@ private: byte _codebook4[256 * 4]; // Buffers - Graphics::Surface *_currBuf; - Graphics::Surface *_prevBuf; - Graphics::Surface _showBuf; + Graphics::Surface *_fg, *_bg, *_thirdBuf; + Graphics::Surface *_currBuf, *_prevBuf; void buildShowBuf(); byte _scaleX, _scaleY; byte _offScale; |