added a --enable-tjpeg option for turbo jpeg

3 files changed, 92 insertions, 1 deletions

diff --git a/configure.ac b/configure.ac
index 11188d36..e8823350 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,10 @@ AC_ARG_ENABLE(jpeg, AS_HELP_STRING([--enable-jpeg],
               [Build jpeg module (default: no)]),
               [jpeg=true], [jpeg=false])
 AM_CONDITIONAL(XRDP_JPEG, [test x$jpeg = xtrue])
+AC_ARG_ENABLE(tjpeg, AS_HELP_STRING([--enable-tjpeg],
+              [Build turbo jpeg module(assumes /opt/libjpeg-turbo) (default: no)]),
+              [tjpeg=true], [tjpeg=false])
+AM_CONDITIONAL(XRDP_TJPEG, [test x$tjpeg = xtrue])
 AC_ARG_ENABLE(simplesound, AS_HELP_STRING([--enable-simplesound],
               [Build simple pulse audio interface (default: no)]),
               [simplesound=true], [simplesound=false])
diff --git a/libxrdp/Makefile.am b/libxrdp/Makefile.am
index 279113b8..6564da36 100644
--- a/libxrdp/Makefile.am
+++ b/libxrdp/Makefile.am
@@ -16,10 +16,17 @@ EXTRA_DEFINES += -DXRDP_NEUTRINORDP
 EXTRA_LIBS += $(FREERDP_LIBS)
 endif
 
+if XRDP_TJPEG
+EXTRA_DEFINES += -DXRDP_JPEG -DXRDP_TJPEG
+EXTRA_INCLUDES += -I/opt/libjpeg-turbo/include
+EXTRA_FLAGS += -L/opt/libjpeg-turbo/lib -Wl,-rpath -Wl,/opt/libjpeg-turbo/lib
+EXTRA_LIBS += -lturbojpeg
+else
 if XRDP_JPEG
 EXTRA_DEFINES += -DXRDP_JPEG
 EXTRA_LIBS += -ljpeg
 endif
+endif
 
 if GOT_PREFIX
 EXTRA_INCLUDES += -I$(prefix)/include
diff --git a/libxrdp/xrdp_jpeg_compress.c b/libxrdp/xrdp_jpeg_compress.c
index 82a816a0..e402f7d0 100644
--- a/libxrdp/xrdp_jpeg_compress.c
+++ b/libxrdp/xrdp_jpeg_compress.c
@@ -20,7 +20,87 @@
 
 #include "libxrdp.h"
 
-#if defined(XRDP_JPEG)
+#if defined(XRDP_TJPEG)
+
+/* turbo jpeg */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <turbojpeg.h>
+
+static tjhandle g_tj_han = 0; /* turbojpeg handle */
+
+/*****************************************************************************/
+int APP_CC
+xrdp_jpeg_compress(char *in_data, int width, int height,
+                   struct stream *s, int bpp, int byte_limit,
+                   int start_line, struct stream *temp_s,
+                   int e, int quality)
+{
+    int error;
+    int i;
+    int j;
+    unsigned int pixel;
+    unsigned int *src32;
+    unsigned int *dst32;
+    unsigned long cdata_bytes;
+    unsigned char *src_buf;
+    unsigned char *dst_buf;
+    char *temp_buf;
+
+    if (bpp != 24)
+    {
+        g_writeln("bpp wrong %d", bpp);
+        return height;
+    }
+    if (g_tj_han == 0)
+    {
+        g_tj_han = tjInitCompress();
+    }
+    cdata_bytes = byte_limit;
+    src_buf = (unsigned char *) in_data;
+    dst_buf = (unsigned char *) (s->p);
+    temp_buf = 0;
+    if (e == 0)
+    {
+        src_buf = (unsigned char*)in_data;
+    }
+    else
+    {
+        temp_buf = (char *) g_malloc((width + e) * height * 4, 0);
+        dst32 = (unsigned int *) temp_buf;
+        src32 = (unsigned int *) in_data;
+        for (j = 0; j < height; j++)
+        {
+            for (i = 0; i < width; i++)
+            {
+                pixel = *src32;
+                src32++;
+                *dst32 = pixel;
+                dst32++;
+            }
+            for (i = 0; i < e; i++)
+            {
+                *dst32 = pixel;
+                dst32++;
+            }
+        }
+        src_buf = (unsigned char *) temp_buf;
+    }
+    dst_buf = (unsigned char*)(s->p);
+    error = tjCompress(g_tj_han, src_buf, width + e, (width + e) * 4, height,
+                       TJPF_XBGR, dst_buf, &cdata_bytes,
+                       TJSAMP_420, quality, 0);
+    //g_writeln("error %d %d %d %d", error, width, e, height);
+    s->p += cdata_bytes;
+    g_free(temp_buf);
+    return height;
+}
+
+#elif defined(XRDP_JPEG)
+
+/* libjpeg */
 
 #include <stdio.h>
 #include <stdlib.h>