From 76ff4124513855ab11d12a43cb37f49a5bb383fa Mon Sep 17 00:00:00 2001 From: krp97 Date: Wed, 17 Jun 2020 18:15:21 +0200 Subject: [PATCH 1/2] [Keybox] Added handling of wv keybox --- MediaSystem.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MediaSystem.cpp b/MediaSystem.cpp index cfa8ec3..5ef882b 100644 --- a/MediaSystem.cpp +++ b/MediaSystem.cpp @@ -46,8 +46,10 @@ class WideVine : public IMediaKeys, public widevine::Cdm::IEventListener Config() : Core::JSON::Container() , Certificate() + , Keybox() { Add(_T("certificate"), &Certificate); + Add(_T("keybox"), &Keybox); } ~Config() { @@ -55,6 +57,7 @@ class WideVine : public IMediaKeys, public widevine::Cdm::IEventListener public: Core::JSON::String Certificate; + Core::JSON::String Keybox; }; public: @@ -117,6 +120,10 @@ class WideVine : public IMediaKeys, public widevine::Cdm::IEventListener Config config; config.FromString(configline); + if (config.Keybox.IsSet() == true) { + Core::SystemInfo::SetEnvironment("WIDEVINE_TEST_KEYBOX_PATH", config.Keybox.Value().c_str()); + } + if (config.Certificate.IsSet() == true) { Core::DataElementFile dataBuffer(config.Certificate.Value(), Core::File::USER_READ); From 058a534744f5e96c3bd21bb56bf81e9050cece3b Mon Sep 17 00:00:00 2001 From: krp97 Date: Mon, 22 Jun 2020 09:19:56 +0200 Subject: [PATCH 2/2] [Keybox] Adjusted the keybox env var --- MediaSystem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaSystem.cpp b/MediaSystem.cpp index 5ef882b..bc1dea3 100644 --- a/MediaSystem.cpp +++ b/MediaSystem.cpp @@ -121,7 +121,7 @@ class WideVine : public IMediaKeys, public widevine::Cdm::IEventListener config.FromString(configline); if (config.Keybox.IsSet() == true) { - Core::SystemInfo::SetEnvironment("WIDEVINE_TEST_KEYBOX_PATH", config.Keybox.Value().c_str()); + Core::SystemInfo::SetEnvironment("WIDEVINE_KEYBOX_PATH", config.Keybox.Value().c_str()); } if (config.Certificate.IsSet() == true) {