aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/gfesdk/bindings/cpp/highlights/highlights_types_cpp.h1
-rw-r--r--include/gfesdk/bindings/cpp/isdk_cpp_impl.h6
-rw-r--r--include/gfesdk/bindings/cpp/sdk_types_cpp.h5
-rw-r--r--include/gfesdk/config.h6
-rw-r--r--include/gfesdk/gfe3_product_version.h10
-rw-r--r--include/gfesdk/highlights/highlights_types.h27
-rw-r--r--include/gfesdk/sdk_types.h6
-rw-r--r--include/gfesdk/sdk_types_ipc.h48
8 files changed, 70 insertions, 39 deletions
diff --git a/include/gfesdk/bindings/cpp/highlights/highlights_types_cpp.h b/include/gfesdk/bindings/cpp/highlights/highlights_types_cpp.h
index 1cbc2af..b18cfc2 100644
--- a/include/gfesdk/bindings/cpp/highlights/highlights_types_cpp.h
+++ b/include/gfesdk/bindings/cpp/highlights/highlights_types_cpp.h
@@ -74,6 +74,7 @@ struct GroupView
std::string groupId;
NVGSDK_HighlightType tagsFilter;
NVGSDK_HighlightSignificance significanceFilter;
+ GroupView() : tagsFilter(NVGSDK_HighlightType(0)), significanceFilter(NVGSDK_HighlightSignificance(0)) {}
};
//! C++ binding for @ref NVGSDK_SummaryParams
diff --git a/include/gfesdk/bindings/cpp/isdk_cpp_impl.h b/include/gfesdk/bindings/cpp/isdk_cpp_impl.h
index 2cbfd7e..f5eb3a9 100644
--- a/include/gfesdk/bindings/cpp/isdk_cpp_impl.h
+++ b/include/gfesdk/bindings/cpp/isdk_cpp_impl.h
@@ -79,7 +79,11 @@ inline Core* Core::Create(CreateInputParams const& inParams, CreateResponse& out
cInputParams.notificationCallback = &CoreImpl::callbackNotificationWrapper;
core->m_notificationCallbackContext.reset(new CoreImpl::CallbackNotificationContext({ inParams.notificationCallback, inParams.notificationCallbackContext }));
cInputParams.notificationCallbackContext = core->m_notificationCallbackContext.get();
-
+ }
+ cInputParams.targetPid = inParams.targetPid;
+ if (!inParams.targetPath.empty())
+ {
+ cInputParams.targetPath = inParams.targetPath.c_str();
}
NVGSDK_CreateResponse cOutputParams = { 0 };
diff --git a/include/gfesdk/bindings/cpp/sdk_types_cpp.h b/include/gfesdk/bindings/cpp/sdk_types_cpp.h
index 557f547..fe04f0a 100644
--- a/include/gfesdk/bindings/cpp/sdk_types_cpp.h
+++ b/include/gfesdk/bindings/cpp/sdk_types_cpp.h
@@ -42,7 +42,10 @@ struct CreateInputParams
TNotificationCallback notificationCallback;
void* notificationCallbackContext;
- CreateInputParams() : pollForCallbacks(false), notificationCallback(nullptr), notificationCallbackContext(nullptr) {}
+ uint32_t targetPid; //!< Advanced usage
+ std::string targetPath; //!< Advanced usage
+
+ CreateInputParams() : pollForCallbacks(false), notificationCallback(nullptr), notificationCallbackContext(nullptr), targetPid(0) {}
};
struct RequestPermissionsParams
diff --git a/include/gfesdk/config.h b/include/gfesdk/config.h
index d8778c2..44791c8 100644
--- a/include/gfesdk/config.h
+++ b/include/gfesdk/config.h
@@ -18,8 +18,8 @@
#define NVGSDK_VERSION_MAJOR 1
#define NVGSDK_VERSION_MINOR 0
-#define NVGSDK_BUILD_NUMBER 147
-#define NVGSDK_BUILD_HASH 6ec890f0
-#define NVGSDK_BUILD_HASH_STR "6ec890f0"
+#define NVGSDK_BUILD_NUMBER 168
+#define NVGSDK_BUILD_HASH 8a267a87
+#define NVGSDK_BUILD_HASH_STR "8a267a87"
#endif // _NVGSDK_CONFIG_H_
diff --git a/include/gfesdk/gfe3_product_version.h b/include/gfesdk/gfe3_product_version.h
index 1b45593..13d9b09 100644
--- a/include/gfesdk/gfe3_product_version.h
+++ b/include/gfesdk/gfe3_product_version.h
@@ -10,10 +10,10 @@
// N - Build counter.
//
#define NVIDIA_GFE3_VERSION_MAJOR 3
-#define NVIDIA_GFE3_VERSION_MINOR 10
+#define NVIDIA_GFE3_VERSION_MINOR 13
#define NVIDIA_GFE3_VERSION_DEV_REBASE 0
#define NVIDIA_GFE3_VERSION_RNEXT_REBASE 0
-#define NVIDIA_GFE3_VERSION_BUILD 25
+#define NVIDIA_GFE3_VERSION_BUILD 41
//
// Composite version values. We don't concatenate them here automatically because
@@ -22,11 +22,11 @@
//
// Format: A,B,XY,N
-#define NVIDIA_GFE3_VERSION 3,10,0,25
+#define NVIDIA_GFE3_VERSION 3,13,0,41
// Format: A.B.XY.N
-#define NVIDIA_GFE3_VERSION_DOT 3.10.0.25
+#define NVIDIA_GFE3_VERSION_DOT 3.13.0.41
// Format: "A.B.XY.N"
-#define NVIDIA_GFE3_VERSION_STRING "3.10.0.25"
+#define NVIDIA_GFE3_VERSION_STRING "3.13.0.41"
//
// Some common strings
diff --git a/include/gfesdk/highlights/highlights_types.h b/include/gfesdk/highlights/highlights_types.h
index 5d9cbb0..3ae751c 100644
--- a/include/gfesdk/highlights/highlights_types.h
+++ b/include/gfesdk/highlights/highlights_types.h
@@ -19,33 +19,6 @@
#include <stdint.h>
#include <stdbool.h>
-/*! Possible values for highlight types */
-typedef enum
-{
- /*!
- * Signifies direct progress towards completing the game. (e.g. completing a level)
- */
- NVGSDK_HIGHLIGHT_TYPE_MILESTONE = 0x00000001,
- /*!
- * Player accomplishment of extra challenges independent of progress in completing a game.
- * (e.g. perfect score in a level, found the easter egg)
- */
- NVGSDK_HIGHLIGHT_TYPE_ACHIEVEMENT = 0x00000002,
- /*!
- * Event not significant in competion of game. (e.g. player kills a minion)
- */
- NVGSDK_HIGHLIGHT_TYPE_INCIDENT = 0x00000004,
-
- /*!
- * Change in player state, triggered by player or externally by game.
- * (e.g. equipping a weapon)
- */
- NVGSDK_HIGHLIGHT_TYPE_STATE_CHANGE = 0x00000008,
-
- //! Invalid default value
- NVGSDK_HIGHLIGHT_TYPE_MAX = 0x00000010
-} NVGSDK_HighlightType;
-
/*! Possible significance values */
typedef enum
{
diff --git a/include/gfesdk/sdk_types.h b/include/gfesdk/sdk_types.h
index 4aca52a..5c9fd44 100644
--- a/include/gfesdk/sdk_types.h
+++ b/include/gfesdk/sdk_types.h
@@ -42,7 +42,8 @@ typedef enum
NVGSDK_LOG_ERROR = 1,
NVGSDK_LOG_INFO = 2,
NVGSDK_LOG_DEBUG = 3,
- NVGSDK_LOG_VERBOSE = 4
+ NVGSDK_LOG_VERBOSE = 4,
+ NVGSDK_LOG_MAX
} NVGSDK_LogLevel;
/*! Types of unsolicited notifications */
@@ -108,6 +109,9 @@ typedef struct
* If false, callbacks will occur on a GfeSDK controlled thread, no polling necessary */
NVGSDK_NotificationCallback notificationCallback; //!< Called on unsolicited notifications
void* notificationCallbackContext; //!< Passed along unchanged with each notification
+
+ uint32_t targetPid; //!< Advanced usage
+ char const* targetPath; //!< Advanced usage
} NVGSDK_CreateInputParams;
/*! Parameters given to \ref NVGSDK_RequestPermissionsAsync */
diff --git a/include/gfesdk/sdk_types_ipc.h b/include/gfesdk/sdk_types_ipc.h
index 5b906ff..09353ad 100644
--- a/include/gfesdk/sdk_types_ipc.h
+++ b/include/gfesdk/sdk_types_ipc.h
@@ -84,7 +84,8 @@ typedef enum _NVGSDK_RetCode
NVGSDK_ERR_LIB_CALL_FAILED = -1023,
NVGSDK_ERR_IPC_FAILED = -1024,
NVGSDK_ERR_CONNECTION = -1025,
- NVGSDK_ERR_MODULE_NOT_LOADED = -1026
+ NVGSDK_ERR_MODULE_NOT_LOADED = -1026,
+ NVGSDK_ERR_LIB_CALL_TIMEOUT = -1027
} NVGSDK_RetCode;
// not using macros to avoid polluting namespace of SDK unnecessarily
@@ -101,6 +102,37 @@ inline bool NVGSDK_FAILED(NVGSDK_RetCode r)
return r < 0;
}
+/*! Possible values for highlight types */
+typedef enum
+{
+ /*!
+ * Signifies direct progress towards completing the game. (e.g. completing a level)
+ */
+ NVGSDK_HIGHLIGHT_TYPE_MILESTONE = 0x00000001,
+ /*!
+ * Player accomplishment of extra challenges independent of progress in completing a game.
+ * (e.g. perfect score in a level, found the easter egg)
+ */
+ NVGSDK_HIGHLIGHT_TYPE_ACHIEVEMENT = 0x00000002,
+ /*!
+ * Event not significant in competion of game. (e.g. player kills a minion)
+ */
+ NVGSDK_HIGHLIGHT_TYPE_INCIDENT = 0x00000004,
+ /*!
+ * Change in player state, triggered by player or externally by game.
+ * (e.g. equipping a weapon)
+ */
+ NVGSDK_HIGHLIGHT_TYPE_STATE_CHANGE = 0x00000008,
+ /*!
+ * Special highlight type that does not notify the user as it happens, to avoid giving
+ * the user a competetive advantage. e.g. A game doesn't tell the user that they recorded
+ * a kill, but wants the highlight later for the user after the round is over.
+ */
+ NVGSDK_HIGHLIGHT_TYPE_UNANNOUNCED = 0x00000010,
+ //! Invalid default value
+ NVGSDK_HIGHLIGHT_TYPE_MAX = 0x00000020
+} NVGSDK_HighlightType;
+
/*! Functionality supported by the SDK and possibly requiring user permission */
typedef enum
{
@@ -167,10 +199,24 @@ inline const char* NVGSDK_RetCodeToString(NVGSDK_RetCode const ret)
case NVGSDK_ERR_IPC_FAILED: return "NVGSDK_ERR_IPC_FAILED";
case NVGSDK_ERR_CONNECTION: return "NVGSDK_ERR_CONNECTION";
case NVGSDK_ERR_MODULE_NOT_LOADED: return "NVGSDK_ERR_MODULE_NOT_LOADED";
+ case NVGSDK_ERR_LIB_CALL_TIMEOUT: return "NVGSDK_ERR_LIB_CALL_TIMEOUT";
}
return "Unknown code";
}
+// All alphanumeric and the hyphen
+char const VALID_GROUPID_CHARS[] = "^[a-zA-Z0-9\\-_ ]+$";
+wchar_t const VALID_GROUPID_WCHARS[] = L"^[a-zA-Z0-9\\-_ ]+$";
+
+char const VALID_HIGHLIGHT_DEF_ID_CHARS[] = "^[a-zA-Z0-9\\-_ ]+$";
+wchar_t const VALID_HIGHLIGHT_DEF_ID_WCHARS[] = L"^[a-zA-Z0-9\\-_ ]+$";
+
+char const VALID_GAMENAME_CHARS[] = "^[a-zA-Z0-9\\-_ ]+$";
+wchar_t const VALID_GAMENAME_WCHARS[] = L"^[a-zA-Z0-9\\-_ ]+$";
+
+size_t const VALID_HIGHLIGHT_SIGNIFICANCE_WIDTH = 0x8FF;
+size_t const VALID_HIGHLIGHT_TAG_WIDTH = 0x1F;
+
#ifdef __cplusplus
}
#endif