Remove MediaFormat once and for all.

media/filters/chunk_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.
 
 // 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.
 
 #include "media/filters/chunk_demuxer.h"
 
@@ skipping 62 matching lines @@
   bool CanAddBuffers(const BufferQueue& buffers) const;
 
   void AddBuffers(const BufferQueue& buffers);
   void Shutdown();
 
   bool GetLastBufferTimestamp(base::TimeDelta* timestamp) const;
 
   // DemuxerStream methods.
   virtual void Read(const ReadCallback& read_callback);
   virtual Type type();
-  virtual const MediaFormat& media_format();
   virtual void EnableBitstreamConverter();
   virtual AVStream* GetAVStream();
 
  private:
   static void RunCallback(ReadCallback cb, scoped_refptr<Buffer> buffer);
 
   Type type_;
-  MediaFormat media_format_;
   AVStream* av_stream_;
 
   mutable base::Lock lock_;
   ReadCBQueue read_cbs_;
   BufferQueue buffers_;
   bool shutdown_called_;
 
   // Keeps track of the timestamp of the last buffer we have
   // added to |buffers_|. This is used to enforce buffers with strictly
   // monotonically increasing timestamps.
@@ skipping 151 matching lines @@
       buffer = buffers_.front();
       buffers_.pop_front();
     }
   }
 
   read_callback.Run(buffer);
 }
 
 DemuxerStream::Type ChunkDemuxerStream::type() { return type_; }
 
-const MediaFormat& ChunkDemuxerStream::media_format() { return media_format_; }
-
 void ChunkDemuxerStream::EnableBitstreamConverter() {}
 
 AVStream* ChunkDemuxerStream::GetAVStream() { return av_stream_; }
 
 ChunkDemuxer::ChunkDemuxer()
     : state_(WAITING_FOR_INIT),
       format_context_(NULL),
       buffered_bytes_(0),
       seek_waits_for_data_(true) {
 }
@@ skipping 368 matching lines @@
 }
 
 void ChunkDemuxer::InitFailed_Locked() {
   ChangeState(INIT_ERROR);
   PipelineStatusCB cb;
   std::swap(cb, init_cb_);
   cb.Run(DEMUXER_ERROR_COULD_NOT_OPEN);
 }
 
 }  // namespace media