Deprecate LogCB in favor of using MediaLog

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 28 matching lines @@
 static const uint8 kCencSampleGroupKeyId[] = {
   0x46, 0x72, 0x61, 0x67, 0x53, 0x61, 0x6d, 0x70,
   0x6c, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4b
 };
 
 namespace media {
 namespace mp4 {
 
 class TrackRunIteratorTest : public testing::Test {
  public:
-  TrackRunIteratorTest() {
-    CreateMovie();
-  }
+  TrackRunIteratorTest() : media_log_(new MediaLog()) { CreateMovie(); }
 
  protected:
   Movie moov_;
-  LogCB log_cb_;
+  scoped_refptr<MediaLog> media_log_;
   scoped_ptr<TrackRunIterator> iter_;
 
   void CreateMovie() {
     moov_.header.timescale = 1000;
     moov_.tracks.resize(3);
     moov_.extends.tracks.resize(2);
     moov_.tracks[0].header.track_id = 1;
     moov_.tracks[0].media.header.timescale = kAudioScale;
     SampleDescription& desc1 =
         moov_.tracks[0].media.information.sample_table.description;
@@ skipping 203 matching lines @@
   }
 
   void SetAscending(std::vector<uint32>* vec) {
     vec->resize(10);
     for (size_t i = 0; i < vec->size(); i++)
       (*vec)[i] = i+1;
   }
 };
 
 TEST_F(TrackRunIteratorTest, NoRunsTest) {
-  iter_.reset(new TrackRunIterator(&moov_, log_cb_));
+  iter_.reset(new TrackRunIterator(&moov_, media_log_));
   ASSERT_TRUE(iter_->Init(MovieFragment()));
   EXPECT_FALSE(iter_->IsRunValid());
   EXPECT_FALSE(iter_->IsSampleValid());
 }
 
 TEST_F(TrackRunIteratorTest, BasicOperationTest) {
-  iter_.reset(new TrackRunIterator(&moov_, log_cb_));
+  iter_.reset(new TrackRunIterator(&moov_, media_log_));
   MovieFragment moof = CreateFragment();
 
   // Test that runs are sorted correctly, and that properties of the initial
   // sample of the first run are correct
   ASSERT_TRUE(iter_->Init(moof));
   EXPECT_TRUE(iter_->IsRunValid());
   EXPECT_FALSE(iter_->is_encrypted());
   EXPECT_EQ(iter_->track_id(), 1u);
   EXPECT_EQ(iter_->sample_offset(), 100);
   EXPECT_EQ(iter_->sample_size(), 1);
@@ skipping 36 matching lines @@
             moof.tracks[0].header.default_sample_size,
             iter_->sample_offset());
   iter_->AdvanceRun();
   EXPECT_FALSE(iter_->IsRunValid());
 }
 
 TEST_F(TrackRunIteratorTest, TrackExtendsDefaultsTest) {
   moov_.extends.tracks[0].default_sample_duration = 50;
   moov_.extends.tracks[0].default_sample_size = 3;
   moov_.extends.tracks[0].default_sample_flags = ToSampleFlags("UN");
-  iter_.reset(new TrackRunIterator(&moov_, log_cb_));
+  iter_.reset(new TrackRunIterator(&moov_, media_log_));
   MovieFragment moof = CreateFragment();
   moof.tracks[0].header.has_default_sample_flags = false;
   moof.tracks[0].header.default_sample_size = 0;
   moof.tracks[0].header.default_sample_duration = 0;
   moof.tracks[0].runs[0].sample_sizes.clear();
   ASSERT_TRUE(iter_->Init(moof));
   iter_->AdvanceSample();
   EXPECT_FALSE(iter_->is_keyframe());
   EXPECT_EQ(iter_->sample_size(), 3);
   EXPECT_EQ(iter_->sample_offset(), moof.tracks[0].runs[0].data_offset + 3);
   EXPECT_EQ(iter_->duration(), TimeDeltaFromRational(50, kAudioScale));
   EXPECT_EQ(iter_->dts(), DecodeTimestampFromRational(50, kAudioScale));
 }
 
 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_, log_cb_));
+  iter_.reset(new TrackRunIterator(&moov_, media_log_));
   MovieFragment moof = CreateFragment();
   moof.tracks[1].header.has_default_sample_flags = true;
   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_));
+  iter_.reset(new TrackRunIterator(&moov_, media_log_));
   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_));
