[codec,jpeg] use winpr image for jpeg

awakecoding · Feb 7, 2024 · 9a51830 · 9a51830
1 parent b566003
commit 9a51830
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 111 deletions.
diff --git a/include/freerdp/codec/jpeg.h b/include/freerdp/codec/jpeg.h
@@ -28,8 +28,8 @@ extern "C"
 {
 #endif
 
-	FREERDP_API BOOL jpeg_decompress(BYTE* input, BYTE* output, int width, int height, int size,
-	                                 int bpp);
+	FREERDP_API BOOL jpeg_decompress(const BYTE* input, BYTE* output, int width, int height,
+	                                 int size, int bpp);
 
 #ifdef __cplusplus
 }

diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
@@ -287,11 +287,6 @@ if(WITH_NEON)
     set(CODEC_SRCS ${CODEC_SRCS} ${CODEC_NEON_SRCS})
 endif()
 
-if(WITH_JPEG)
-    freerdp_include_directory_add(${JPEG_INCLUDE_DIR})
-    freerdp_library_add(${JPEG_LIBRARIES})
-endif()
-
 if(WITH_OPENH264)
     set(CODEC_SRCS ${CODEC_SRCS} codec/h264_openh264.c)
     freerdp_include_directory_add(${OPENH264_INCLUDE_DIR})

diff --git a/libfreerdp/codec/jpeg.c b/libfreerdp/codec/jpeg.c
@@ -20,128 +20,43 @@
 #include <freerdp/config.h>
 
 #include <winpr/stream.h>
+#include <winpr/image.h>
 
 #include <freerdp/codec/color.h>
 
 #include <freerdp/codec/jpeg.h>
 
 #ifdef WITH_JPEG
 
-#define XMD_H
-
-#include <jpeglib.h>
-
-struct mydata_decomp
-{
-	char* data;
-	int data_bytes;
-};
-
-/*****************************************************************************/
-static void my_init_source(j_decompress_ptr cinfo)
-{
-}
-
-/*****************************************************************************/
-static boolean my_fill_input_buffer(j_decompress_ptr cinfo)
-{
-	struct mydata_decomp* md;
-
-	md = (struct mydata_decomp*)(cinfo->client_data);
-	cinfo->src->next_input_byte = (unsigned char*)(md->data);
-	cinfo->src->bytes_in_buffer = md->data_bytes;
-	return 1;
-}
-
-/*****************************************************************************/
-static void my_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
-{
-}
-
-/*****************************************************************************/
-static boolean my_resync_to_restart(j_decompress_ptr cinfo, int desired)
-{
-	return 1;
-}
-
-/*****************************************************************************/
-static void my_term_source(j_decompress_ptr cinfo)
-{
-}
-
-/*****************************************************************************/
-static int do_decompress(char* comp_data, int comp_data_bytes, int* width, int* height, int* bpp,
-                         char* decomp_data, int* decomp_data_bytes)
+/* jpeg decompress */
+BOOL jpeg_decompress(const BYTE* input, BYTE* output, int width, int height, int size, int bpp)
 {
-	struct jpeg_decompress_struct cinfo = { 0 };
-	struct jpeg_error_mgr jerr;
-	struct jpeg_source_mgr src_mgr = { 0 };
-	struct mydata_decomp md = { 0 };
-	JSAMPROW row_pointer[1] = { 0 };
-
-	cinfo.err = jpeg_std_error(&jerr);
-	jpeg_create_decompress(&cinfo);
-
-	cinfo.src = &src_mgr;
-	src_mgr.init_source = my_init_source;
-	src_mgr.fill_input_buffer = my_fill_input_buffer;
-	src_mgr.skip_input_data = my_skip_input_data;
-	src_mgr.resync_to_restart = my_resync_to_restart;
-	src_mgr.term_source = my_term_source;
-
-	md.data = comp_data;
-	md.data_bytes = comp_data_bytes;
-	cinfo.client_data = &md;
+	BOOL rc = FALSE;
 
-	jpeg_read_header(&cinfo, 1);
+	if (bpp != 24)
+		return FALSE;
 
-	cinfo.out_color_space = JCS_RGB;
+	wImage* image = winpr_image_new();
+	if (!image)
+		goto fail;
 
-	*width = cinfo.image_width;
-	*height = cinfo.image_height;
-	*bpp = cinfo.num_components * 8;
+	if (winpr_image_read_buffer(image, input, size) <= 0)
+		goto fail;
 
-	jpeg_start_decompress(&cinfo);
+	if ((image->width != width) || (image->height != height) || (image->bitsPerPixel != bpp))
+		goto fail;
 
-	while (cinfo.output_scanline < cinfo.image_height)
-	{
-		row_pointer[0] = (JSAMPROW)decomp_data;
-		jpeg_read_scanlines(&cinfo, row_pointer, 1);
-		decomp_data += cinfo.image_width * cinfo.num_components;
-	}
-	*decomp_data_bytes = cinfo.output_width * cinfo.output_height * cinfo.num_components;
-	jpeg_finish_decompress(&cinfo);
-	jpeg_destroy_decompress(&cinfo);
-	return 0;
-}
+	memcpy(output, image->data, 1ull * image->scanline * image->height);
+	rc = TRUE;
 
-/* jpeg decompress */
-BOOL jpeg_decompress(BYTE* input, BYTE* output, int width, int height, int size, int bpp)
-{
-	int lwidth;
-	int lheight;
-	int lbpp;
-	int ldecomp_data_bytes;
-
-	if (bpp != 24)
-	{
-		return 0;
-	}
-	if (do_decompress((char*)input, size, &lwidth, &lheight, &lbpp, (char*)output,
-	                  &ldecomp_data_bytes) != 0)
-	{
-		return 0;
-	}
-	if (lwidth != width || lheight != height || lbpp != bpp)
-	{
-		return 0;
-	}
-	return 1;
+fail:
+	winpr_image_free(image, TRUE);
+	return rc;
 }
 
 #else
 
-BOOL jpeg_decompress(BYTE* input, BYTE* output, int width, int height, int size, int bpp)
+BOOL jpeg_decompress(const BYTE* input, BYTE* output, int width, int height, int size, int bpp)
 {
 	return 0;
 }