Move image encoding logic into a central EncodeManager class
This allows us to apply a lot more server logic
independently of which encoder is in use.
Most of this class are things moved over from the
Tight encoder.
diff --git a/common/rfb/EncodeManager.h b/common/rfb/EncodeManager.h
new file mode 100644
index 0000000..df0275c
--- /dev/null
+++ b/common/rfb/EncodeManager.h
@@ -0,0 +1,114 @@
+/* Copyright (C) 2000-2003 Constantin Kaplinsky. All Rights Reserved.
+ * Copyright (C) 2011 D. R. Commander. All Rights Reserved.
+ * Copyright 2014 Pierre Ossman for Cendio AB
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ * USA.
+ */
+#ifndef __RFB_ENCODEMANAGER_H__
+#define __RFB_ENCODEMANAGER_H__
+
+#include <vector>
+
+#include <rdr/types.h>
+#include <rfb/PixelBuffer.h>
+
+namespace rfb {
+ class SConnection;
+ class Encoder;
+ class UpdateInfo;
+ class PixelBuffer;
+ class RenderedCursor;
+ class Region;
+ class Rect;
+
+ struct RectInfo;
+
+ class EncodeManager {
+ public:
+ EncodeManager(SConnection* conn);
+ ~EncodeManager();
+
+ // Hack to let ConnParams calculate the client's preferred encoding
+ static bool supported(int encoding);
+
+ void writeUpdate(const UpdateInfo& ui, const PixelBuffer* pb,
+ const RenderedCursor* renderedCursor);
+
+ protected:
+ void prepareEncoders();
+
+ int computeNumRects(const Region& changed);
+
+ void writeCopyRects(const UpdateInfo& ui);
+ void writeSolidRects(Region *changed, const PixelBuffer* pb);
+ void writeRects(const Region& changed, const PixelBuffer* pb);
+
+ void writeSubRect(const Rect& rect, const PixelBuffer *pb);
+
+ bool checkSolidTile(const Rect& r, const rdr::U8* colourValue,
+ const PixelBuffer *pb);
+ void extendSolidAreaByBlock(const Rect& r, const rdr::U8* colourValue,
+ const PixelBuffer *pb, Rect* er);
+ void extendSolidAreaByPixel(const Rect& r, const Rect& sr,
+ const rdr::U8* colourValue,
+ const PixelBuffer *pb, Rect* er);
+
+ PixelBuffer* preparePixelBuffer(const Rect& rect,
+ const PixelBuffer *pb, bool convert);
+
+ bool analyseRect(const PixelBuffer *pb,
+ struct RectInfo *info, int maxColours);
+
+ protected:
+ // Preprocessor generated, optimised methods
+ inline bool checkSolidTile(const Rect& r, rdr::U8 colourValue,
+ const PixelBuffer *pb);
+ inline bool checkSolidTile(const Rect& r, rdr::U16 colourValue,
+ const PixelBuffer *pb);
+ inline bool checkSolidTile(const Rect& r, rdr::U32 colourValue,
+ const PixelBuffer *pb);
+
+ inline bool analyseRect(int width, int height,
+ const rdr::U8* buffer, int stride,
+ struct RectInfo *info, int maxColours);
+ inline bool analyseRect(int width, int height,
+ const rdr::U16* buffer, int stride,
+ struct RectInfo *info, int maxColours);
+ inline bool analyseRect(int width, int height,
+ const rdr::U32* buffer, int stride,
+ struct RectInfo *info, int maxColours);
+
+ protected:
+ SConnection *conn;
+
+ std::vector<Encoder*> encoders;
+ std::vector<int> activeEncoders;
+
+ class OffsetPixelBuffer : public FullFramePixelBuffer {
+ public:
+ OffsetPixelBuffer() {}
+ virtual ~OffsetPixelBuffer() {}
+
+ void update(const PixelFormat& pf, int width, int height,
+ const rdr::U8* data_, int stride);
+ };
+
+ OffsetPixelBuffer offsetPixelBuffer;
+ ManagedPixelBuffer convertedPixelBuffer;
+ };
+}
+
+#endif