resolved conflicts for merge of 7eea20df to master

Change-Id: Ibd8b16745d36b24041856f315fbb09a6c25cf4fb

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 "wv_cdm_types.h"
 
@@ -35,8 +36,7 @@ class CdmEngine {
   // Construct a valid license request
   CdmResponseType GenerateKeyRequest(const CdmSessionId& session_id,
                                      const CdmKeySetId& key_set_id,
-                                     const std::string& mime_type,
-                                     const CdmInitData& init_data,
+                                     const InitializationData& init_data,
                                      const CdmLicenseType license_type,
                                      CdmAppParameterMap& app_parameters,
                                      CdmKeyMessage* key_request,
@@ -110,11 +110,6 @@ class CdmEngine {
   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);
-
   // Timer expiration method
   void OnTimerEvent();
 

libwvdrmengine/cdm/core/include/cdm_session.h

@@ -7,6 +7,7 @@
 
 #include "crypto_session.h"
 #include "device_files.h"
+#include "initialization_data.h"
 #include "license.h"
 #include "oemcrypto_adapter.h"
 #include "policy_engine.h"
@@ -34,10 +35,9 @@ class CdmSession {
   const CdmSessionId& session_id() { return session_id_; }
 
   bool VerifySession(const CdmKeySystem& key_system,
-                     const CdmInitData& init_data);
+                     const InitializationData& init_data);
 
-  CdmResponseType GenerateKeyRequest(const std::string& mime_type,
-                                     const CdmInitData& init_data,
+  CdmResponseType GenerateKeyRequest(const InitializationData& init_data,
                                      const CdmLicenseType license_type,
                                      const CdmAppParameterMap& app_parameters,
                                      CdmKeyMessage* key_request,

libwvdrmengine/cdm/core/include/initialization_data.h

@@ -0,0 +1,47 @@
+// Copyright 2014 Google Inc. All Rights Reserved.
+
+#ifndef CORE_INCLUDE_INITIALIZATION_DATA_H_
+#define CORE_INCLUDE_INITIALIZATION_DATA_H_
+
+#include <string>
+
+#include "wv_cdm_types.h"
+
+namespace wvcdm {
+
+class WvCdmEngineTest;
+
+class InitializationData {
+ public:
+  InitializationData(const std::string& type,
+                     const CdmInitData& data = CdmInitData());
+
+  bool is_supported() const { return is_cenc_ || is_webm_; }
+  bool is_cenc() const { return is_cenc_; }
+  bool is_webm() const { return is_webm_; }
+
+  bool IsEmpty() const { return data_.empty(); }
+
+  const std::string& type() const { return type_; }
+  const CdmInitData& data() const { return data_; }
+
+ private:
+  friend WvCdmEngineTest;
+
+  // Parse a blob of multiple concatenated PSSH atoms to extract the first
+  // Widevine PSSH.
+  // TODO(juce): Make this non-static and remove the friend above once the unit
+  //             test is rewritten to not need this.
+  static bool ExtractWidevinePssh(const CdmInitData& init_data,
+                                  CdmInitData* output);
+
+  std::string type_;
+  CdmInitData data_;
+  bool is_cenc_;
+  bool is_webm_;
+  CORE_DISALLOW_COPY_AND_ASSIGN(InitializationData);
+};
+
+}  // namespace wvcdm
+
+#endif  // CORE_INCLUDE_INITIALIZATION_DATA_H_

libwvdrmengine/cdm/core/include/license.h

@@ -5,6 +5,7 @@
 
 #include <set>
 
+#include "initialization_data.h"
 #include "wv_cdm_types.h"
 
 namespace video_widevine_server {
@@ -27,8 +28,7 @@ class CdmLicense {
   bool Init(const std::string& token, CryptoSession* session,
             PolicyEngine* policy_engine);
 
-  bool PrepareKeyRequest(const std::string& mime_type,
-                         const CdmInitData& init_data,
+  bool PrepareKeyRequest(const InitializationData& init_data,
                          const CdmLicenseType license_type,
                          const CdmAppParameterMap& app_parameters,
                          const CdmSessionId& session_id,

libwvdrmengine/cdm/core/include/wv_cdm_constants.h

@@ -56,8 +56,10 @@ static const std::string QUERY_VALUE_SECURITY_LEVEL_L2 = "L2";
 static const std::string QUERY_VALUE_SECURITY_LEVEL_L3 = "L3";
 static const std::string QUERY_VALUE_SECURITY_LEVEL_UNKNOWN = "Unknown";
 
-static const std::string ISO_BMFF_MIME_TYPE = "video/mp4";
-static const std::string WEBM_MIME_TYPE = "video/webm";
+static const std::string ISO_BMFF_VIDEO_MIME_TYPE = "video/mp4";
+static const std::string ISO_BMFF_AUDIO_MIME_TYPE = "audio/mp4";
+static const std::string WEBM_VIDEO_MIME_TYPE = "video/webm";
+static const std::string WEBM_AUDIO_MIME_TYPE = "audio/webm";
 }  // namespace wvcdm
 
 #endif  // CDM_BASE_WV_CDM_CONSTANTS_H_