Merge "Report key request type in GenerateKeyRequest"

libwvdrmengine/cdm/core/include/cdm_engine.h

@@ -57,6 +57,9 @@ class CdmEngine {
   //                 and renewal requests.
   // key_request: This must be non-null and point to a CdmKeyMessage. The buffer
   //              will have its contents replaced with the key request.
+  // key_request_type: May be null. If it is non-null, it will be filled with
+  //                   key request type, whether it is an initial request,
+  //                   renewal request or release request etc.
   // server_url: This must be non-null and point to a string. The string will
   //             have its contents replaced with the default URL (if one is
   //             known) to send this key request to.
@@ -64,11 +67,14 @@ class CdmEngine {
   //                 will have its contents replaced with the key set ID of the
   //                 session. Note that for non-offline license requests, the
   //                 key set ID is empty, so the CdmKeySetId will be cleared.
+  // TODO(kqyang): Consider refactor GenerateKeyRequest to reduce the number of
+  // parameters.
   virtual CdmResponseType GenerateKeyRequest(
       const CdmSessionId& session_id, const CdmKeySetId& key_set_id,
       const InitializationData& init_data, const CdmLicenseType license_type,
       CdmAppParameterMap& app_parameters, CdmKeyMessage* key_request,
-      std::string* server_url, CdmKeySetId* key_set_id_out);
+      CdmKeyRequestType* key_request_type, std::string* server_url,
+      CdmKeySetId* key_set_id_out);
 
   // Accept license response and extract key info.
   virtual CdmResponseType AddKey(const CdmSessionId& session_id,

libwvdrmengine/cdm/core/include/cdm_session.h

@@ -37,7 +37,8 @@ class CdmSession {
   virtual CdmResponseType GenerateKeyRequest(
       const InitializationData& init_data, const CdmLicenseType license_type,
       const CdmAppParameterMap& app_parameters, CdmKeyMessage* key_request,
-      std::string* server_url, CdmKeySetId* key_set_id);
+      CdmKeyRequestType* key_request_type, std::string* server_url,
+      CdmKeySetId* key_set_id);
 
   // AddKey() - Accept license response and extract key info.
   virtual CdmResponseType AddKey(const CdmKeyResponse& key_response,

libwvdrmengine/cdm/core/include/wv_cdm_types.h

@@ -29,6 +29,13 @@ typedef std::string CdmUsageInfoReleaseMessage;
 typedef std::string CdmProvisioningRequest;
 typedef std::string CdmProvisioningResponse;
 
+enum CdmKeyRequestType {
+  kKeyRequestTypeUnknown,
+  kKeyRequestTypeInitial,
+  kKeyRequestTypeRenewal,
+  kKeyRequestTypeRelease,
+};
+
 enum CdmResponseType {
   NO_ERROR,
   UNKNOWN_ERROR,