Merge "Wire Up Max-Res Plumbing" into lmp-mr1-dev

libwvdrmengine/cdm/core/include/cdm_engine.h

@@ -123,6 +123,10 @@ class CdmEngine {
   virtual bool DetachEventListener(const CdmSessionId& session_id,
                                    WvCdmEventListener* listener);
 
+  // Used for notifying the Max-Res Engine of resolution changes
+  virtual void NotifyResolution(const CdmSessionId& session_id, uint32_t width,
+                                uint32_t height);
+
   // Timer expiration method
   virtual void OnTimerEvent();
 

libwvdrmengine/cdm/core/include/cdm_session.h

@@ -80,6 +80,9 @@ class CdmSession {
   virtual bool AttachEventListener(WvCdmEventListener* listener);
   virtual bool DetachEventListener(WvCdmEventListener* listener);
 
+  // Used for notifying the Policy Engine of resolution changes
+  virtual void NotifyResolution(uint32_t width, uint32_t height);
+
   virtual void OnTimerEvent(bool update_usage);
   virtual void OnKeyReleaseEvent(const CdmKeySetId& key_set_id);
 

libwvdrmengine/cdm/core/include/policy_engine.h

@@ -56,6 +56,9 @@ class PolicyEngine {
   virtual void UpdateLicense(
       const video_widevine_server::sdk::License& license);
 
+  // Used for notifying the Policy Engine of resolution changes
+  virtual void NotifyResolution(uint32_t width, uint32_t height);
+
   virtual CdmResponseType Query(CdmQueryMap* key_info);
 
   virtual const LicenseIdentification& license_id() { return license_id_; }