From 27428e655ba7f7b2367c512cbc72c40e04e5e751 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 16 Jul 2023 15:30:55 -0500 Subject: [PATCH] Move ServerCodecModeSupport values into public header --- src/Limelight-internal.h | 7 ------- src/Limelight.h | 13 +++++++++++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/Limelight-internal.h b/src/Limelight-internal.h index ba4e8e3..160ff46 100644 --- a/src/Limelight-internal.h +++ b/src/Limelight-internal.h @@ -45,13 +45,6 @@ extern SS_PING VideoPingPayload; #define SS_FF_CONTROLLER_TOUCH_EVENTS 0x02 extern uint32_t SunshineFeatureFlags; -// ServerCodecModeSupport values -#define SCM_H264 0x00001 -#define SCM_HEVC 0x00100 -#define SCM_HEVC_MAIN10 0x00200 -#define SCM_AV1_MAIN8 0x10000 // Sunshine extension -#define SCM_AV1_MAIN10 0x20000 // Sunshine extension - // ENet channel ID values #define CTRL_CHANNEL_GENERIC 0x00 #define CTRL_CHANNEL_URGENT 0x01 // IDR and reference frame invalidation requests diff --git a/src/Limelight.h b/src/Limelight.h index 7eef8ff..c5820ff 100644 --- a/src/Limelight.h +++ b/src/Limelight.h @@ -487,6 +487,19 @@ typedef struct _CONNECTION_LISTENER_CALLBACKS { // Use this function to zero the connection callbacks when allocated on the stack or heap void LiInitializeConnectionCallbacks(PCONNECTION_LISTENER_CALLBACKS clCallbacks); +// ServerCodecModeSupport values +#define SCM_H264 0x00001 +#define SCM_HEVC 0x00100 +#define SCM_HEVC_MAIN10 0x00200 +#define SCM_AV1_MAIN8 0x10000 // Sunshine extension +#define SCM_AV1_MAIN10 0x20000 // Sunshine extension + +// SCM masks to identify various codec capabilities +#define SCM_MASK_H264 SCM_H264 +#define SCM_MASK_HEVC (SCM_HEVC | SCM_HEVC_MAIN10) +#define SCM_MASK_AV1 (SCM_AV1_MAIN8 | SCM_AV1_MAIN10) +#define SCM_MASK_10BIT (SCM_HEVC_MAIN10 | SCM_AV1_MAIN10) + typedef struct _SERVER_INFORMATION { // Server host name or IP address in text form const char* address;