From 5e1f745868aaaac7fad52cbd8390d0e6320d5526 Mon Sep 17 00:00:00 2001
From: "zihao.jiang" <zihao.jiang@yahoo.com>
Date: Tue, 11 Oct 2016 23:31:12 +0800
Subject: [PATCH] Fix nsc server side after color conversion. We use new color
 format system and PIXEL_FORMAT_BGRX32 is the unified buffer color format. Add
 support for PIXEL_FORMAT_BGRX32 in nsc

---
 libfreerdp/codec/interleaved.c |  2 +-
 libfreerdp/codec/nsc_encode.c  | 16 ++++++++++++++++
 libfreerdp/codec/nsc_sse2.c    | 22 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/libfreerdp/codec/interleaved.c b/libfreerdp/codec/interleaved.c
index 6a577fe1e..1b9454fe7 100644
--- a/libfreerdp/codec/interleaved.c
+++ b/libfreerdp/codec/interleaved.c
@@ -373,7 +373,7 @@ BOOL interleaved_compress(BITMAP_INTERLEAVED_CONTEXT* interleaved,
 	}
 
 	if (bpp == 24)
-		DstFormat = PIXEL_FORMAT_XRGB32;
+		DstFormat = PIXEL_FORMAT_BGRX32;
 	else if (bpp == 16)
 		DstFormat = PIXEL_FORMAT_RGB16;
 	else if (bpp == 15)
diff --git a/libfreerdp/codec/nsc_encode.c b/libfreerdp/codec/nsc_encode.c
index d5959a7da..28b02efda 100644
--- a/libfreerdp/codec/nsc_encode.c
+++ b/libfreerdp/codec/nsc_encode.c
@@ -126,6 +126,14 @@ static void nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data,
 		{
 			switch (context->pixel_format)
 			{
+				case PIXEL_FORMAT_BGRX32:
+					b_val = *src++;
+					g_val = *src++;
+					r_val = *src++;
+					src++;
+					a_val = 0xFF;
+					break;
+
 				case PIXEL_FORMAT_BGRA32:
 					b_val = *src++;
 					g_val = *src++;
@@ -133,6 +141,14 @@ static void nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data,
 					a_val = *src++;
 					break;
 
+				case PIXEL_FORMAT_RGBX32:
+					r_val = *src++;
+					g_val = *src++;
+					b_val = *src++;
+					src++;
+					a_val = 0xFF;
+					break;
+
 				case PIXEL_FORMAT_RGBA32:
 					r_val = *src++;
 					g_val = *src++;
diff --git a/libfreerdp/codec/nsc_sse2.c b/libfreerdp/codec/nsc_sse2.c
index 2e8e37ac5..c0e0879a3 100644
--- a/libfreerdp/codec/nsc_sse2.c
+++ b/libfreerdp/codec/nsc_sse2.c
@@ -76,6 +76,17 @@ static void nsc_encode_argb_to_aycocg_sse2(NSC_CONTEXT* context,
 		{
 			switch (context->pixel_format)
 			{
+				case PIXEL_FORMAT_BGRX32:
+					b_val = _mm_set_epi16(*(src + 28), *(src + 24), *(src + 20), *(src + 16),
+					                      *(src + 12), *(src + 8), *(src + 4), *src);
+					g_val = _mm_set_epi16(*(src + 29), *(src + 25), *(src + 21), *(src + 17),
+					                      *(src + 13), *(src + 9), *(src + 5), *(src + 1));
+					r_val = _mm_set_epi16(*(src + 30), *(src + 26), *(src + 22), *(src + 18),
+					                      *(src + 14), *(src + 10), *(src + 6), *(src + 2));
+					a_val = _mm_set1_epi16(0xFF);
+					src += 32;
+					break;
+
 				case PIXEL_FORMAT_BGRA32:
 					b_val = _mm_set_epi16(*(src + 28), *(src + 24), *(src + 20), *(src + 16),
 					                      *(src + 12), *(src + 8), *(src + 4), *src);
@@ -88,6 +99,17 @@ static void nsc_encode_argb_to_aycocg_sse2(NSC_CONTEXT* context,
 					src += 32;
 					break;
 
+				case PIXEL_FORMAT_RGBX32:
+					r_val = _mm_set_epi16(*(src + 28), *(src + 24), *(src + 20), *(src + 16),
+					                      *(src + 12), *(src + 8), *(src + 4), *src);
+					g_val = _mm_set_epi16(*(src + 29), *(src + 25), *(src + 21), *(src + 17),
+					                      *(src + 13), *(src + 9), *(src + 5), *(src + 1));
+					b_val = _mm_set_epi16(*(src + 30), *(src + 26), *(src + 22), *(src + 18),
+					                      *(src + 14), *(src + 10), *(src + 6), *(src + 2));
+					a_val = _mm_set1_epi16(0xFF);
+					src += 32;
+					break;
+
 				case PIXEL_FORMAT_RGBA32:
 					r_val = _mm_set_epi16(*(src + 28), *(src + 24), *(src + 20), *(src + 16),
 					                      *(src + 12), *(src + 8), *(src + 4), *src);