Remove VideoDecoder::natural_size() & added VideoFrame::natural_size().

media/filters/ffmpeg_video_decoder.h

 // Copyright (c) 2012 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 "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/decryptor.h"
@@ skipping 13 matching lines @@
  public:
   FFmpegVideoDecoder(const base::Callback<MessageLoop*()>& message_loop_cb);
 
   // VideoDecoder implementation.
   virtual void Initialize(const scoped_refptr<DemuxerStream>& stream,
                           const PipelineStatusCB& status_cb,
                           const StatisticsCB& statistics_cb) OVERRIDE;
   virtual void Read(const ReadCB& read_cb) OVERRIDE;
   virtual void Reset(const base::Closure& closure) OVERRIDE;
   virtual void Stop(const base::Closure& closure) OVERRIDE;
-  virtual const gfx::Size& natural_size() OVERRIDE;
 
   // Must be called prior to initialization if decrypted buffers will be
   // encountered.
   void set_decryptor(Decryptor* decryptor);
 
   // Callback called from within FFmpeg to allocate a buffer based on
   // the dimensions of |codec_context|. See AVCodecContext.get_buffer
   // documentation inside FFmpeg.
   int GetVideoBuffer(AVCodecContext *codec_context, AVFrame* frame);
 
@@ skipping 55 matching lines @@
   StatisticsCB statistics_cb_;
 
   ReadCB read_cb_;
   base::Closure reset_cb_;
   base::Closure stop_cb_;
 
   // FFmpeg structures owned by this object.
   AVCodecContext* codec_context_;
   AVFrame* av_frame_;
 
-  // Frame rate of the video.
-  int frame_rate_numerator_;
-  int frame_rate_denominator_;

[acolwell GONE FROM CHROMIUM, 2012/08/01 23:58:13]

Missed these on my last CL.

-
-  // TODO(scherkus): I think this should be calculated by VideoRenderers based
-  // on information provided by VideoDecoders (i.e., aspect ratio).
+  // Natural size for the last VideoDecoderConfig received.

[Ami GONE FROM CHROMIUM, 2012/08/02 00:16:14]

Why does this get to live?

[acolwell GONE FROM CHROMIUM, 2012/08/02 02:16:30]

Removed.

   gfx::Size natural_size_;
 
   // Pointer to the demuxer stream that will feed us compressed buffers.
   scoped_refptr<DemuxerStream> demuxer_stream_;
 
   Decryptor* decryptor_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_