| Index: media/mp4/track_run_iterator.cc
|
| diff --git a/media/mp4/track_run_iterator.cc b/media/mp4/track_run_iterator.cc
|
| index 36ec206d66236271993ee2e9ca202b3c455d4ff0..5538562c071e711e2ed13089a3ef0cd36fc6b699 100644
|
| --- a/media/mp4/track_run_iterator.cc
|
| +++ b/media/mp4/track_run_iterator.cc
|
| @@ -62,10 +62,12 @@ TimeDelta TimeDeltaFromRational(int64 numer, int64 denom) {
|
| base::Time::kMicrosecondsPerSecond * numer / denom);
|
| }
|
|
|
| -TrackRunIterator::TrackRunIterator(const Movie* moov)
|
| - : moov_(moov), sample_offset_(0) {
|
| +TrackRunIterator::TrackRunIterator(const Movie* moov,
|
| + const LogCB& log_cb)
|
| + : moov_(moov), log_cb_(log_cb), sample_offset_(0) {
|
| CHECK(moov);
|
| }
|
| +
|
| TrackRunIterator::~TrackRunIterator() {}
|
|
|
| static void PopulateSampleInfo(const TrackExtends& trex,
|
| @@ -430,7 +432,7 @@ scoped_ptr<DecryptConfig> TrackRunIterator::GetDecryptConfig() {
|
| if (!cenc_info.subsamples.empty() &&
|
| (cenc_info.GetTotalSizeOfSubsamples() !=
|
| static_cast<size_t>(sample_size()))) {
|
| - DVLOG(1) << "Incorrect CENC subsample size.";
|
| + MEDIA_LOG(log_cb_) << "Incorrect CENC subsample size.";
|
| return scoped_ptr<DecryptConfig>();
|
| }
|
|
|
|
|