Add initial support for edit lists in MSE BMFF.

media/mp4/track_run_iterator_unittest.cc

 // Copyright (c) 2012 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 "media/mp4/box_definitions.h"
 #include "media/mp4/rcheck.h"
 #include "media/mp4/track_run_iterator.h"
@@ skipping 243 matching lines @@
   iter_.reset(new TrackRunIterator(&moov_));
   MovieFragment moof = CreateFragment();
   moof.tracks[0].decode_time.decode_time = kAudioScale;
   ASSERT_TRUE(iter_->Init(moof));
   EXPECT_EQ(TimeDeltaFromRational(moof.tracks[1].decode_time.decode_time,
                                   kVideoScale),
             iter_->GetMinDecodeTimestamp());
 }
 
 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
+  //   | 0 | 2  -  -  | 1 - |
+  //
   iter_.reset(new TrackRunIterator(&moov_));
+  EditListEntry entry;

[acolwell GONE FROM CHROMIUM, 2012/08/07 20:12:13]

I don't really understand what is happening here. A comment here indicating how
this entry modifies the timestamps would be nice.

[strobe_, 2012/08/07 22:54:39]

Done.

+  entry.segment_duration = 0;
+  entry.media_time = 2;
+  entry.media_rate_integer = 1;
+  entry.media_rate_fraction = 0;
+  moov_.tracks[1].edit.list.edits.push_back(entry);
   MovieFragment moof = CreateFragment();
   std::vector<int32>& cts_offsets =
     moof.tracks[1].runs[0].sample_composition_time_offsets;
   cts_offsets.resize(10);
   cts_offsets[0] = 2;

[acolwell GONE FROM CHROMIUM, 2012/08/07 20:12:13]

Documenting these values would be nice as well. It is hard to tell how 2, 5, & 0
map to the times you specify in the big comment above.

[strobe_, 2012/08/07 22:54:39]

Done.

-  cts_offsets[1] = -1;
+  cts_offsets[1] = 5;
+  cts_offsets[2] = 0;
   moof.tracks[1].decode_time.decode_time = 0;
   ASSERT_TRUE(iter_->Init(moof));
   iter_->AdvanceRun();
   EXPECT_EQ(iter_->dts(), TimeDeltaFromRational(0, kVideoScale));
-  EXPECT_EQ(iter_->cts(), TimeDeltaFromRational(2, kVideoScale));
+  EXPECT_EQ(iter_->cts(), TimeDeltaFromRational(0, kVideoScale));
   EXPECT_EQ(iter_->duration(), TimeDeltaFromRational(1, kVideoScale));
   iter_->AdvanceSample();
   EXPECT_EQ(iter_->dts(), TimeDeltaFromRational(1, kVideoScale));
-  EXPECT_EQ(iter_->cts(), TimeDeltaFromRational(0, kVideoScale));
+  EXPECT_EQ(iter_->cts(), TimeDeltaFromRational(4, kVideoScale));
   EXPECT_EQ(iter_->duration(), TimeDeltaFromRational(2, kVideoScale));
+  iter_->AdvanceSample();
+  EXPECT_EQ(iter_->dts(), TimeDeltaFromRational(3, kVideoScale));
+  EXPECT_EQ(iter_->cts(), TimeDeltaFromRational(1, kVideoScale));
+  EXPECT_EQ(iter_->duration(), TimeDeltaFromRational(3, kVideoScale));
 }
 
 TEST_F(TrackRunIteratorTest, IgnoreUnknownAuxInfoTest) {
   iter_.reset(new TrackRunIterator(&moov_));
   MovieFragment moof = CreateFragment();
   moof.tracks[1].auxiliary_offset.offsets.push_back(50);
   moof.tracks[1].auxiliary_size.default_sample_info_size = 2;
   moof.tracks[1].auxiliary_size.sample_count = 2;
   moof.tracks[1].runs[0].sample_count = 2;
   ASSERT_TRUE(iter_->Init(moof));
@@ skipping 114 matching lines @@
   EXPECT_EQ(iter_->track_id(), 1u);
   EXPECT_EQ(iter_->aux_info_offset(), 201);
   EXPECT_EQ(iter_->sample_offset(), 10000);
   EXPECT_EQ(iter_->GetMaxClearOffset(), 201);
   EXPECT_TRUE(iter_->CacheAuxInfo(kAuxInfo, arraysize(kAuxInfo)));
   EXPECT_EQ(iter_->GetMaxClearOffset(), 10000);
 }
 
 }  // namespace mp4
 }  // namespace media