libfreerdp-codec: merge with libfreerdp-rfx

2026-04-14 00:14:11 +09:00 · 2011-10-02 20:28:20 -04:00
parent 8a52695ed0
commit 3297db7062
46 changed files with 49 additions and 108 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,10 +147,9 @@ endif()
 add_subdirectory(libfreerdp-gdi)
 add_subdirectory(libfreerdp-rail)
 add_subdirectory(libfreerdp-cache)
-add_subdirectory(libfreerdp-common)
+add_subdirectory(libfreerdp-codec)
 add_subdirectory(libfreerdp-chanman)
 add_subdirectory(libfreerdp-core)
-add_subdirectory(libfreerdp-rfx)

 if(NOT WIN32)
 	add_subdirectory(channels)
--- a/client/Windows/wf_gdi.c
+++ b/client/Windows/wf_gdi.c
@@ -25,7 +25,7 @@
 #include <conio.h>

 #include <freerdp/gdi/gdi.h>
-#include <freerdp/common/color.h>
+#include <freerdp/codec/color.h>

 #include "wfreerdp.h"

--- a/client/X11/xf_gdi.c
+++ b/client/X11/xf_gdi.c
@@ -21,7 +21,7 @@
 #include <freerdp/rfx/rfx.h>
 #include <freerdp/constants.h>
 #include <freerdp/utils/memory.h>
-#include <freerdp/common/color.h>
+#include <freerdp/codec/color.h>

 #include "xf_gdi.h"

--- a/client/X11/xfreerdp.c
+++ b/client/X11/xfreerdp.c
@@ -41,7 +41,7 @@
 #include <sys/select.h>
 #include <freerdp/rfx/rfx.h>
 #include <freerdp/constants.h>
-#include <freerdp/common/color.h>
+#include <freerdp/codec/color.h>
 #include <freerdp/utils/args.h>
 #include <freerdp/utils/memory.h>
 #include <freerdp/utils/semaphore.h>
--- a/cunit/test_bitmap.c
+++ b/cunit/test_bitmap.c
@@ -20,7 +20,7 @@
 #include <freerdp/freerdp.h>
 #include <freerdp/utils/hexdump.h>
 #include <freerdp/utils/stream.h>
-#include <freerdp/common/bitmap.h>
+#include <freerdp/codec/bitmap.h>

 #include "test_bitmap.h"

--- a/cunit/test_color.c
+++ b/cunit/test_color.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/gdi/gdi.h>
-#include <freerdp/common/color.h>
+#include <freerdp/codec/color.h>
 #include "test_color.h"

 int init_color_suite(void)
--- a/include/freerdp/common/bitmap.h
+++ b/include/freerdp/common/bitmap.h
--- a/include/freerdp/common/color.h
+++ b/include/freerdp/common/color.h
--- a/include/freerdp/codec/rfx.h
+++ b/include/freerdp/codec/rfx.h
--- a/include/freerdp/gdi/gdi.h
+++ b/include/freerdp/gdi/gdi.h
@@ -24,7 +24,7 @@
 #include <freerdp/freerdp.h>
 #include <freerdp/cache/cache.h>
 #include <freerdp/utils/debug.h>
-#include <freerdp/common/color.h>
+#include <freerdp/codec/color.h>

 /* For more information, see [MS-RDPEGDI] */

--- a/include/freerdp/rail/rail.h
+++ b/include/freerdp/rail/rail.h
@@ -25,7 +25,7 @@
 #include <freerdp/types.h>
 #include <freerdp/update.h>
 #include <freerdp/utils/stream.h>
-#include <freerdp/common/color.h>
+#include <freerdp/codec/color.h>

 typedef struct rdp_rail rdpRail;

--- a/libfreerdp-codec/CMakeLists.txt
+++ b/libfreerdp-codec/CMakeLists.txt
@@ -1,5 +1,5 @@
 # FreeRDP: A Remote Desktop Protocol Client
-# libfreerdp-core cmake build script
+# libfreerdp-codec cmake build script
 #
 # Copyright 2011 O.S. Systems Software Ltda.
 # Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
