Add Support for Audio MIME Types

The EME spec technically requires CDMs to treat audio/mp4 and
video/mp4 equivalently, as well as audio/webm and video/webm. We had
only been accepting video/mp4 and video/webm up until now.

This change also centralizes handling of init data types in the shared
CDM code instead of having it spread across multiple places in the
codebase.

(This is a merge of https://widevine-internal-review.googlesource.com/9532/
from the Widevine CDM repo.)

Bug: 13564917
Change-Id: Ib8bdfb2b003ffb00e8f0559561335abb3c5778b0

libwvdrmengine/cdm/core/include/cdm_engine.h

@@ -4,6 +4,7 @@
 #define CDM_BASE_CDM_ENGINE_H_
 
 #include "certificate_provisioning.h"
+#include "initialization_data.h"
 #include "oemcrypto_adapter.h"
 #include "timer.h"
 #include "wv_cdm_types.h"
@@ -35,14 +36,14 @@ class CdmEngine : public TimerHandler {
 
   // License related methods
   // Construct a valid license request
-  virtual CdmResponseType GenerateKeyRequest(const CdmSessionId& session_id,
-                                             const CdmKeySetId& key_set_id,
-                                             const std::string& mime_type,
-                                             const CdmInitData& init_data,
-                                             const CdmLicenseType license_type,
-                                             CdmAppParameterMap& app_parameters,
-                                             CdmKeyMessage* key_request,
-                                             std::string* server_url);
+  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);
 
   // Accept license response and extract key info.
   virtual CdmResponseType AddKey(const CdmSessionId& session_id,
@@ -110,11 +111,6 @@ class CdmEngine : public TimerHandler {
   virtual bool DetachEventListener(const CdmSessionId& session_id,
                                    WvCdmEventListener* listener);
 
-  // Parse a blob of multiple concatenated PSSH atoms to extract the first
-  // widevine pssh
-  static bool ExtractWidevinePssh(const CdmInitData& init_data,
-                                  CdmInitData* output);
-
  private:
   // private methods
   // Cancel all sessions