Remove MediaFormat once and for all.

media/filters/adaptive_demuxer.cc

 // Copyright (c) 2011 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/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 147 matching lines @@
 }
 
 void AdaptiveDemuxerStream::DCheckSanity() {
   // We only carry out sanity checks in debug mode.
   if (!logging::DEBUG_MODE)
     return;
   DCHECK(streams_[current_stream_index_].get());
 
   bool non_null_stream_seen = false;
   Type type = DemuxerStream::UNKNOWN;
-  const MediaFormat* media_format = NULL;
   for (size_t i = 0; i < streams_.size(); ++i) {
     if (!streams_[i])
       continue;
 
     if (!non_null_stream_seen) {
       non_null_stream_seen = true;
       type = streams_[i]->type();
-      media_format = &streams_[i]->media_format();
     } else {
       DCHECK_EQ(streams_[i]->type(), type);
-      DCHECK(streams_[i]->media_format() == *media_format);
     }
   }
 }
 
 AdaptiveDemuxerStream::~AdaptiveDemuxerStream() {
   base::AutoLock auto_lock(lock_);
   current_stream_index_ = -1;
   streams_.clear();
 }
 
@@ skipping 26 matching lines @@
 }
 
 AVStream* AdaptiveDemuxerStream::GetAVStream() {
   return current_stream()->GetAVStream();
 }
 
 DemuxerStream::Type AdaptiveDemuxerStream::type() {
   return current_stream()->type();
 }
 
-const MediaFormat& AdaptiveDemuxerStream::media_format() {
-  return current_stream()->media_format();
-}
-
 void AdaptiveDemuxerStream::EnableBitstreamConverter() {
   {
     base::AutoLock auto_lock(lock_);
     bitstream_converter_enabled_ = true;
   }
   current_stream()->EnableBitstreamConverter();
 }
 
 void AdaptiveDemuxerStream::OnAdaptiveDemuxerSeek(base::TimeDelta seek_time) {
   base::AutoLock auto_lock(lock_);
@@ skipping 797 matching lines @@
     delete cb;
     return;
   }
   DemuxerAccumulator* accumulator = new DemuxerAccumulator(
       audio_index, video_index, urls.size(), cb);
   for (size_t i = 0; i < urls.size(); ++i)
     delegate_factory_->Build(urls[i], accumulator->GetNthCallback(i));
 }
 
 }  // namespace media