+  iter_.reset(new TrackRunIterator(&moov_, media_log_));
   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
   //   | 0 | 2  -  -  | 1 - |
 
   // Create an edit list with one entry, with an initial start time of 80ms
   // (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_, log_cb_));
+  iter_.reset(new TrackRunIterator(&moov_, media_log_));
   EditListEntry entry;
   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);
 
   // Add CTS offsets. Without bias, the CTS offsets for the first three frames
   // would simply be [0, 3, -2]. Since CTS offsets should be non-negative for
   // maximum compatibility, these values are biased up to [2, 5, 0], and the
@@ skipping 16 matching lines @@
   EXPECT_EQ(iter_->dts(), DecodeTimestampFromRational(1, kVideoScale));
   EXPECT_EQ(iter_->cts(), TimeDeltaFromRational(4, kVideoScale));
   EXPECT_EQ(iter_->duration(), TimeDeltaFromRational(2, kVideoScale));
   iter_->AdvanceSample();
   EXPECT_EQ(iter_->dts(), DecodeTimestampFromRational(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_, log_cb_));
+  iter_.reset(new TrackRunIterator(&moov_, media_log_));
   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));
   iter_->AdvanceRun();
   EXPECT_FALSE(iter_->AuxInfoNeedsToBeCached());
 }
 
 TEST_F(TrackRunIteratorTest, DecryptConfigTest) {
   AddEncryption(&moov_.tracks[1]);
-  iter_.reset(new TrackRunIterator(&moov_, log_cb_));
+  iter_.reset(new TrackRunIterator(&moov_, media_log_));
 
   MovieFragment moof = CreateFragment();
   AddAuxInfoHeaders(50, &moof.tracks[1]);
 
   ASSERT_TRUE(iter_->Init(moof));
 
   // The run for track 2 will be first, since its aux info offset is the first
   // element in the file.
   EXPECT_EQ(iter_->track_id(), 2u);
   EXPECT_TRUE(iter_->is_encrypted());
@@ skipping 26 matching lines @@
   MovieFragment moof = CreateFragment();
 
   const SampleToGroupEntry kSampleToGroupTable[] = {
       // Associated with the second entry in SampleGroupDescription Box.
       {1, SampleToGroupEntry::kFragmentGroupDescriptionIndexBase + 2},
       // Associated with the first entry in SampleGroupDescription Box.
       {1, SampleToGroupEntry::kFragmentGroupDescriptionIndexBase + 1}};
   AddCencSampleGroup(
       &moof.tracks[0], kSampleToGroupTable, arraysize(kSampleToGroupTable));
 
-  iter_.reset(new TrackRunIterator(&moov_, log_cb_));
+  iter_.reset(new TrackRunIterator(&moov_, media_log_));
   ASSERT_TRUE(InitMoofWithArbitraryAuxInfo(&moof));
 
   std::string cenc_sample_group_key_id(
       kCencSampleGroupKeyId,
       kCencSampleGroupKeyId + arraysize(kCencSampleGroupKeyId));
   // The first sample is encrypted and the second sample is unencrypted.
   EXPECT_TRUE(iter_->is_encrypted());
   EXPECT_EQ(cenc_sample_group_key_id, iter_->GetDecryptConfig()->key_id());
   iter_->AdvanceSample();
   EXPECT_FALSE(iter_->is_encrypted());
 }
 
 TEST_F(TrackRunIteratorTest, CencSampleGroupWithTrackEncryptionBoxTest) {
   // Add TrackEncryption Box.
   AddEncryption(&moov_.tracks[0]);
 
   MovieFragment moof = CreateFragment();
 
   const SampleToGroupEntry kSampleToGroupTable[] = {
       // Associated with the second entry in SampleGroupDescription Box.
       {2, SampleToGroupEntry::kFragmentGroupDescriptionIndexBase + 2},
       // Associated with the default values specified in TrackEncryption Box.
       {4, 0},
       // Associated with the first entry in SampleGroupDescription Box.
       {3, SampleToGroupEntry::kFragmentGroupDescriptionIndexBase + 1}};
   AddCencSampleGroup(
       &moof.tracks[0], kSampleToGroupTable, arraysize(kSampleToGroupTable));
 
-  iter_.reset(new TrackRunIterator(&moov_, log_cb_));
+  iter_.reset(new TrackRunIterator(&moov_, media_log_));
   ASSERT_TRUE(InitMoofWithArbitraryAuxInfo(&moof));
 
   std::string track_encryption_key_id(kKeyId, kKeyId + arraysize(kKeyId));
   std::string cenc_sample_group_key_id(
       kCencSampleGroupKeyId,
       kCencSampleGroupKeyId + arraysize(kCencSampleGroupKeyId));
 
   for (size_t i = 0; i < kSampleToGroupTable[0].sample_count; ++i) {
     EXPECT_TRUE(iter_->is_encrypted());
     EXPECT_EQ(cenc_sample_group_key_id, iter_->GetDecryptConfig()->key_id());
@@ skipping 14 matching lines @@
   // The remaining samples should be associated with the default values
   // specified in TrackEncryption Box.
   EXPECT_TRUE(iter_->is_encrypted());
   EXPECT_EQ(track_encryption_key_id, iter_->GetDecryptConfig()->key_id());
 }
 
 // It is legal for aux info blocks to be shared among multiple formats.
 TEST_F(TrackRunIteratorTest, SharedAuxInfoTest) {
   AddEncryption(&moov_.tracks[0]);
   AddEncryption(&moov_.tracks[1]);
-  iter_.reset(new TrackRunIterator(&moov_, log_cb_));
+  iter_.reset(new TrackRunIterator(&moov_, media_log_));
 
   MovieFragment moof = CreateFragment();
   moof.tracks[0].runs.resize(1);
   AddAuxInfoHeaders(50, &moof.tracks[0]);
   AddAuxInfoHeaders(50, &moof.tracks[1]);
   moof.tracks[0].auxiliary_size.default_sample_info_size = 8;
 
   ASSERT_TRUE(iter_->Init(moof));
   EXPECT_EQ(iter_->track_id(), 1u);
   EXPECT_EQ(iter_->aux_info_offset(), 50);
@@ skipping 21 matching lines @@
 // unreasonable behavior demonstrated here:
 //  byte 50: track 2, run 1 aux info
 //  byte 100: track 1, run 1 data
 //  byte 200: track 2, run 1 data
 //  byte 201: track 1, run 2 aux info (*inside* track 2, run 1 data)
 //  byte 10000: track 1, run 2 data
 //  byte 20000: track 1, run 1 aux info
 TEST_F(TrackRunIteratorTest, UnexpectedOrderingTest) {
   AddEncryption(&moov_.tracks[0]);
   AddEncryption(&moov_.tracks[1]);
-  iter_.reset(new TrackRunIterator(&moov_, log_cb_));
+  iter_.reset(new TrackRunIterator(&moov_, media_log_));
 
   MovieFragment moof = CreateFragment();
   AddAuxInfoHeaders(20000, &moof.tracks[0]);
   moof.tracks[0].auxiliary_offset.offsets.push_back(201);
   moof.tracks[0].auxiliary_size.sample_count += 2;
   moof.tracks[0].auxiliary_size.default_sample_info_size = 8;
   moof.tracks[0].runs[1].sample_count = 2;
   AddAuxInfoHeaders(50, &moof.tracks[1]);
   moof.tracks[1].runs[0].sample_sizes[0] = 5;
 
@@ skipping 37 matching lines @@
   // that none of the samples should be random access points. If the
   // kSampleIsNonSyncSample flag is NOT set though, the sample should be
   // considered a random access point.
   moov_.tracks[1].media.information.sample_table.sync_sample.is_present = true;
   moov_.tracks[1].media.information.sample_table.sync_sample.entries.resize(0);
   moof.tracks[1].runs.resize(1);
   moof.tracks[1].runs[0].sample_count = 6;
   moof.tracks[1].runs[0].data_offset = 200;
   SetFlagsOnSamples("US UN OS ON NS NN", &moof.tracks[1].runs[0]);
 
-  iter_.reset(new TrackRunIterator(&moov_, log_cb_));
+  iter_.reset(new TrackRunIterator(&moov_, media_log_));
 
   ASSERT_TRUE(iter_->Init(moof));
   EXPECT_TRUE(iter_->IsRunValid());
 
   // Verify that all samples except for the ones that have the
   // kSampleIsNonSyncSample flag set are marked as random access points.
   EXPECT_EQ("1 KR P PR P KR K", KeyframeAndRAPInfo(iter_.get()));
 
   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