Replace VideoDecoder::media_format() with significantly simpler width()/height() methods.

media/filters/ffmpeg_video_decoder.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.
 
 #ifndef MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
 
 #include <deque>
 
 #include "base/gtest_prod_util.h"
@@ skipping 19 matching lines @@
   // Filter implementation.
   virtual void Stop(FilterCallback* callback);
   virtual void Seek(base::TimeDelta time, const FilterStatusCB& cb);
   virtual void Pause(FilterCallback* callback);
   virtual void Flush(FilterCallback* callback);
 
   // Decoder implementation.
   virtual void Initialize(DemuxerStream* demuxer_stream,
                           FilterCallback* callback,
                           StatisticsCallback* stats_callback);
-  virtual const MediaFormat& media_format();
   virtual void ProduceVideoFrame(scoped_refptr<VideoFrame> video_frame);
   virtual bool ProvidesBuffer();
+  virtual int width();
+  virtual int height();
 
  private:
   // VideoDecodeEngine::EventHandler interface.
   virtual void OnInitializeComplete(const VideoCodecInfo& info);
   virtual void OnUninitializeComplete();
   virtual void OnFlushComplete();
   virtual void OnSeekComplete();
   virtual void OnError();
   virtual void OnFormatChange(VideoStreamInfo stream_info);
   virtual void ProduceVideoSample(scoped_refptr<Buffer> buffer);
@@ skipping 31 matching lines @@
   void OnReadCompleteTask(scoped_refptr<Buffer> buffer);
 
   // Flush the output buffers that we had held in Paused state.
   void FlushBuffers();
 
   // Injection point for unittest to provide a mock engine.  Takes ownership of
   // the provided engine.
   virtual void SetVideoDecodeEngineForTest(VideoDecodeEngine* engine);
 
   MessageLoop* message_loop_;
-  MediaFormat media_format_;
 
   PtsStream pts_stream_;  // Stream of presentation timestamps.
   DecoderState state_;
   scoped_ptr<VideoDecodeEngine> decode_engine_;
   scoped_ptr<VideoDecodeContext> decode_context_;
 
   scoped_ptr<FilterCallback> initialize_callback_;
   scoped_ptr<FilterCallback> uninitialize_callback_;
   scoped_ptr<FilterCallback> flush_callback_;
   FilterStatusCB seek_cb_;
   scoped_ptr<StatisticsCallback> statistics_callback_;
 
   // Hold video frames when flush happens.
   std::deque<scoped_refptr<VideoFrame> > frame_queue_flushed_;
 
   VideoCodecInfo info_;
 
   // Pointer to the demuxer stream that will feed us compressed buffers.
   scoped_refptr<DemuxerStream> demuxer_stream_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_