Address Cdm Extended Duration Test failures

[ Merge of http://go/wvgerrit/49980 ]

This CL
* corrects some of the test expectations
* switches test content used to test streaming with provider session tokens.
  The policy of the earlier test content had changed.
* adds some more information to log messages

Bug: 63819720
Test: WV unit, integration tests, WvCdmExtendedDuraionTest,
      GtsMediaDrmTest

Change-Id: I8fdbc9c38d6018cc6e884e1b95b2e9d26e7aa536
This commit is contained in:
Rahul Frias
2018-05-09 15:30:23 -07:00
parent aa183af75b
commit 184e0d0559
3 changed files with 32 additions and 18 deletions

View File

@@ -139,6 +139,7 @@ CdmResponseType CdmEngine::OpenSession(
return sts;
}
CdmSessionId id = new_session->session_id();
LOGI("CdmEngine::OpenSession: %s", id.c_str());
session_map_.Add(id, new_session.release());
if (session_id) *session_id = id;
@@ -1669,7 +1670,9 @@ void CdmEngine::OnTimerEvent() {
(*iter)->reset_usage_flags();
switch ((*iter)->get_usage_support_type()) {
case kUsageEntrySupport:
(*iter)->UpdateUsageEntryInformation();
if ((*iter)->has_provider_session_token()) {
(*iter)->UpdateUsageEntryInformation();
}
break;
case kUsageTableSupport:
if (!has_usage_been_updated) {