MediaDrmBridge: Update ConvertInitDataType().

media/base/android/media_drm_bridge.cc

 // Copyright (c) 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.
 
 #include "media/base/android/media_drm_bridge.h"
 
 #include <algorithm>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_array.h"
@@ skipping 38 matching lines @@
   return std::string(session_id_vector.begin(), session_id_vector.end());
 }
 
 const uint8 kWidevineUuid[16] = {
     0xED, 0xEF, 0x8B, 0xA9, 0x79, 0xD6, 0x4A, 0xCE,
     0xA3, 0xC8, 0x27, 0xDC, 0xD5, 0x1D, 0x21, 0xED };
 
 // Convert |init_data_type| to a string supported by MediaDRM.
 // "audio"/"video" does not matter, so use "video".
 std::string ConvertInitDataType(media::EmeInitDataType init_data_type) {
-  // TODO(jrummell): API level >=20 supports "webm" and "cenc", so switch
-  // to those strings.
+  // TODO(jrummell/xhwang): EME init data types like "webm" and "cenc" are
+  // supported in API level >=21 for Widevine key system. Switch to use those
+  // strings when they are officially supported in Android for all key systems.
   switch (init_data_type) {
     case media::EmeInitDataType::WEBM:
       return "video/webm";
     case media::EmeInitDataType::CENC:
       return "video/mp4";
     default:

[ddorwin, 2015/05/19 21:35:24]

Should we do the conversion for KEYIDS so we can establish the "right way" now?

[xhwang, 2015/05/19 21:44:24]

Done.

       NOTREACHED();
       return "video/unknown";
   }
 }
 
 class KeySystemManager {
  public:
   KeySystemManager();
   UUID GetUUID(const std::string& key_system);
   std::vector<std::string> GetPlatformKeySystemNames();
@@ skipping 459 matching lines @@
   JNIEnv* env = AttachCurrentThread();
   Java_MediaDrmBridge_resetDeviceCredentials(env, j_media_drm_.obj());
 }
 
 void MediaDrmBridge::OnResetDeviceCredentialsCompleted(
     JNIEnv* env, jobject, bool success) {
   base::ResetAndReturn(&reset_credentials_cb_).Run(success);
 }
 
 }  // namespace media