widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix session count properties" into mnc-dev

Browse Source
This commit is contained in:
Jeff Tinker
2015-06-12 19:43:50 +00:00
committed by Android (Google) Code Review
parent e6ea4ff2d0 e1ba3ee601
commit 69df7f61e6
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libwvdrmengine/cdm/core/src/cdm_engine.cpp
View File

@@ -458,13 +458,19 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level,
size_t number_of_open_sessions; size_t number_of_open_sessions;
success = crypto_session.GetNumberOfOpenSessions(&number_of_open_sessions); success = crypto_session.GetNumberOfOpenSessions(&number_of_open_sessions);
if (success) { if (success) {
(*key_info)[QUERY_KEY_NUMBER_OF_OPEN_SESSIONS] = number_of_open_sessions; std::ostringstream open_sessions_stream;
open_sessions_stream << number_of_open_sessions;
(*key_info)[QUERY_KEY_NUMBER_OF_OPEN_SESSIONS] =
open_sessions_stream.str();
} }
size_t maximum_number_of_sessions; size_t maximum_number_of_sessions;
success = crypto_session.GetMaxNumberOfSessions(&maximum_number_of_sessions); success = crypto_session.GetMaxNumberOfSessions(&maximum_number_of_sessions);
if (success) { if (success) {
(*key_info)[QUERY_KEY_MAX_NUMBER_OF_SESSIONS] = maximum_number_of_sessions; std::ostringstream max_sessions_stream;
max_sessions_stream << maximum_number_of_sessions;
(*key_info)[QUERY_KEY_MAX_NUMBER_OF_SESSIONS] =
max_sessions_stream.str();
} }
return NO_ERROR; return NO_ERROR;

1
libwvdrmengine/test/java/src/com/widevine/test/MediaDrmAPITest.java
View File

@@ -285,6 +285,7 @@ public class MediaDrmAPITest extends Activity {
// widevine-specific properties // widevine-specific properties
displayText("security level: " + drm.getPropertyString("securityLevel")); displayText("security level: " + drm.getPropertyString("securityLevel"));
displayText("system ID: " + drm.getPropertyString("systemId")); displayText("system ID: " + drm.getPropertyString("systemId"));
displayText("max sessions: " + drm.getPropertyString("maxNumberOfSessions"));
stopDrm(drm); stopDrm(drm);
} }