Microsoft Playready support for Amazon Prime RDK app by skywojciechowskim · Pull Request #449 · rdkcentral/rialto

skywojciechowskim · 2026-02-19T12:33:42Z

Summary: Microsoft Playready support for Amazon Prime RDK app
Type: Feature
Test Plan: UT/CT, Fullstack
Jira: NO-JIRA

github-actions · 2026-02-19T12:33:54Z

Pull request must be merged with a description containing the required fields,

Summary:
Type: Feature/Fix/Cleanup
Test Plan:
Jira:

If there is no jira releated to this change, please put 'Jira: NO-JIRA'.

Description can be changed by editing the top comment on your pull request and making a new commit.

github-actions · 2026-02-19T12:34:25Z

tests/componenttests/server/tests/mediaKeys/MediaKeysTest.cpp:46:38: warning: The class 'MediaKeysTest' defines member variable with name 'm_kInitData' also defined in its parent class 'MediaKeysTestMethods'. [duplInheritedMember]
const std::vector m_kInitData{1, 2, 7};
^
tests/componenttests/server/tests/mediaKeys/MediaKeysTestMethods.h:68:38: note: Parent variable 'MediaKeysTestMethods::m_kInitData'
const std::vector m_kInitData{1, 2, 7};
^
tests/componenttests/server/tests/mediaKeys/MediaKeysTest.cpp:46:38: note: Derived variable 'MediaKeysTest::m_kInitData'
const std::vector m_kInitData{1, 2, 7};
^
tests/componenttests/server/tests/mediaKeys/SessionReadyForDecryptionTest.cpp:61:38: warning: The class 'SessionReadyForDecryptionTest' defines member variable with name 'm_kInitData' also defined in its parent class 'MediaKeysTestMethods'. [duplInheritedMember]
const std::vector m_kInitData{1, 2, 7};
^
tests/componenttests/server/tests/mediaKeys/MediaKeysTestMethods.h:68:38: note: Parent variable 'MediaKeysTestMethods::m_kInitData'
const std::vector m_kInitData{1, 2, 7};
^
tests/componenttests/server/tests/mediaKeys/SessionReadyForDecryptionTest.cpp:61:38: note: Derived variable 'SessionReadyForDecryptionTest::m_kInitData'
const std::vector m_kInitData{1, 2, 7};
^
tests/componenttests/server/tests/mediaKeys/SessionReadyForDecryptionTest.cpp:62:32: warning: The class 'SessionReadyForDecryptionTest' defines member variable with name 'm_kLicenseRequestMessage' also defined in its parent class 'MediaKeysTestMethods'. [duplInheritedMember]
const std::vector<uint8_t> m_kLicenseRequestMessage{'d', 'z', 'f'};
^
tests/componenttests/server/tests/mediaKeys/MediaKeysTestMethods.h:69:32: note: Parent variable 'MediaKeysTestMethods::m_kLicenseRequestMessage'
const std::vector<uint8_t> m_kLicenseRequestMessage{'d', 'z', 'f'};
^
tests/componenttests/server/tests/mediaKeys/SessionReadyForDecryptionTest.cpp:62:32: note: Derived variable 'SessionReadyForDecryptionTest::m_kLicenseRequestMessage'
const std::vector<uint8_t> m_kLicenseRequestMessage{'d', 'z', 'f'};
^
nofile:0:0: information: Active checkers: 161/592 (use --checkers-report= to see details) [checkersReport]

rdkcmf-jenkins · 2026-02-19T12:34:57Z

b'## Blackduck scan failure details

Summary: 0 violations, 0 files pending approval, 1 file pending identification.

Protex Server Path: /home/blackduck/github/rialto/449/rdkcentral/rialto
Commit: c624c6e

Report detail: gist'

Copilot

Pull request overview

This pull request refactors the DRM key session management to generalize Microsoft Playready support beyond Netflix, enabling support for Amazon Prime and other applications using Playready. The key architectural change is replacing Netflix-specific Playready detection with a generic "extended interface" concept that dynamically detects when Playready-specific APIs are used.

Changes:

Removed the isLDL parameter from createKeySession() API
Added ldlState parameter to generateRequest() API (with default value for backward compatibility)
Replaced isNetflixPlayreadyKeySystem() method with isExtendedInterfaceUsed() to generalize Playready detection
Introduced dynamic detection of extended interface usage based on which APIs are called (setDrmHeader, selectKeyId, generateRequest with ldlState)
Added support for queueing DRM headers before session construction

Reviewed changes

