Skip to content

Commit

Permalink
jpeg: Fix wrong JPEC codec GUID
Browse files Browse the repository at this point in the history 
Both FreeRDP and NeutrinoRDP CODEC_GUID_JPEG define:
    430C9EED-1BAF-4CE6-869ACB8B37B66237

However, for some reason, xrdp defines it as:
    1BAF4CE6-9EED-430C-869ACB8B37B66237

JPEG codec wasn't working at all due to this for years.

References:
* https://github.com/FreeRDP/FreeRDP/blob/843680e543db0608f5d6d1973ca1ecd3d7a0b817/libfreerdp/core/capabilities.c#L101-L105
* https://github.com/neutrinolabs/NeutrinoRDP/blob/50211223318a02db05b57196d03342edb0207c32/libfreerdp-core/capabilities.c#L65-L66
  • Loading branch information
@metalefty
metalefty committed Nov 4, 2022
1 parent cc43061 commit a849618
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions common/ms-rdpbcgr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,9 +388,9 @@
#define XR_CODEC_GUID_H264 \
"\x48\x32\x36\x34\x00\x00\x10\x00\x80\x00\x00\xAA\x00\x38\x9B\x71"

/* CODEC_GUID_JPEG 1BAF4CE6-9EED-430C-869A-CB8B37B66237 */
/* CODEC_GUID_JPEG 430C9EED-1BAF-4CE6-869A-CB8B37B66237 */
#define XR_CODEC_GUID_JPEG \
"\xE6\x4C\xAF\x1B\xED\x9E\x0C\x43\x86\x9A\xCB\x8B\x37\xB6\x62\x37"
"\xED\x9E\x0C\x43\xAF\x1B\xE6\x4C\x86\x9A\xCB\x8B\x37\xB6\x62\x37"

/* CODEC_GUID_PNG 0E0C858D-28E0-45DB-ADAA-0F83E57CC560 */
#define XR_CODEC_GUID_PNG \
Expand Down

1 comment on commit a849618

@jsorg71
Copy link
Contributor

@jsorg71 jsorg71 commented on a849618 Nov 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure? To me it looks like NeutrinoRDP and xrdp are the same and FreeRDP is different. Although the comment in NeutrinoRDP is wrong.
It looks like the comment in FreeRDP is wrong too.

xrdp
/* CODEC_GUID_JPEG     1BAF4CE6-9EED-430C-869ACB8B37B66237 */
#define XR_CODEC_GUID_JPEG \
  "\xE6\x4C\xAF\x1B\xED\x9E\x0C\x43\x86\x9A\xCB\x8B\x37\xB6\x62\x37"

NeutrinoRDP
/* CODEC_GUID_JPEG 0x430C9EED1BAF4CE6869ACB8B37B66237*/
#define CODEC_GUID_JPEG "\xE6\x4C\xAF\x1B\xED\x9E\x0C\x43\x86\x9A\xCB\x8B\x37\xB6\x62\x37"

FreeRDP
/* CODEC_GUID_JPEG 0x430C9EED1BAF4CE6869ACB8B37B66237 */

static const GUID CODEC_GUID_JPEG = {
	0x430C9EED, 0x1BAF, 0x4CE6, { 0x86, 0x9A, 0xCB, 0x8B, 0x37, 0xB6, 0x62, 0x37 }
};

Please sign in to comment.