Fix TrackRunIterator to generate a parse error when it encounters a reserved dependency value.

media/formats/mp4/track_run_iterator_unittest.cc

 // Copyright 2014 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 "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
 #include "media/formats/mp4/box_definitions.h"
 #include "media/formats/mp4/rcheck.h"
@@ skipping 90 matching lines @@
     switch(str[0]) {
       case 'U':
         sample_depends_on = kSampleDependsOnUnknown;
         break;
       case 'O':
         sample_depends_on = kSampleDependsOnOthers;
         break;
       case 'N':
         sample_depends_on = kSampleDependsOnNoOther;
         break;
+      case 'R':
+        sample_depends_on = kSampleDependsOnReserved;
+        break;
       default:
         CHECK(false) << "Invalid sample dependency character '"
                      << str[0] << "'";
         break;
     }
 
     switch(str[1]) {
       case 'S':
         is_non_sync_sample = false;
         break;
@@ skipping 241 matching lines @@
   moof.tracks[1].header.default_sample_flags = ToSampleFlags("UN");
   SetFlagsOnSamples("US", &moof.tracks[1].runs[0]);
 
   ASSERT_TRUE(iter_->Init(moof));
   EXPECT_EQ("1 KR KR KR KR KR KR KR KR KR KR", KeyframeAndRAPInfo(iter_.get()));
 
   iter_->AdvanceRun();
   EXPECT_EQ("2 KR P P P P P P P P P", KeyframeAndRAPInfo(iter_.get()));
 }
 
+// Verify that parsing fails if a reserved value is in the sample flags.
+TEST_F(TrackRunIteratorTest, SampleInfoTest_ReservedInSampleFlags) {
+  iter_.reset(new TrackRunIterator(&moov_, log_cb_));
+  MovieFragment moof = CreateFragment();
+  // Change the "depends on" field on one of the samples to a
+  // reserved value.
+  moof.tracks[1].runs[0].sample_flags[0] = ToSampleFlags("RS");
+  ASSERT_FALSE(iter_->Init(moof));
+}
+
+// Verify that parsing fails if a reserved value is in the default sample flags.
+TEST_F(TrackRunIteratorTest, SampleInfoTest_ReservedInDefaultSampleFlags) {
+  iter_.reset(new TrackRunIterator(&moov_, log_cb_));
+  MovieFragment moof = CreateFragment();
+  // Set the default flag to contain a reserved "depends on" value.
+  moof.tracks[0].header.default_sample_flags = ToSampleFlags("RN");
+  ASSERT_FALSE(iter_->Init(moof));
+}
+
 TEST_F(TrackRunIteratorTest, ReorderingTest) {
   // Test frame reordering and edit list support. The frames have the following
   // decode timestamps:
   //
   //   0ms 40ms   120ms     240ms
   //   | 0 | 1  - | 2  -  - |
   //
   // ...and these composition timestamps, after edit list adjustment:
   //
   //   0ms 40ms       160ms  240ms
@@ skipping 275 matching lines @@
 
   iter_->AdvanceRun();
 
   // Verify that nothing is marked as a random access point.
   EXPECT_EQ("2 KR P PR P KR K", KeyframeAndRAPInfo(iter_.get()));
 }
 
 
 }  // namespace mp4
 }  // namespace media