Copilot reviewed 58 out of 58 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
media/public/include/MediaCommon.h	Added LimitedDurationLicense enum
media/public/include/IMediaKeys.h	Updated API signatures for createKeySession and generateRequest
media/server/main/include/MediaKeySession.h	Added extended interface tracking and queued DRM header support
media/server/main/source/MediaKeySession.cpp	Implemented dynamic extended interface detection and queued header logic
media/server/service/source/CdmService.cpp	Updated to track extended interface usage per session
media/client/main/source/MediaKeys.cpp	Updated client API to match new signatures
proto/mediakeysmodule.proto	Added LimitedDurationLicense enum to GenerateRequestRequest
tests/unittests/media/server/main/mediaKeys/IsNetflixPlayreadyKeySystemTest.cpp	Removed Netflix-specific tests
tests/componenttests/server/tests/mediaKeys/*	Updated tests for new Playready workflow

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-19T12:39:27Z

media/server/main/source/MediaKeySession.cpp

+    else
+    {
+        // Set the request flag for the onLicenseRequest callback
+        m_licenseRequested = true;
+    }


Logic issue: When ldlState is NOT_SPECIFIED and the session is already constructed, m_licenseRequested is set to true (line 121) but no license request is actually generated. The flag should only be set to true when a license request will actually be generated. Consider moving line 121 to be set only when !m_isSessionConstructed or when the extended interface will actually trigger a license request.

Copilot · 2026-02-19T12:39:27Z

media/server/main/source/MediaKeySession.cpp

+    if (m_extendedInterfaceInUse)
+    {
+        // Ocdm-playready does not notify onProcessChallenge when complete.
+        // Fetch the challenge manually.
+        getChallenge(ldlState);
    }


Logic issue: When session construction fails (line 132-136), m_licenseRequested is set to false, but if m_extendedInterfaceInUse is true, the code will still call getChallenge() at line 158. The check at line 154 should also verify that the session was successfully constructed before calling getChallenge(), or return early if status is not OK.

Copilot · 2026-02-19T12:39:28Z

media/server/service/source/CdmService.cpp

+    if (LimitedDurationLicense::NOT_SPECIFIED != ldlState)
+    {
+        m_sessionInfo[keySessionId].isExtendedInterfaceUsed = true;
+    }
+    return mediaKeysIter->second->generateRequest(keySessionId, initDataType, initData, ldlState);


Logic issue: At line 167, m_sessionInfo[keySessionId].isExtendedInterfaceUsed is accessed without checking if keySessionId exists in m_sessionInfo. If generateRequest is called with an invalid or not-yet-created keySessionId, this will create a new entry with default values in the map. The code should verify that the keySessionId exists in m_sessionInfo before updating it, or this should be done after the generateRequest call succeeds.

Suggested change

if (LimitedDurationLicense::NOT_SPECIFIED != ldlState)

{

m_sessionInfo[keySessionId].isExtendedInterfaceUsed = true;

}

return mediaKeysIter->second->generateRequest(keySessionId, initDataType, initData, ldlState);

MediaKeyErrorStatus status = mediaKeysIter->second->generateRequest(keySessionId, initDataType, initData, ldlState);

if (MediaKeyErrorStatus::OK == status && LimitedDurationLicense::NOT_SPECIFIED != ldlState)

{

auto sessionInfoIter = m_sessionInfo.find(keySessionId);

if (sessionInfoIter != m_sessionInfo.end())

{

sessionInfoIter->second.isExtendedInterfaceUsed = true;

}

else

{

RIALTO_SERVER_LOG_ERROR("Session info for key session: %d does not exist", keySessionId);

}

}

return status;

Copilot · 2026-02-19T12:39:28Z

proto/mediakeysmodule.proto

+  enum LimitedDurationLicense {
+    NOT_SPECIFIED = 0; ///< The license duration is not specified
+    ENABLED = 1;       ///< The license has a limited duration
+    DISABLED = 2;      ///< The license does not have a limited duration
+  };
+
  optional int32 media_keys_handle = 1 [default = -1];
  optional int32 key_session_id = 2 [default = -1];
  optional InitDataType init_data_type = 3;
  repeated uint32 init_data = 4;
-
+  optional LimitedDurationLicense ldl_state = 5 [default = NOT_SPECIFIED];


Documentation is incomplete: The function documentation at lines 189-207 does not mention the new ldl_state parameter that was added to the request. The documentation should be updated to include this parameter and its purpose.

Copilot · 2026-02-19T12:39:28Z

media/server/service/source/CdmService.cpp

-bool CdmService::isNetflixPlayreadyKeySystem(int32_t keySessionId)
+bool CdmService::isExtendedInterfaceUsed(int32_t keySessionId)
 {
    RIALTO_SERVER_LOG_DEBUG("CdmService requested to check if key system is Netflix Playready, key session id: %d",


Log message is outdated: The log message still says "check if key system is Netflix Playready" but the function has been renamed to isExtendedInterfaceUsed and its purpose has been generalized. The log message should be updated to reflect the new purpose, e.g., "CdmService requested to check if extended interface is used, key session id: %d".

Suggested change

RIALTO_SERVER_LOG_DEBUG("CdmService requested to check if key system is Netflix Playready, key session id: %d",

RIALTO_SERVER_LOG_DEBUG("CdmService requested to check if extended interface is used, key session id: %d",

Copilot · 2026-02-19T12:39:29Z

media/server/main/source/MediaKeysServerInternal.cpp


    MediaKeyErrorStatus status;
-    auto task = [&]() { status = createKeySessionInternal(sessionType, client, isLDL, keySessionId); };
+    auto task = [&]() { status = createKeySessionInternal(sessionType, client, false, keySessionId); };


Maintainability issue: The lambda at line 219 passes a hardcoded false value for the isLDL parameter to createKeySessionInternal. Since this parameter is no longer used in the implementation (it's not passed forward to createMediaKeySession), consider refactoring createKeySessionInternal to remove this unused parameter in a follow-up change for cleaner code.

Copilot · 2026-02-19T12:39:29Z

media/client/ipc/source/MediaKeysIpc.cpp

+        protoLimitedDurationLicense = GenerateRequestRequest_LimitedDurationLicense_DISABLED;
+        break;
+    default:
+        RIALTO_CLIENT_LOG_WARN("Recieved unknown limited duration license state");


Spelling error: "Recieved" should be "Received". The correct spelling has the 'e' before the 'i'.

Copilot · 2026-02-19T12:39:29Z

media/public/include/MediaCommon.h

 };
+
+/**
+ * @brief Struct containing current playback information.


Documentation error: The comment says "Struct containing current playback information" but this is an enum, not a struct. The documentation should say "Enum for Limited Duration License state" or similar.

Suggested change

* @brief Struct containing current playback information.

* @brief Enum for Limited Duration License state.

github-actions · 2026-02-19T12:44:23Z

Coverage statistics of your commit:
WARNING: Lines coverage decreased from: 85.2% to 85.1%
Functions coverage stays unchanged and is: 92.5%

rdkcmf-jenkins · 2026-02-19T14:04:35Z

b'## Blackduck scan failure details

Summary: 0 violations, 0 files pending approval, 1 file pending identification.

Protex Server Path: /home/blackduck/github/rialto/449/rdkcentral/rialto
Commit: 4511c03

Report detail: gist'

github-actions · 2026-02-19T14:13:40Z

Coverage statistics of your commit:
WARNING: Lines coverage decreased from: 85.2% to 85.1%
Functions coverage stays unchanged and is: 92.5%

rdkcmf-jenkins · 2026-02-19T16:21:47Z

b'## WARNING: A Blackduck scan failure has been waived

A prior failure has been upvoted

Upvote reason: ok
Commit: 4511c03
'

skywojciechowskim added 15 commits December 16, 2025 14:59

drm header queuing

ad18400

is ldl removed from createMediaSession

4d0dbc7

if change

b22851f

fix 1

cdfee43

Merge branch 'master' into PrimePlayready

f7fe8df

comment removed

e6a545c

Merge branch 'master' into PrimePlayready

34affe0

fix

b39b5c8

ct fix

abe9be6

Merge branch 'master' into PrimePlayready

c4614eb

added debugs, revert this commit later

6d771f9

more debugs

c640cd2

fix

2547a17

Merge branch 'master' into PrimePlayready

856f7f1

debugs removed

c624c6e

Copilot AI review requested due to automatic review settings February 19, 2026 12:33

Copilot started reviewing on behalf of skywojciechowskim February 19, 2026 12:34 View session

Copilot AI reviewed Feb 19, 2026

View reviewed changes

some fixes

4511c03

aczs approved these changes Feb 20, 2026

View reviewed changes

-    if (LimitedDurationLicense::NOT_SPECIFIED != ldlState)
-    {
-        m_sessionInfo[keySessionId].isExtendedInterfaceUsed = true;
-    }
-    return mediaKeysIter->second->generateRequest(keySessionId, initDataType, initData, ldlState);
+    MediaKeyErrorStatus status = mediaKeysIter->second->generateRequest(keySessionId, initDataType, initData, ldlState);
+    if (MediaKeyErrorStatus::OK == status && LimitedDurationLicense::NOT_SPECIFIED != ldlState)
+    {
+        auto sessionInfoIter = m_sessionInfo.find(keySessionId);
+        if (sessionInfoIter != m_sessionInfo.end())
+        {
+            sessionInfoIter->second.isExtendedInterfaceUsed = true;
+        }
+        else
+        {
+            RIALTO_SERVER_LOG_ERROR("Session info for key session: %d does not exist", keySessionId);
+        }
+    }
+    return status;

	RIALTO_SERVER_LOG_DEBUG("CdmService requested to check if key system is Netflix Playready, key session id: %d",
	RIALTO_SERVER_LOG_DEBUG("CdmService requested to check if extended interface is used, key session id: %d",

	* @brief Struct containing current playback information.
	* @brief Enum for Limited Duration License state.

Comments

Conversation

skywojciechowskim commented Feb 19, 2026

Uh oh!

github-actions bot commented Feb 19, 2026

Uh oh!

github-actions bot commented Feb 19, 2026

Uh oh!

rdkcmf-jenkins commented Feb 19, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Feb 19, 2026

Uh oh!

rdkcmf-jenkins commented Feb 19, 2026

Uh oh!

github-actions bot commented Feb 19, 2026

Uh oh!

rdkcmf-jenkins commented Feb 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants