Reland r101418: Fix aspect ratio and clarify video frame dimensions

media/base/composite_filter.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_BASE_COMPOSITE_FILTER_H_
 #define MEDIA_BASE_COMPOSITE_FILTER_H_
 
 #include <vector>
 
 #include "base/task.h"
 #include "media/base/filter_host.h"
 #include "media/base/filters.h"
 
 class MessageLoop;
 
 namespace media {
 
 class MEDIA_EXPORT CompositeFilter : public Filter {
  public:
   explicit CompositeFilter(MessageLoop* message_loop);
 
   // Adds a filter to the composite. This is only allowed after set_host()
   // is called and before the first state changing operation such as Play(),
   // Flush(), Stop(), or Seek(). True is returned if the filter was successfully
   // added to the composite. False is returned if the filter couldn't be added
   // because the composite is in the wrong state.
   bool AddFilter(scoped_refptr<Filter> filter);
 
   // media::Filter methods.
-  virtual void set_host(FilterHost* host);
-  virtual FilterHost* host();
-  virtual void Play(FilterCallback* play_callback);
-  virtual void Pause(FilterCallback* pause_callback);
-  virtual void Flush(FilterCallback* flush_callback);
-  virtual void Stop(FilterCallback* stop_callback);
-  virtual void SetPlaybackRate(float playback_rate);
-  virtual void Seek(base::TimeDelta time, const FilterStatusCB& seek_cb);
-  virtual void OnAudioRendererDisabled();
+  virtual void set_host(FilterHost* host) OVERRIDE;
+  virtual FilterHost* host() OVERRIDE;
+  virtual void Play(FilterCallback* play_callback) OVERRIDE;
+  virtual void Pause(FilterCallback* pause_callback) OVERRIDE;
+  virtual void Flush(FilterCallback* flush_callback) OVERRIDE;
+  virtual void Stop(FilterCallback* stop_callback) OVERRIDE;
+  virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
+  virtual void Seek(
+      base::TimeDelta time, const FilterStatusCB& seek_cb) OVERRIDE;
+  virtual void OnAudioRendererDisabled() OVERRIDE;
 
  protected:
   virtual ~CompositeFilter();
 
   void SetError(PipelineStatus error);
 
  private:
   class FilterHostImpl;
 
   enum State {
@@ skipping 95 matching lines @@
   PipelineStatus status_;
 
   scoped_ptr<ScopedRunnableMethodFactory<CompositeFilter> > runnable_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositeFilter);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_COMPOSITE_FILTER_H_