Convert between |init_data_type| and content type.

media/cdm/ppapi/cdm_wrapper.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_CDM_PPAPI_CDM_WRAPPER_H_
 #define MEDIA_CDM_PPAPI_CDM_WRAPPER_H_
 
 #include <map>
 #include <queue>
 #include <string>
@@ skipping 109 matching lines @@
       const char* web_session_id,
       uint32_t web_session_id_size) = 0;
 
   // cdm::Host_6 introduces InputBuffer_2 (aka InputBuffer). cdm::Host_4 and
   // cdm::Host_5 methods still use InputBuffer_1, so this helper function
   // converts InputBuffer_2 to InputBuffer_1.
   // TODO(jrummell): Remove these once Host_4 and Host_5 interfaces are removed.
   virtual void ConvertInputBuffer(const cdm::InputBuffer& v2,
                                   cdm::InputBuffer_1* v1) = 0;
 
+  // Starting in cdm::Host_6 |init_data_type| is a registered type instead of a

[ddorwin, 2014/08/13 20:59:55]

"Prior to CDM_6, |init_data_type| was a mime type."
           ^ It's not actually Host.

[sandersd (OOO until July 31), 2014/08/13 21:36:19]

Done.

+  // content type. This helper convererts an |init_data_type| to a content type.
+  // TODO(sandersd): Remove once Host_4 and Host_5 interfaces are removed.
+  virtual const char* ConvertInitDataTypeToContentType(
+      const char* init_data_type) const = 0;
+
  protected:
   CdmWrapper() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CdmWrapper);
 };
 
 // Template class that does the CdmWrapper -> CdmInterface conversion. Default
 // implementations are provided. Any methods that need special treatment should
 // be specialized.
@@ skipping 192 matching lines @@
     v1->data_offset = 0;
     v1->key_id = v2.key_id;
     v1->key_id_size = v2.key_id_size;
     v1->iv = v2.iv;
     v1->iv_size = v2.iv_size;
     v1->subsamples = v2.subsamples;
     v1->num_subsamples = v2.num_subsamples;
     v1->timestamp = v2.timestamp;
   }
 
+  virtual const char* ConvertInitDataTypeToContentType(
+      const char* init_data_type) const {
+    if (!strcmp(init_data_type, "cenc"))
+      return "video/mp4";
+    if (!strcmp(init_data_type, "webm"))
+      return "video/webm";
+    return init_data_type;
+  }
+
  private:
   CdmWrapperImpl(CdmInterface* cdm) : cdm_(cdm), next_session_id_(100) {
     PP_DCHECK(cdm_);
   }
 
   CdmInterface* cdm_;
 
   std::map<uint32_t, uint32_t> promise_to_session_id_map_;
   uint32_t next_session_id_;
   std::map<std::string, uint32_t> web_session_to_session_id_map_;
 
   std::map<uint32_t, std::string> promises_needing_usable_keys_event_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmWrapperImpl);
 };
 
 // Overrides for the cdm::Host_4 methods. Calls to CreateSession(),
 // LoadSession(), UpdateSession(), and ReleaseSession() pass in promise ids,
 // but the CDM interface needs session ids. For create and load, we need to
 // create a new session_id to pass to the CDM. For update and release, we need
 // to look up |web_session_id| and convert it into the existing |session_id|.
 // Since the callbacks don't come through this interface, cdm_adapter needs to
-// create the mapping (and delete it on release).
+// create the mapping (and delete it on release). Finally, for create, we need
+// to translate |init_data_type| to a MIME type.
 // TODO(jrummell): Remove these once Host_4 interface is removed.
 
 template <>
 void CdmWrapperImpl<cdm::ContentDecryptionModule_4>::CreateSession(
     uint32_t promise_id,
     const char* init_data_type,
     uint32_t init_data_type_size,
     const uint8_t* init_data,
     uint32_t init_data_size,
     cdm::SessionType session_type) {
   uint32_t session_id = CreateSessionId();
   RegisterPromise(session_id, promise_id);
   cdm_->CreateSession(session_id,
-                      init_data_type,
+                      ConvertInitDataTypeToContentType(init_data_type),
                       init_data_type_size,
                       init_data,
                       init_data_size);
 }
 
 template <>
 void CdmWrapperImpl<cdm::ContentDecryptionModule_4>::LoadSession(
     uint32_t promise_id,
     const char* web_session_id,
     uint32_t web_session_id_size) {
@@ skipping 76 matching lines @@
     cdm::AudioFrames* audio_frames) {
   cdm::InputBuffer_1 buffer;
   ConvertInputBuffer(encrypted_buffer, &buffer);
   return cdm_->DecryptAndDecodeSamples(buffer, audio_frames);
 }
 
 // Overrides for the cdm::Host_5 methods.
 // TODO(jrummell): Remove these once Host_5 interface is removed.
 
 template <>
+void CdmWrapperImpl<cdm::ContentDecryptionModule_5>::CreateSession(
+    uint32_t promise_id,
+    const char* init_data_type,
+    uint32_t init_data_type_size,
+    const uint8_t* init_data,
+    uint32_t init_data_size,
+    cdm::SessionType session_type) {
+  cdm_->CreateSession(promise_id,
+                      ConvertInitDataTypeToContentType(init_data_type),
+                      init_data_type_size,
+                      init_data,
+                      init_data_size);
+}
+
+template <>
 void CdmWrapperImpl<cdm::ContentDecryptionModule_5>::LoadSession(
     uint32_t promise_id,
     const char* web_session_id,
     uint32_t web_session_id_size) {
   // As CDM_5 doesn't support OnSessionUsableKeysChange(), make sure to generate
   // one when the promise is resolved. This may be overly aggressive.
   SetSessionUsableKeysEventNeeded(
       promise_id, web_session_id, web_session_id_size);
   cdm_->LoadSession(promise_id, web_session_id, web_session_id_size);
 }
@@ skipping 110 matching lines @@
 // stub implementations for new or modified methods that the older CDM interface
 // does not have.
 // Also update supported_cdm_versions.h.
 COMPILE_ASSERT(cdm::ContentDecryptionModule::kVersion ==
                    cdm::ContentDecryptionModule_6::kVersion,
                ensure_cdm_wrapper_templates_have_old_version_support);
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_PPAPI_CDM_WRAPPER_H_