@@ -17,7 +17,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-set(LIBFREERDP_RFX_SRCS
+set(FREERDP_CODEC_SRCS
+	bitmap.c
+	color.c
 	rfx_bitstream.h
 	rfx_constants.h
 	rfx_decode.c
@@ -35,19 +37,20 @@ set(LIBFREERDP_RFX_SRCS
 	rfx_rlgr.c
 	rfx_rlgr.h
 	rfx_types.h
-	librfx.c
+	rfx.c
 )

-add_library(freerdp-rfx ${LIBFREERDP_RFX_SRCS})
-
-set_target_properties(freerdp-rfx PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
-
-target_link_libraries(freerdp-rfx freerdp-utils)
-
 if(WITH_SSE2)
-	include_directories(sse2)
-	add_subdirectory(sse2)
-	target_link_libraries(freerdp-rfx freerdp-rfx-sse2)
+	set(FREERDP_CODEC_SRCS ${FREERDP_CODEC_SRCS}
+	rfx_sse2.c
+	rfx_sse2.h
+)
 endif()

-install(TARGETS freerdp-rfx DESTINATION ${CMAKE_INSTALL_LIBDIR})
+add_library(freerdp-codec ${FREERDP_CODEC_SRCS})
+
+set_target_properties(freerdp-codec PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
+target_link_libraries(freerdp-codec freerdp-utils)
+
+install(TARGETS freerdp-codec DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
--- a/libfreerdp-common/bitmap.c
+++ b/libfreerdp-common/bitmap.c
@@ -20,7 +20,7 @@
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/memory.h>

-#include <freerdp/common/bitmap.h>
+#include <freerdp/codec/bitmap.h>

 /*
   RLE Compressed Bitmap Stream (RLE_BITMAP_STREAM)
@@ -202,7 +202,7 @@ static uint32 ExtractRunLength(uint32 code, uint8* pbOrderHdr, uint32* advance)
 #define WRITEFIRSTLINEFGBGIMAGE WriteFirstLineFgBgImage8to8
 #define RLEDECOMPRESS RleDecompress8to8
 #define RLEEXTRA
-#include "bitmap_inc.c"
+#include "include/bitmap.c"

 #undef DESTWRITEPIXEL
 #undef DESTREADPIXEL
@@ -222,7 +222,7 @@ static uint32 ExtractRunLength(uint32 code, uint8* pbOrderHdr, uint32* advance)
 #define WRITEFIRSTLINEFGBGIMAGE WriteFirstLineFgBgImage16to16
 #define RLEDECOMPRESS RleDecompress16to16
 #define RLEEXTRA
-#include "bitmap_inc.c"
+#include "include/bitmap.c"

 #undef DESTWRITEPIXEL
 #undef DESTREADPIXEL
@@ -245,7 +245,7 @@ static uint32 ExtractRunLength(uint32 code, uint8* pbOrderHdr, uint32* advance)
 #define WRITEFIRSTLINEFGBGIMAGE WriteFirstLineFgBgImage24to24
 #define RLEDECOMPRESS RleDecompress24to24
 #define RLEEXTRA
-#include "bitmap_inc.c"
+#include "include/bitmap.c"

 #define IN_UINT8_MV(_p) (*((_p)++))

--- a/libfreerdp-common/color.c
+++ b/libfreerdp-common/color.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <freerdp/freerdp.h>
-#include <freerdp/common/color.h>
+#include <freerdp/codec/color.h>

 int freerdp_get_pixel(uint8 * data, int x, int y, int width, int height, int bpp)
 {
--- a/libfreerdp-codec/include/bitmap.c
+++ b/libfreerdp-codec/include/bitmap.c
--- a/libfreerdp-rfx/librfx.c
+++ b/libfreerdp-rfx/librfx.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
-#include <freerdp/rfx/rfx.h>
+#include <freerdp/codec/rfx.h>
 #include <freerdp/utils/memory.h>

 #include "rfx_constants.h"
--- a/libfreerdp-codec/rfx_bitstream.h
+++ b/libfreerdp-codec/rfx_bitstream.h
@@ -20,7 +20,7 @@
 #ifndef __RFX_BITSTREAM_H
 #define __RFX_BITSTREAM_H

-#include <freerdp/rfx/rfx.h>
+#include <freerdp/codec/rfx.h>

 struct _RFX_BITSTREAM
 {
--- a/libfreerdp-codec/rfx_constants.h
+++ b/libfreerdp-codec/rfx_constants.h
@@ -57,3 +57,4 @@
 #define SCALAR_QUANTIZATION	0x1

 #endif /* __RFX_CONSTANTS_H */
+
--- a/libfreerdp-codec/rfx_decode.c
+++ b/libfreerdp-codec/rfx_decode.c
@@ -26,7 +26,6 @@
 #include "rfx_differential.h"
 #include "rfx_quantization.h"
 #include "rfx_dwt.h"
-#include "rfx_types.h"

 #include "rfx_decode.h"

--- a/libfreerdp-codec/rfx_decode.h
+++ b/libfreerdp-codec/rfx_decode.h
@@ -20,7 +20,7 @@
 #ifndef __RFX_DECODE_H
 #define __RFX_DECODE_H

-#include <freerdp/rfx/rfx.h>
+#include <freerdp/codec/rfx.h>

 void rfx_decode_ycbcr_to_rgb(sint16* y_r_buf, sint16* cb_g_buf, sint16* cr_b_buf);

@@ -30,3 +30,4 @@ void rfx_decode_rgb(RFX_CONTEXT* context, STREAM* data_in,
 	int cr_size, const uint32 * cr_quants, uint8* rgb_buffer);

 #endif /* __RFX_DECODE_H */
+
--- a/libfreerdp-codec/rfx_differential.c
+++ b/libfreerdp-codec/rfx_differential.c
--- a/libfreerdp-codec/rfx_differential.h
+++ b/libfreerdp-codec/rfx_differential.h
@@ -20,7 +20,7 @@
 #ifndef __RFX_DIFFERENTIAL_H
 #define __RFX_DIFFERENTIAL_H

-#include <freerdp/rfx/rfx.h>
+#include <freerdp/codec/rfx.h>

 void rfx_differential_decode(sint16* buffer, int buffer_size);
 void rfx_differential_encode(sint16* buffer, int buffer_size);
--- a/libfreerdp-codec/rfx_dwt.c
+++ b/libfreerdp-codec/rfx_dwt.c
--- a/libfreerdp-codec/rfx_dwt.h
+++ b/libfreerdp-codec/rfx_dwt.h
@@ -20,7 +20,7 @@
 #ifndef __RFX_DWT_H
 #define __RFX_DWT_H

-#include <freerdp/rfx/rfx.h>
+#include <freerdp/codec/rfx.h>

 void rfx_dwt_2d_decode(sint16* buffer, sint16* dwt_buffer);
 void rfx_dwt_2d_encode(sint16* buffer, sint16* dwt_buffer);
--- a/libfreerdp-codec/rfx_encode.c
+++ b/libfreerdp-codec/rfx_encode.c
--- a/libfreerdp-codec/rfx_encode.h
+++ b/libfreerdp-codec/rfx_encode.h
@@ -20,7 +20,7 @@
 #ifndef __RFX_ENCODE_H
 #define __RFX_ENCODE_H

-#include <freerdp/rfx/rfx.h>
+#include <freerdp/codec/rfx.h>

 void rfx_encode_rgb_to_ycbcr(sint16* y_r_buf, sint16* cb_g_buf, sint16* cr_b_buf);

--- a/libfreerdp-codec/rfx_pool.c
+++ b/libfreerdp-codec/rfx_pool.c
--- a/libfreerdp-codec/rfx_pool.h
+++ b/libfreerdp-codec/rfx_pool.h
@@ -20,7 +20,7 @@
 #ifndef __RFX_POOL_H
 #define __RFX_POOL_H

-#include <freerdp/rfx/rfx.h>
+#include <freerdp/codec/rfx.h>

 struct _RFX_POOL
 {
--- a/libfreerdp-codec/rfx_quantization.c
+++ b/libfreerdp-codec/rfx_quantization.c
--- a/libfreerdp-codec/rfx_quantization.h
+++ b/libfreerdp-codec/rfx_quantization.h
@@ -20,7 +20,7 @@
 #ifndef __RFX_QUANTIZATION_H
 #define __RFX_QUANTIZATION_H

-#include <freerdp/rfx/rfx.h>
+#include <freerdp/codec/rfx.h>

 void rfx_quantization_decode(sint16* buffer, const uint32* quantization_values);
 void rfx_quantization_encode(sint16* buffer, const uint32* quantization_values);
--- a/libfreerdp-codec/rfx_rlgr.c
+++ b/libfreerdp-codec/rfx_rlgr.c
--- a/libfreerdp-codec/rfx_rlgr.h
+++ b/libfreerdp-codec/rfx_rlgr.h
@@ -20,7 +20,7 @@
 #ifndef __RFX_RLGR_H
 #define __RFX_RLGR_H

-#include <freerdp/rfx/rfx.h>
+#include <freerdp/codec/rfx.h>

 int rfx_rlgr_decode(RLGR_MODE mode, const uint8* data, int data_size, sint16* buffer, int buffer_size);
 int rfx_rlgr_encode(RLGR_MODE mode, const sint16* data, int data_size, uint8* buffer, int buffer_size);
--- a/libfreerdp-rfx/sse2/rfx_sse2.c
+++ b/libfreerdp-rfx/sse2/rfx_sse2.c
--- a/libfreerdp-rfx/sse2/rfx_sse2.h
+++ b/libfreerdp-rfx/sse2/rfx_sse2.h
--- a/libfreerdp-codec/rfx_types.h
+++ b/libfreerdp-codec/rfx_types.h
--- a/libfreerdp-common/CMakeLists.txt
+++ b/libfreerdp-common/CMakeLists.txt
@@ -1,30 +0,0 @@
-# FreeRDP: A Remote Desktop Protocol Client
-# libfreerdp-common cmake build script
-#
-# Copyright 2011 O.S. Systems Software Ltda.
-# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
-# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set(FREERDP_COMMON_SRCS
-	bitmap.c
-	color.c)
-
-add_library(freerdp-common ${FREERDP_COMMON_SRCS})
-
-set_target_properties(freerdp-common PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
-target_link_libraries(freerdp-common freerdp-utils)
-
-install(TARGETS freerdp-common DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
--- a/libfreerdp-core/orders.c
+++ b/libfreerdp-core/orders.c
@@ -19,7 +19,7 @@

 #include "window.h"
 #include <freerdp/api.h>
-#include <freerdp/common/bitmap.h>
+#include <freerdp/codec/bitmap.h>

 #include "orders.h"

--- a/libfreerdp-core/update.c
+++ b/libfreerdp-core/update.c
@@ -19,7 +19,7 @@

 #include "update.h"
 #include "surface.h"
-#include <freerdp/common/bitmap.h>
+#include <freerdp/codec/bitmap.h>

 uint8 UPDATE_TYPE_STRINGS[][32] =
 {
--- a/libfreerdp-gdi/16bpp.c
+++ b/libfreerdp-gdi/16bpp.c
@@ -23,7 +23,7 @@
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/gdi/gdi.h>
-#include <freerdp/common/color.h>
+#include <freerdp/codec/color.h>

 #include <freerdp/gdi/pen.h>
 #include <freerdp/gdi/bitmap.h>
--- a/libfreerdp-gdi/32bpp.c
+++ b/libfreerdp-gdi/32bpp.c
@@ -23,7 +23,7 @@
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/gdi/gdi.h>
-#include <freerdp/common/color.h>
+#include <freerdp/codec/color.h>

 #include <freerdp/gdi/pen.h>
 #include <freerdp/gdi/bitmap.h>
--- a/libfreerdp-gdi/8bpp.c
+++ b/libfreerdp-gdi/8bpp.c
@@ -23,7 +23,7 @@
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/gdi/gdi.h>
-#include <freerdp/common/color.h>
+#include <freerdp/codec/color.h>

 #include <freerdp/gdi/pen.h>
 #include <freerdp/gdi/bitmap.h>
--- a/libfreerdp-gdi/bitmap.c
+++ b/libfreerdp-gdi/bitmap.c
@@ -23,7 +23,7 @@
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/gdi/gdi.h>
-#include <freerdp/common/color.h>
+#include <freerdp/codec/color.h>

 #include <freerdp/gdi/32bpp.h>
 #include <freerdp/gdi/16bpp.h>
--- a/libfreerdp-gdi/gdi.c
+++ b/libfreerdp-gdi/gdi.c
@@ -24,7 +24,7 @@
 #include <freerdp/freerdp.h>
 #include <freerdp/constants.h>
 #include <freerdp/utils/bitmap.h>
-#include <freerdp/common/color.h>
+#include <freerdp/codec/color.h>
 #include <freerdp/rfx/rfx.h>

 #include <freerdp/gdi/dc.h>
--- a/libfreerdp-rfx/sse2/CMakeLists.txt
+++ b/libfreerdp-rfx/sse2/CMakeLists.txt
@@ -1,32 +0,0 @@
-# FreeRDP: A Remote Desktop Protocol Client
-# libfreerdp-core cmake build script
-#
-# Copyright 2011 O.S. Systems Software Ltda.
-# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
-# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set(LIBFREERDP_RFX_SSE2_SRCS
-	rfx_sse2.c
-	rfx_sse2.h
-)
-
-include_directories(..)
-
-add_library(freerdp-rfx-sse2 ${LIBFREERDP_RFX_SSE2_SRCS})
-
-if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-	set_target_properties(freerdp-rfx-sse2 PROPERTIES COMPILE_FLAGS "-fPIC")
-endif()
-install(TARGETS freerdp-rfx-sse2 DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/server/X11/xf_peer.c
+++ b/server/X11/xf_peer.c
@@ -24,7 +24,7 @@
 #include <freerdp/utils/sleep.h>
 #include <freerdp/utils/memory.h>
 #include <freerdp/utils/thread.h>
-#include <freerdp/common/color.h>
+#include <freerdp/codec/color.h>

 extern char* xf_pcap_file;

--- a/server/X11/xfreerdp.h
+++ b/server/X11/xfreerdp.h
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <freerdp/common/color.h>
+#include <freerdp/codec/color.h>

 struct xf_info
 {