EME: Close existing sessions on CDM failure

media/cdm/ppapi/external_clear_key/clear_key_cdm.cc

 // 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.
 
 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm.h"
 
 #include <algorithm>
 #include <cstring>
 #include <sstream>
 #include <utility>
@@ skipping 54 matching lines @@
 const char kExternalClearKeyRenewalKeySystem[] =
     "org.chromium.externalclearkey.renewal";
 const char kExternalClearKeyFileIOTestKeySystem[] =
     "org.chromium.externalclearkey.fileiotest";
 const char kExternalClearKeyOutputProtectionTestKeySystem[] =
     "org.chromium.externalclearkey.outputprotectiontest";
 const char kExternalClearKeyPlatformVerificationTestKeySystem[] =
     "org.chromium.externalclearkey.platformverificationtest";
 const char kExternalClearKeyCrashKeySystem[] =
     "org.chromium.externalclearkey.crash";
+const char kExternalClearKeyCloseOnCrashKeySystem[] =
+    "org.chromium.externalclearkey.closeoncrash";
 
 // Constants for the enumalted session that can be loaded by LoadSession().
 // These constants need to be in sync with
 // chrome/test/data/media/encrypted_media_utils.js
 const char kLoadableSessionId[] = "LoadableSession";
 const uint8_t kLoadableSessionKeyId[] = "0123456789012345";
 const uint8_t kLoadableSessionKey[] = {0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14,
                                        0xd2, 0x7b, 0x68, 0xef, 0x12, 0x2a,
                                        0xfc, 0xe4, 0xae, 0x3c};
 
@@ skipping 150 matching lines @@
                         void* user_data) {
   DVLOG(1) << "CreateCdmInstance()";
 
   std::string key_system_string(key_system, key_system_size);
   if (key_system_string != kExternalClearKeyKeySystem &&
       key_system_string != kExternalClearKeyDecryptOnlyKeySystem &&
       key_system_string != kExternalClearKeyRenewalKeySystem &&
       key_system_string != kExternalClearKeyFileIOTestKeySystem &&
       key_system_string != kExternalClearKeyOutputProtectionTestKeySystem &&
       key_system_string != kExternalClearKeyPlatformVerificationTestKeySystem &&
-      key_system_string != kExternalClearKeyCrashKeySystem) {
+      key_system_string != kExternalClearKeyCrashKeySystem &&
+      key_system_string != kExternalClearKeyCloseOnCrashKeySystem) {

[xhwang, 2016/11/04 22:37:40]

Last time when I was here I thought maybe we should just accept all
org.chromium.externalclearkey.* key systems here. WDYT?

[jrummell, 2016/11/07 22:03:47]

No longer adding a key system so this is reverted now. Only problem with
checking org.chromium.externalclearkey.* is that now a typo in the key system
name will be harder to notice.

     DVLOG(1) << "Unsupported key system:" << key_system_string;
     return NULL;
   }
 
   if (cdm_interface_version != media::ClearKeyCdmInterface::kVersion)
     return NULL;
 
   media::ClearKeyCdmHost* host = static_cast<media::ClearKeyCdmHost*>(
       get_cdm_host_func(media::ClearKeyCdmHost::kVersion, user_data));
   if (!host)
@@ skipping 359 matching lines @@
 
   return video_decoder_->DecodeFrame(data, size, timestamp, decoded_frame);
 }
 
 cdm::Status ClearKeyCdm::DecryptAndDecodeSamples(
     const cdm::InputBuffer& encrypted_buffer,
     cdm::AudioFrames* audio_frames) {
   DVLOG(1) << "DecryptAndDecodeSamples()";
 
   // Trigger a crash on purpose for testing purpose.
-  if (key_system_ == kExternalClearKeyCrashKeySystem)
+  if (key_system_ == kExternalClearKeyCrashKeySystem ||
+      key_system_ == kExternalClearKeyCloseOnCrashKeySystem)

[xhwang, 2016/11/04 22:37:40]

It seems odd that two tests execute exactly the same code path, but each test
only check part of the test result. See comment below.

[jrummell, 2016/11/07 22:03:47]

Done.

     CHECK(false);
 
   scoped_refptr<media::DecoderBuffer> buffer;
   cdm::Status status = DecryptToMediaDecoderBuffer(encrypted_buffer, &buffer);
 
   if (status != cdm::kSuccess)
     return status;
 
 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
   const uint8_t* data = NULL;
@@ skipping 347 matching lines @@
   is_running_platform_verification_test_ = true;
 
   std::string service_id = "test_service_id";
   std::string challenge = "test_challenge";
 
   host_->SendPlatformChallenge(service_id.data(), service_id.size(),
                                challenge.data(), challenge.size());
 }
 
 }  // namespace media