Remove MediaFormat once and for all.

media/filters/ffmpeg_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 the Demuxer interface using FFmpeg's libavformat.  At this time
 // will support demuxing any audio/video format thrown at it.  The streams
 // output mime types audio/x-ffmpeg and video/x-ffmpeg and include an integer
 // key FFmpegCodecID which contains the CodecID enumeration value.  The CodecIDs
 // can be used to create and initialize the corresponding FFmpeg decoder.
 //
@@ skipping 13 matching lines @@
 
 #include <deque>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "media/base/buffers.h"
 #include "media/base/filters.h"
 #include "media/base/pipeline.h"
-#include "media/base/media_format.h"
 #include "media/filters/ffmpeg_glue.h"
 
 // FFmpeg forward declarations.
 struct AVFormatContext;
 struct AVPacket;
 struct AVRational;
 struct AVStream;
 
 namespace media {
 
@@ skipping 21 matching lines @@
   virtual void FlushBuffers();
 
   // Empties the queues and ignores any additional calls to Read().
   virtual void Stop();
 
   // Returns the duration of this stream.
   virtual base::TimeDelta duration();
 
   // DemuxerStream implementation.
   virtual Type type();
-  virtual const MediaFormat& media_format();
 
   // If |buffer_queue_| is not empty will execute on caller's thread, otherwise
   // will post ReadTask to execute on demuxer's thread. Read will acquire
   // |lock_| for the life of the function so that means |read_callback| must
   // not make calls into FFmpegDemuxerStream directly or that may cause a
   // deadlock. |read_callback| should execute as quickly as possible because
   // |lock_| is held throughout the life of the callback.
   virtual void Read(const ReadCallback& read_callback);
   // Bitstream converter to convert input packet.
   virtual void EnableBitstreamConverter();
@@ skipping 10 matching lines @@
   // acquire |lock_| before calling this function.
   void FulfillPendingRead();
 
   // Converts an FFmpeg stream timestamp into a base::TimeDelta.
   static base::TimeDelta ConvertStreamTimestamp(const AVRational& time_base,
                                                 int64 timestamp);
 
   FFmpegDemuxer* demuxer_;
   AVStream* stream_;
   Type type_;
-  MediaFormat media_format_;
   base::TimeDelta duration_;
   bool discontinuous_;
   bool stopped_;
 
   typedef std::deque<scoped_refptr<Buffer> > BufferQueue;
   BufferQueue buffer_queue_;
 
   typedef std::deque<ReadCallback> ReadQueue;
   ReadQueue read_queue_;
 
@@ skipping 139 matching lines @@
   // starting clock value to match the timestamps in the media file. Default
   // is 0.
   base::TimeDelta start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_DEMUXER_H_