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

Add Cdm::setVideoResolution()

Browse Source 
[ Merge of http://go/wvgerrit/22744 ]

Pass resolution information into policy engine for constraint
checking.

b/33380824

Test: Reran unittests. All tests other than some oemcrypto,
request_license_test passed. Those tests failed with or without this CL.

Change-Id: I405099b1f66a47fa0c2579e2ae248dd78fa4e98a
This commit is contained in:
Rahul Frias
2017-01-09 20:58:52 -08:00
parent 3bb90b9450
commit 40159825e8
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/cdm/core/include/cdm_engine.h
View File

@@ -195,8 +195,9 @@ class CdmEngine {
virtual bool IsKeyLoaded(const KeyId& key_id); virtual bool IsKeyLoaded(const KeyId& key_id);
virtual bool FindSessionForKey(const KeyId& key_id, CdmSessionId* sessionId); virtual bool FindSessionForKey(const KeyId& key_id, CdmSessionId* sessionId);
// Used for notifying the Max-Res Engine of resolution changes // Used for notifying the Max-Res Engine of resolution changes.
virtual void NotifyResolution(const CdmSessionId& session_id, uint32_t width, // Return false if no match is found for session_id.
virtual bool NotifyResolution(const CdmSessionId& session_id, uint32_t width,
uint32_t height); uint32_t height);
// Timer expiration method. This method is not re-entrant -- there can be // Timer expiration method. This method is not re-entrant -- there can be

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

@@ -1257,12 +1257,14 @@ bool CdmEngine::FindSessionForKey(const KeyId& key_id,
return false; return false;
} }
void CdmEngine::NotifyResolution(const CdmSessionId& session_id, uint32_t width, bool CdmEngine::NotifyResolution(const CdmSessionId& session_id, uint32_t width,
uint32_t height) { uint32_t height) {
CdmSessionMap::iterator iter = sessions_.find(session_id); CdmSessionMap::iterator iter = sessions_.find(session_id);
if (iter != sessions_.end()) { if (iter != sessions_.end()) {
iter->second->NotifyResolution(width, height); iter->second->NotifyResolution(width, height);
return true;
} }
return false;
} }
bool CdmEngine::ValidateKeySystem(const CdmKeySystem& key_system) { bool CdmEngine::ValidateKeySystem(const CdmKeySystem& key_system) {