Have GetKeyIds() return the key IDs from the first matching 'pssh' box

media/cdm/aes_decryptor.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/aes_decryptor.h"
 
 #include <list>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "crypto/encryptor.h"
 #include "crypto/symmetric_key.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/cdm_key_information.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
 #include "media/cdm/json_web_key.h"
 
 #if defined(USE_PROPRIETARY_CODECS)
 #include "media/cdm/cenc_utils.h"
 #endif
 
 namespace media {
 
+#if defined(USE_PROPRIETARY_CODECS)
+// CENC SystemID for the Common System.
+// https://w3c.github.io/encrypted-media/cenc-format.html#common-system
+const uint8_t kCencCommonSystemId[] = {0x10, 0x77, 0xef, 0xec, 0xc0, 0xb2,
+                                       0x4d, 0x02, 0xac, 0xe3, 0x3c, 0x1e,
+                                       0x52, 0xe2, 0xfb, 0x4b};
+#endif
+
 // Keeps track of the session IDs and DecryptionKeys. The keys are ordered by
 // insertion time (last insertion is first). It takes ownership of the
 // DecryptionKeys.
 class AesDecryptor::SessionIdDecryptionKeyMap {
   // Use a std::list to actually hold the data. Insertion is always done
   // at the front, so the "latest" decryption key is always the first one
   // in the list.
   typedef std::list<std::pair<std::string, DecryptionKey*> > KeyList;
 
  public:
@@ skipping 228 matching lines @@
   // when prefixed EME is removed (http://crbug.com/249976).
   if (!init_data.empty()) {
     std::vector<std::vector<uint8_t>> keys;
     switch (init_data_type) {
       case EmeInitDataType::WEBM:
         // |init_data| is simply the key needed.
         keys.push_back(init_data);
         break;
       case EmeInitDataType::CENC:
 #if defined(USE_PROPRIETARY_CODECS)
+      {
         // |init_data| is a set of 0 or more concatenated 'pssh' boxes.
-        if (!GetKeyIdsForCommonSystemId(init_data, &keys)) {
+        std::vector<uint8_t> common_system_id(
+            kCencCommonSystemId,
+            kCencCommonSystemId + arraysize(kCencCommonSystemId));
+        if (!GetKeyIdsFromPsshBoxes(init_data, common_system_id, &keys)) {
           promise->reject(NOT_SUPPORTED_ERROR, 0,
                           "No supported PSSH box found.");
           return;
         }
-        break;
+      } break;
 #else
         promise->reject(NOT_SUPPORTED_ERROR, 0,
                         "Initialization data type CENC is not supported.");
         return;
 #endif
       case EmeInitDataType::KEYIDS: {
         std::string init_data_string(init_data.begin(), init_data.end());
         std::string error_message;
         if (!ExtractKeyIdsFromKeyIdsInitData(init_data_string, &keys,
                                              &error_message)) {
@@ skipping 309 matching lines @@
 bool AesDecryptor::DecryptionKey::Init() {
   CHECK(!secret_.empty());
   decryption_key_.reset(crypto::SymmetricKey::Import(
       crypto::SymmetricKey::AES, secret_));
   if (!decryption_key_)
     return false;
   return true;
 }
 
 }  // namespace media