Reland r101418: Fix aspect ratio and clarify video frame dimensions

media/base/composite_filter.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.
 
 #include "media/base/composite_filter.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "media/base/callback.h"
 
 namespace media {
 
 class CompositeFilter::FilterHostImpl : public FilterHost {
  public:
   FilterHostImpl(CompositeFilter* parent, FilterHost* host);
 
   FilterHost* host();
 
   // media::FilterHost methods.
-  virtual void SetError(PipelineStatus error);
-  virtual base::TimeDelta GetTime() const;
-  virtual base::TimeDelta GetDuration() const;
-  virtual void SetTime(base::TimeDelta time);
-  virtual void SetDuration(base::TimeDelta duration);
-  virtual void SetBufferedTime(base::TimeDelta buffered_time);
-  virtual void SetTotalBytes(int64 total_bytes);
-  virtual void SetBufferedBytes(int64 buffered_bytes);
-  virtual void SetVideoSize(size_t width, size_t height);
-  virtual void SetStreaming(bool streaming);
-  virtual void NotifyEnded();
-  virtual void SetLoaded(bool loaded);
-  virtual void SetNetworkActivity(bool network_activity);
-  virtual void DisableAudioRenderer();
-  virtual void SetCurrentReadPosition(int64 offset);
-  virtual int64 GetCurrentReadPosition();
+  virtual void SetError(PipelineStatus error) OVERRIDE;
+  virtual base::TimeDelta GetTime() const OVERRIDE;
+  virtual base::TimeDelta GetDuration() const OVERRIDE;
+  virtual void SetTime(base::TimeDelta time) OVERRIDE;
+  virtual void SetDuration(base::TimeDelta duration) OVERRIDE;
+  virtual void SetBufferedTime(base::TimeDelta buffered_time) OVERRIDE;
+  virtual void SetTotalBytes(int64 total_bytes) OVERRIDE;
+  virtual void SetBufferedBytes(int64 buffered_bytes) OVERRIDE;
+  virtual void SetNaturalVideoSize(const gfx::Size& size) OVERRIDE;
+  virtual void SetStreaming(bool streaming) OVERRIDE;
+  virtual void NotifyEnded() OVERRIDE;
+  virtual void SetLoaded(bool loaded) OVERRIDE;
+  virtual void SetNetworkActivity(bool network_activity) OVERRIDE;
+  virtual void DisableAudioRenderer() OVERRIDE;
+  virtual void SetCurrentReadPosition(int64 offset) OVERRIDE;
+  virtual int64 GetCurrentReadPosition() OVERRIDE;
 
  private:
   CompositeFilter* parent_;
   FilterHost* host_;
 
   DISALLOW_COPY_AND_ASSIGN(FilterHostImpl);
 };
 
 CompositeFilter::CompositeFilter(MessageLoop* message_loop)
     : state_(kCreated),
@@ skipping 472 matching lines @@
 }
 
 void CompositeFilter::FilterHostImpl::SetTotalBytes(int64 total_bytes) {
   host_->SetTotalBytes(total_bytes);
 }
 
 void CompositeFilter::FilterHostImpl::SetBufferedBytes(int64 buffered_bytes) {
   host_->SetBufferedBytes(buffered_bytes);
 }
 
-void CompositeFilter::FilterHostImpl::SetVideoSize(size_t width,
-                                                   size_t height) {
-  host_->SetVideoSize(width, height);
+void CompositeFilter::FilterHostImpl::SetNaturalVideoSize(
+    const gfx::Size& size) {
+  host_->SetNaturalVideoSize(size);
 }
 
 void CompositeFilter::FilterHostImpl::SetStreaming(bool streaming) {
   host_->SetStreaming(streaming);
 }
 
 void CompositeFilter::FilterHostImpl::NotifyEnded() {
   host_->NotifyEnded();
 }
 
@@ skipping 12 matching lines @@
 
 void CompositeFilter::FilterHostImpl::SetCurrentReadPosition(int64 offset) {
   host_->SetCurrentReadPosition(offset);
 }
 
 int64 CompositeFilter::FilterHostImpl::GetCurrentReadPosition() {
   return host_->GetCurrentReadPosition();
 }
 
 }  // namespace media