Remove MediaFormat once and for all.

media/filters/adaptive_demuxer.h

 // 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.
 
 // Implements a Demuxer that can switch among different data sources mid-stream.
 // Uses FFmpegDemuxer under the covers, so see the caveats at the top of
 // ffmpeg_demuxer.h.
 
 #ifndef MEDIA_FILTERS_ADAPTIVE_DEMUXER_H_
 #define MEDIA_FILTERS_ADAPTIVE_DEMUXER_H_
 
 #include <deque>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/synchronization/lock.h"
 #include "media/base/buffers.h"
 #include "media/base/filter_factories.h"
 #include "media/base/filters.h"
 #include "media/base/pipeline.h"
-#include "media/base/media_format.h"
 
 namespace media {
 
 class AdaptiveDemuxer;
 class StreamSwitchManager;
 
 class AdaptiveDemuxerStream : public DemuxerStream {
  public:
   typedef std::vector<scoped_refptr<DemuxerStream> > StreamVector;
   typedef std::deque<ReadCallback> ReadCBQueue;
@@ skipping 11 matching lines @@
   // than the requested time.
   typedef base::Callback<void(base::TimeDelta, PipelineStatus)> SeekFunctionCB;
 
   // Wraps a function that performs a seek on a specified stream. The
   // base::TimeDelta parameter indicates what time to seek to. The
   // SeekFunctionCBparameter specifies the callback we want called when the seek
   // completes.
   typedef base::Callback<void(base::TimeDelta, SeekFunctionCB)> SeekFunction;
 
   // Keeps references to the passed-in streams.  |streams| must be non-empty and
-  // all the streams in it must agree on type and media_format (or be NULL).
+  // all the streams in it must agree on type.
+  //
   // |initial_stream| must be a valid index into |streams| and specifies the
   // current stream on construction.
   AdaptiveDemuxerStream(StreamVector const& streams, int initial_stream);
   virtual ~AdaptiveDemuxerStream();
 
   // Notifies this stream that a Seek() was requested on the demuxer.
   void OnAdaptiveDemuxerSeek(base::TimeDelta seek_time);
 
   // Change the stream to satisfy subsequent Read() requests from.  The
   // referenced pointer must not be NULL. The SeekFunction parameter
   // provides a way to seek |streams_[index]| to a specific time.
   void ChangeCurrentStream(int index, const SeekFunction& seek_function,
                            const PipelineStatusCB& cb);
 
   // DemuxerStream methods.
   virtual void Read(const ReadCallback& read_callback);
   virtual Type type();
-  virtual const MediaFormat& media_format();
   virtual void EnableBitstreamConverter();
   virtual AVStream* GetAVStream();
 
  private:
   // Returns a pointer to the current stream.
   DemuxerStream* current_stream();
 
   // DEBUG_MODE-only CHECK that the data members are in a reasonable state.
   void DCheckSanity();
 
@@ skipping 175 matching lines @@
 
  private:
   scoped_ptr<DemuxerFactory> delegate_factory_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(AdaptiveDemuxerFactory);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_ADAPTIVE_DEMUXER_H_