diff options
| author | Matthew Hoops | 2012-09-17 12:54:08 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-09-17 19:30:46 -0400 |
| commit | 893a2b37ff651e69699879932fe70895a28951fa (patch) | |
| tree | dd1ca1e116c46849bee52a24f3c08454858b4f6e /video | |
| parent | 03d34f1f927cc3ac16f3f500688239f7b2f1fc8a (diff) | |
| download | scummvm-rg350-893a2b37ff651e69699879932fe70895a28951fa.tar.gz scummvm-rg350-893a2b37ff651e69699879932fe70895a28951fa.tar.bz2 scummvm-rg350-893a2b37ff651e69699879932fe70895a28951fa.zip | |
GRAPHICS: Rework YUV->RGB code a bit
Diffstat (limited to 'video')
| -rw-r--r-- | video/bink_decoder.cpp | 2 | ||||
| -rw-r--r-- | video/codecs/svq1.cpp | 2 | ||||
| -rw-r--r-- | video/psx_decoder.cpp | 2 | ||||
| -rw-r--r-- | video/theora_decoder.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp index 30632cdd6c..65f0f6c0af 100644 --- a/video/bink_decoder.cpp +++ b/video/bink_decoder.cpp @@ -348,7 +348,7 @@ void BinkDecoder::BinkVideoTrack::decodePacket(VideoFrame &frame) { // The width used here is the surface-width, and not the video-width // to allow for odd-sized videos. assert(_curPlanes[0] && _curPlanes[1] && _curPlanes[2]); - Graphics::convertYUV420ToRGB(&_surface, _curPlanes[0], _curPlanes[1], _curPlanes[2], + YUVToRGBMan.convert420(&_surface, _curPlanes[0], _curPlanes[1], _curPlanes[2], _surfaceWidth, _surfaceHeight, _surfaceWidth, _surfaceWidth >> 1); // And swap the planes with the reference planes diff --git a/video/codecs/svq1.cpp b/video/codecs/svq1.cpp index 14452ab15b..41bd1dc507 100644 --- a/video/codecs/svq1.cpp +++ b/video/codecs/svq1.cpp @@ -256,7 +256,7 @@ const Graphics::Surface *SVQ1Decoder::decodeImage(Common::SeekableReadStream *st _surface->h = _height; } - convertYUV410ToRGB(_surface, current[0], current[1], current[2], yWidth, yHeight, yWidth, uvWidth); + YUVToRGBMan.convert410(_surface, current[0], current[1], current[2], yWidth, yHeight, yWidth, uvWidth); // Store the current surfaces for later and free the old ones for (int i = 0; i < 3; i++) { diff --git a/video/psx_decoder.cpp b/video/psx_decoder.cpp index fa7f1e8cfe..7cdc53d511 100644 --- a/video/psx_decoder.cpp +++ b/video/psx_decoder.cpp @@ -483,7 +483,7 @@ void PSXStreamDecoder::PSXVideoTrack::decodeFrame(Common::SeekableReadStream *fr decodeMacroBlock(&bits, mbX, mbY, scale, version); // Output data onto the frame - Graphics::convertYUV420ToRGB(_surface, _yBuffer, _cbBuffer, _crBuffer, _surface->w, _surface->h, _macroBlocksW * 16, _macroBlocksW * 8); + YUVToRGBMan.convert420(_surface, _yBuffer, _cbBuffer, _crBuffer, _surface->w, _surface->h, _macroBlocksW * 16, _macroBlocksW * 8); _curFrame++; diff --git a/video/theora_decoder.cpp b/video/theora_decoder.cpp index d7260469e6..8b579321ac 100644 --- a/video/theora_decoder.cpp +++ b/video/theora_decoder.cpp @@ -328,7 +328,7 @@ void TheoraDecoder::TheoraVideoTrack::translateYUVtoRGBA(th_ycbcr_buffer &YUVBuf assert(YUVBuffer[kBufferU].height == YUVBuffer[kBufferY].height >> 1); assert(YUVBuffer[kBufferV].height == YUVBuffer[kBufferY].height >> 1); - Graphics::convertYUV420ToRGB(&_surface, YUVBuffer[kBufferY].data, YUVBuffer[kBufferU].data, YUVBuffer[kBufferV].data, YUVBuffer[kBufferY].width, YUVBuffer[kBufferY].height, YUVBuffer[kBufferY].stride, YUVBuffer[kBufferU].stride); + YUVToRGBMan.convert420(&_surface, YUVBuffer[kBufferY].data, YUVBuffer[kBufferU].data, YUVBuffer[kBufferV].data, YUVBuffer[kBufferY].width, YUVBuffer[kBufferY].height, YUVBuffer[kBufferY].stride, YUVBuffer[kBufferU].stride); } static vorbis_info *info = 0; |