GRAPHICS: Rework YUV->RGB code a bit

1 files changed, 63 insertions, 44 deletions

diff --git a/graphics/yuv_to_rgb.h b/graphics/yuv_to_rgb.h
index 73a2c69d7d..3af3fe87e4 100644
--- a/graphics/yuv_to_rgb.h
+++ b/graphics/yuv_to_rgb.h
@@ -32,57 +32,76 @@
 #define GRAPHICS_YUV_TO_RGB_H
 
 #include "common/scummsys.h"
+#include "common/singleton.h"
 #include "graphics/surface.h"
 
 namespace Graphics {
 
-/**
- * Convert a YUV444 image to an RGB surface
- *
- * @param dst     the destination surface
- * @param ySrc    the source of the y component
- * @param uSrc    the source of the u component
- * @param vSrc    the source of the v component
- * @param yWidth  the width of the y surface
- * @param yHeight the height of the y surface
- * @param yPitch  the pitch of the y surface
- * @param uvPitch the pitch of the u and v surfaces
- */
-void convertYUV444ToRGB(Graphics::Surface *dst, const byte *ySrc, const byte *uSrc, const byte *vSrc, int yWidth, int yHeight, int yPitch, int uvPitch);
+class YUVToRGBLookup;
 
-/**
- * Convert a YUV420 image to an RGB surface
- *
- * @param dst     the destination surface
- * @param ySrc    the source of the y component
- * @param uSrc    the source of the u component
- * @param vSrc    the source of the v component
- * @param yWidth  the width of the y surface (must be divisible by 2)
- * @param yHeight the height of the y surface (must be divisible by 2)
- * @param yPitch  the pitch of the y surface
- * @param uvPitch the pitch of the u and v surfaces
- */
-void convertYUV420ToRGB(Graphics::Surface *dst, const byte *ySrc, const byte *uSrc, const byte *vSrc, int yWidth, int yHeight, int yPitch, int uvPitch);
+class YUVToRGBManager : public Common::Singleton<YUVToRGBManager> {
+public:
+	/**
+	 * Convert a YUV444 image to an RGB surface
+	 *
+	 * @param dst     the destination surface
+	 * @param ySrc    the source of the y component
+	 * @param uSrc    the source of the u component
+	 * @param vSrc    the source of the v component
+	 * @param yWidth  the width of the y surface
+	 * @param yHeight the height of the y surface
+	 * @param yPitch  the pitch of the y surface
+	 * @param uvPitch the pitch of the u and v surfaces
+	 */
+	void convert444(Graphics::Surface *dst, const byte *ySrc, const byte *uSrc, const byte *vSrc, int yWidth, int yHeight, int yPitch, int uvPitch);
 
-/**
- * Convert a YUV410 image to an RGB surface
- *
- * Since the chroma has a very low resolution in 410, we perform bilinear scaling
- * on the two chroma planes to produce the image. The chroma planes must have
- * at least one extra row that can be read from in order to produce a proper
- * image (filled with 0x80). This is required in order to speed up this function.
- *
- * @param dst     the destination surface
- * @param ySrc    the source of the y component
- * @param uSrc    the source of the u component
- * @param vSrc    the source of the v component
- * @param yWidth  the width of the y surface (must be divisible by 4)
- * @param yHeight the height of the y surface (must be divisible by 4)
- * @param yPitch  the pitch of the y surface
- * @param uvPitch the pitch of the u and v surfaces
- */
-void convertYUV410ToRGB(Graphics::Surface *dst, const byte *ySrc, const byte *uSrc, const byte *vSrc, int yWidth, int yHeight, int yPitch, int uvPitch);
+	/**
+	 * Convert a YUV420 image to an RGB surface
+	 *
+	 * @param dst     the destination surface
+	 * @param ySrc    the source of the y component
+	 * @param uSrc    the source of the u component
+	 * @param vSrc    the source of the v component
+	 * @param yWidth  the width of the y surface (must be divisible by 2)
+	 * @param yHeight the height of the y surface (must be divisible by 2)
+	 * @param yPitch  the pitch of the y surface
+	 * @param uvPitch the pitch of the u and v surfaces
+	 */
+	void convert420(Graphics::Surface *dst, const byte *ySrc, const byte *uSrc, const byte *vSrc, int yWidth, int yHeight, int yPitch, int uvPitch);
+
+	/**
+	 * Convert a YUV410 image to an RGB surface	
+	 *
+	 * Since the chroma has a very low resolution in 410, we perform bilinear scaling
+	 * on the two chroma planes to produce the image. The chroma planes must have
+	 * at least one extra row that can be read from in order to produce a proper
+	 * image (filled with 0x80). This is required in order to speed up this function.
+	 *
+	 * @param dst     the destination surface
+	 * @param ySrc    the source of the y component
+	 * @param uSrc    the source of the u component
+	 * @param vSrc    the source of the v component
+	 * @param yWidth  the width of the y surface (must be divisible by 4)
+	 * @param yHeight the height of the y surface (must be divisible by 4)
+	 * @param yPitch  the pitch of the y surface
+	 * @param uvPitch the pitch of the u and v surfaces
+	 */
+	void convert410(Graphics::Surface *dst, const byte *ySrc, const byte *uSrc, const byte *vSrc, int yWidth, int yHeight, int yPitch, int uvPitch);
+
+private:
+	friend class Common::Singleton<SingletonBaseType>;
+	YUVToRGBManager();
+	~YUVToRGBManager();
+
+	const YUVToRGBLookup *getLookup(Graphics::PixelFormat format);
+
+	Graphics::PixelFormat _lastFormat;
+	YUVToRGBLookup *_lookup;
+	int16 _colorTab[4 * 256]; // 2048 bytes
+};
 
 } // End of namespace Graphics
 
+#define YUVToRGBMan (::Graphics::YUVToRGBManager::instance())
+
 #endif