Remove checking for 'tenc' boxes when processing initData

components/cdm/browser/widevine_drm_delegate_android.cc

 // Copyright 2015 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 "components/cdm/browser/widevine_drm_delegate_android.h"
 
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 
 namespace cdm {
@@ skipping 33 matching lines @@
 //   uint8[DataSize] Data
 // }
 const int kBoxHeaderSize = 8;  // Box's header contains Size and Type.
 const int kBoxLargeSizeSize = 8;
 const int kPsshVersionFlagSize = 4;
 const uint32_t k24BitMask = 0x00ffffff;
 const int kPsshSystemIdSize = 16;
 const int kPsshKidCountSize = 4;
 const int kPsshKidSize = 16;
 const int kPsshDataSizeSize = 4;
-const uint32_t kTencType = 0x74656e63;
 const uint32_t kPsshType = 0x70737368;
 
 const uint8_t kWidevineUuid[16] = {
     0xED, 0xEF, 0x8B, 0xA9, 0x79, 0xD6, 0x4A, 0xCE,
     0xA3, 0xC8, 0x27, 0xDC, 0xD5, 0x1D, 0x21, 0xED };
 
 // Tries to find a PSSH box with the Widevine UUID, parses the
 // "Data" of the box and put it in |pssh_data|. Returns true if such a box is
 // found and successfully parsed. Returns false otherwise.
 // Notes:
 // 1, If multiple PSSH boxes are found,the "Data" of the first matching PSSH box
 // will be set in |pssh_data|.
-// 2, Only PSSH and TENC boxes are allowed in |data|. TENC boxes are skipped.
+// 2, Only PSSH boxes are allowed in |data|.
 bool GetPsshData(const std::vector<uint8_t>& data,
                  std::vector<uint8_t>* pssh_data) {
   int bytes_left = base::checked_cast<int>(data.size());
   const uint8_t* cur = &data[0];
   const uint8_t* data_end = cur + bytes_left;
 
   while (bytes_left > 0) {
     const uint8_t* box_head = cur;
 
     if (bytes_left < kBoxHeaderSize)
@@ skipping 12 matching lines @@
       cur += kBoxLargeSizeSize;
       bytes_left -= kBoxLargeSizeSize;
     } else if (box_size == 0) {
       box_size = bytes_left + kBoxHeaderSize;
     }
 
     const uint8_t* box_end = box_head + box_size;
     if (data_end < box_end)
       return false;
 
-    if (type == kTencType) {
-      // Skip 'tenc' box.
-      cur = box_end;
-      bytes_left = data_end - cur;
-      continue;
-    } else if (type != kPsshType) {
+    if (type != kPsshType)
       return false;
-    }
 
     const int kPsshBoxMinimumSize =
         kPsshVersionFlagSize + kPsshSystemIdSize + kPsshDataSizeSize;
     if (box_end < cur + kPsshBoxMinimumSize)
       return false;
 
     uint8_t version = cur[0];
     uint32_t flags = ReadUint32(cur) & k24BitMask;
     cur += kPsshVersionFlagSize;
     bytes_left -= kPsshVersionFlagSize;
@@ skipping 57 matching lines @@
     std::vector<std::string>* /* optional_parameters_out */) {
   if (init_data_type != media::EmeInitDataType::CENC)
     return true;
 
   // Widevine MediaDrm plugin only accepts the "data" part of the PSSH box as
   // the init data when using MP4 container.
   return GetPsshData(init_data, init_data_out);
 }
 
 }  // namespace cdm