From 5f8335c1e49ce108ef3481863833c98efa00411b Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 2 Jul 2020 23:09:26 +0200 Subject: sync with upstream --- .../kodi-addon-dev-kit/include/kodi/StreamCrypto.h | 44 +++++++++++++++------- 1 file changed, 30 insertions(+), 14 deletions(-) (limited to 'xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCrypto.h') diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCrypto.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCrypto.h index dcb7896..8008aa1 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCrypto.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCrypto.h @@ -8,19 +8,35 @@ #pragma once -typedef struct CRYPTO_INFO +#include +#include + +#define STREAMCRYPTO_VERSION_LEVEL 1 + +#ifdef __cplusplus +extern "C" { - enum CRYPTO_KEY_SYSTEM : uint8_t +#endif /* __cplusplus */ + + typedef struct CRYPTO_INFO { - CRYPTO_KEY_SYSTEM_NONE = 0, - CRYPTO_KEY_SYSTEM_WIDEVINE, - CRYPTO_KEY_SYSTEM_PLAYREADY, - CRYPTO_KEY_SYSTEM_COUNT - } m_CryptoKeySystem; /*!< @brief keysystem for encrypted media, KEY_SYSTEM_NONE for unencrypted media */ - - static const uint8_t FLAG_SECURE_DECODER = 1; /*!< @brief is set in flags if decoding has to be done in TEE environment */ - - uint8_t flags; - uint16_t m_CryptoSessionIdSize; /*!< @brief The size of the crypto session key id */ - const char *m_CryptoSessionId; /*!< @brief The crypto session key id */ -} CRYPTO_INFO; + enum CRYPTO_KEY_SYSTEM : uint8_t + { + CRYPTO_KEY_SYSTEM_NONE = 0, + CRYPTO_KEY_SYSTEM_WIDEVINE, + CRYPTO_KEY_SYSTEM_PLAYREADY, + CRYPTO_KEY_SYSTEM_WISEPLAY, + CRYPTO_KEY_SYSTEM_COUNT + } m_CryptoKeySystem; /*!< @brief keysystem for encrypted media, KEY_SYSTEM_NONE for unencrypted media */ + + static const uint8_t FLAG_SECURE_DECODER = + 1; /*!< @brief is set in flags if decoding has to be done in TEE environment */ + + uint8_t flags; + uint16_t m_CryptoSessionIdSize; /*!< @brief The size of the crypto session key id */ + const char* m_CryptoSessionId; /*!< @brief The crypto session key id */ + } CRYPTO_INFO; + +#ifdef __cplusplus +} /* extern "C" */ +#endif /* __cplusplus */ -- cgit v1.2.3