| Index: media/mp4/track_run_iterator_unittest.cc
|
| diff --git a/media/mp4/track_run_iterator_unittest.cc b/media/mp4/track_run_iterator_unittest.cc
|
| index 40385cc487adeebe9b2db11ad18245791b5e4d66..c0cbbe645b9ca91c84893d6ad7b0b5db17e9a492 100644
|
| --- a/media/mp4/track_run_iterator_unittest.cc
|
| +++ b/media/mp4/track_run_iterator_unittest.cc
|
| @@ -48,6 +48,7 @@ class TrackRunIteratorTest : public testing::Test {
|
|
|
| protected:
|
| Movie moov_;
|
| + LogCB log_cb_;
|
| scoped_ptr<TrackRunIterator> iter_;
|
|
|
| void CreateMovie() {
|
| @@ -153,14 +154,14 @@ class TrackRunIteratorTest : public testing::Test {
|
| };
|
|
|
| TEST_F(TrackRunIteratorTest, NoRunsTest) {
|
| - iter_.reset(new TrackRunIterator(&moov_));
|
| + iter_.reset(new TrackRunIterator(&moov_, log_cb_));
|
| ASSERT_TRUE(iter_->Init(MovieFragment()));
|
| EXPECT_FALSE(iter_->IsRunValid());
|
| EXPECT_FALSE(iter_->IsSampleValid());
|
| }
|
|
|
| TEST_F(TrackRunIteratorTest, BasicOperationTest) {
|
| - iter_.reset(new TrackRunIterator(&moov_));
|
| + iter_.reset(new TrackRunIterator(&moov_, log_cb_));
|
| MovieFragment moof = CreateFragment();
|
|
|
| // Test that runs are sorted correctly, and that properties of the initial
|
| @@ -218,7 +219,7 @@ TEST_F(TrackRunIteratorTest, TrackExtendsDefaultsTest) {
|
| moov_.extends.tracks[0].default_sample_size = 3;
|
| moov_.extends.tracks[0].default_sample_flags =
|
| kSampleIsDifferenceSampleFlagMask;
|
| - iter_.reset(new TrackRunIterator(&moov_));
|
| + iter_.reset(new TrackRunIterator(&moov_, log_cb_));
|
| MovieFragment moof = CreateFragment();
|
| moof.tracks[0].header.has_default_sample_flags = false;
|
| moof.tracks[0].header.default_sample_size = 0;
|
| @@ -237,7 +238,7 @@ TEST_F(TrackRunIteratorTest, FirstSampleFlagTest) {
|
| // Ensure that keyframes are flagged correctly in the face of BMFF boxes which
|
| // explicitly specify the flags for the first sample in a run and rely on
|
| // defaults for all subsequent samples
|
| - iter_.reset(new TrackRunIterator(&moov_));
|
| + iter_.reset(new TrackRunIterator(&moov_, log_cb_));
|
| MovieFragment moof = CreateFragment();
|
| moof.tracks[1].header.has_default_sample_flags = true;
|
| moof.tracks[1].header.default_sample_flags =
|
| @@ -251,7 +252,7 @@ TEST_F(TrackRunIteratorTest, FirstSampleFlagTest) {
|
| }
|
|
|
| TEST_F(TrackRunIteratorTest, MinDecodeTest) {
|
| - iter_.reset(new TrackRunIterator(&moov_));
|
| + iter_.reset(new TrackRunIterator(&moov_, log_cb_));
|
| MovieFragment moof = CreateFragment();
|
| moof.tracks[0].decode_time.decode_time = kAudioScale;
|
| ASSERT_TRUE(iter_->Init(moof));
|
| @@ -276,7 +277,7 @@ TEST_F(TrackRunIteratorTest, ReorderingTest) {
|
| // (that is, 2 / kVideoTimescale) and a duration of zero (which is treated as
|
| // infinite according to 14496-12:2012). This will cause the first 80ms of the
|
| // media timeline - which will be empty, due to CTS biasing - to be discarded.
|
| - iter_.reset(new TrackRunIterator(&moov_));
|
| + iter_.reset(new TrackRunIterator(&moov_, log_cb_));
|
| EditListEntry entry;
|
| entry.segment_duration = 0;
|
| entry.media_time = 2;
|
| @@ -313,7 +314,7 @@ TEST_F(TrackRunIteratorTest, ReorderingTest) {
|
| }
|
|
|
| TEST_F(TrackRunIteratorTest, IgnoreUnknownAuxInfoTest) {
|
| - iter_.reset(new TrackRunIterator(&moov_));
|
| + iter_.reset(new TrackRunIterator(&moov_, log_cb_));
|
| MovieFragment moof = CreateFragment();
|
| moof.tracks[1].auxiliary_offset.offsets.push_back(50);
|
| moof.tracks[1].auxiliary_size.default_sample_info_size = 2;
|
| @@ -326,7 +327,7 @@ TEST_F(TrackRunIteratorTest, IgnoreUnknownAuxInfoTest) {
|
|
|
| TEST_F(TrackRunIteratorTest, DecryptConfigTest) {
|
| AddEncryption(&moov_.tracks[1]);
|
| - iter_.reset(new TrackRunIterator(&moov_));
|
| + iter_.reset(new TrackRunIterator(&moov_, log_cb_));
|
|
|
| MovieFragment moof = CreateFragment();
|
| AddAuxInfoHeaders(50, &moof.tracks[1]);
|
| @@ -366,7 +367,7 @@ TEST_F(TrackRunIteratorTest, DecryptConfigTest) {
|
| TEST_F(TrackRunIteratorTest, SharedAuxInfoTest) {
|
| AddEncryption(&moov_.tracks[0]);
|
| AddEncryption(&moov_.tracks[1]);
|
| - iter_.reset(new TrackRunIterator(&moov_));
|
| + iter_.reset(new TrackRunIterator(&moov_, log_cb_));
|
|
|
| MovieFragment moof = CreateFragment();
|
| moof.tracks[0].runs.resize(1);
|
| @@ -408,7 +409,7 @@ TEST_F(TrackRunIteratorTest, SharedAuxInfoTest) {
|
| TEST_F(TrackRunIteratorTest, UnexpectedOrderingTest) {
|
| AddEncryption(&moov_.tracks[0]);
|
| AddEncryption(&moov_.tracks[1]);
|
| - iter_.reset(new TrackRunIterator(&moov_));
|
| + iter_.reset(new TrackRunIterator(&moov_, log_cb_));
|
|
|
| MovieFragment moof = CreateFragment();
|
| AddAuxInfoHeaders(20000, &moof.tracks[0]);
|
|
|