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

media/cdm/cenc_utils_unittest.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 "media/cdm/cenc_utils.h"
 
 #include "base/logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
@@ skipping 204 matching lines @@
   EXPECT_EQ(key_ids[0], Key1());
   EXPECT_EQ(key_ids[1], Key2());
 }
 
 TEST_F(CencUtilsTest, PSSHVersion0Plus1) {
   std::vector<uint8_t> box0 = MakePSSHBox(0);
   std::vector<uint8_t> box1 = MakePSSHBox(1, Key1());
 
   // Concatentate box1 onto end of box0.
   box0.insert(box0.end(), box1.begin(), box1.end());
+  EXPECT_TRUE(ValidatePsshInput(box0));
 
+  // No key IDs returned as only the first 'pssh' box is processed.
   KeyIdList key_ids;
-  EXPECT_TRUE(ValidatePsshInput(box0));
-  EXPECT_TRUE(GetKeyIdsForCommonSystemId(box0, &key_ids));
-  EXPECT_EQ(1u, key_ids.size());
-  EXPECT_EQ(key_ids[0], Key1());
+  EXPECT_FALSE(GetKeyIdsForCommonSystemId(box0, &key_ids));
 }
 
 TEST_F(CencUtilsTest, PSSHVersion1Plus0) {
   std::vector<uint8_t> box0 = MakePSSHBox(0);
   std::vector<uint8_t> box1 = MakePSSHBox(1, Key1());
 
   // Concatentate box0 onto end of box1.
   box1.insert(box1.end(), box0.begin(), box0.end());
 
   KeyIdList key_ids;
   EXPECT_TRUE(ValidatePsshInput(box1));
   EXPECT_TRUE(GetKeyIdsForCommonSystemId(box1, &key_ids));
   EXPECT_EQ(1u, key_ids.size());
   EXPECT_EQ(key_ids[0], Key1());
 }
 
 TEST_F(CencUtilsTest, MultiplePSSHVersion1) {
   std::vector<uint8_t> box = MakePSSHBox(1, Key1(), Key2());
   std::vector<uint8_t> box1 = MakePSSHBox(1, Key3());
   std::vector<uint8_t> box2 = MakePSSHBox(1, Key4());
 
   // Concatentate box1 and box2 onto end of box.
   box.insert(box.end(), box1.begin(), box1.end());
   box.insert(box.end(), box2.begin(), box2.end());
 
   KeyIdList key_ids;
   EXPECT_TRUE(ValidatePsshInput(box));
-  // TODO(jrummell): GetKeyIdsForCommonSystemId() returns the key IDs out of
-  // all matching boxes. It should only return the key IDs from the first
-  // matching box.
   EXPECT_TRUE(GetKeyIdsForCommonSystemId(box, &key_ids));
-  EXPECT_EQ(4u, key_ids.size());
+  EXPECT_EQ(2u, key_ids.size());
   EXPECT_EQ(key_ids[0], Key1());
   EXPECT_EQ(key_ids[1], Key2());
-  EXPECT_EQ(key_ids[2], Key3());
-  EXPECT_EQ(key_ids[3], Key4());
 }
 
 TEST_F(CencUtilsTest, PsshBoxSmallerThanSize) {
   std::vector<uint8_t> box = MakePSSHBox(1, Key1(), Key2());
   KeyIdList key_ids;
 
   // Tries every buffer size less than the indicated 'pssh' box size.
   for (size_t i = 1; i < box.size(); ++i) {
     // Truncate the box to be less than the specified box size.
     std::vector<uint8_t> truncated(&box[0], &box[0] + i);
@@ skipping 245 matching lines @@
   std::vector<uint8_t> box2 = MakePSSHBox(0);
   std::vector<uint8_t> data2(data2_bytes, data2_bytes + arraysize(data2_bytes));
   AppendData(box2, data2);
 
   box1.insert(box1.end(), box2.begin(), box2.end());
   EXPECT_TRUE(GetPsshData(box1, CommonSystemSystemId(), &pssh_data));
   EXPECT_EQ(data1, pssh_data);
   EXPECT_NE(data2, pssh_data);
 }
 }  // namespace media