Reland r101418: Fix aspect ratio and clarify video frame dimensions

media/base/pipeline_impl.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.
 //
 // TODO(scherkus): clean up PipelineImpl... too many crazy function names,
 // potential deadlocks, etc...
 
 #include "media/base/pipeline_impl.h"
 
 #include <algorithm>
@@ skipping 292 matching lines @@
 int64 PipelineImpl::GetBufferedBytes() const {
   base::AutoLock auto_lock(lock_);
   return buffered_bytes_;
 }
 
 int64 PipelineImpl::GetTotalBytes() const {
   base::AutoLock auto_lock(lock_);
   return total_bytes_;
 }
 
-void PipelineImpl::GetVideoSize(size_t* width_out, size_t* height_out) const {
-  CHECK(width_out);
-  CHECK(height_out);
+void PipelineImpl::GetNaturalVideoSize(gfx::Size* out_size) const {
+  CHECK(out_size);
   base::AutoLock auto_lock(lock_);
-  *width_out = video_width_;
-  *height_out = video_height_;
+  *out_size = natural_size_;
 }
 
 bool PipelineImpl::IsStreaming() const {
   base::AutoLock auto_lock(lock_);
   return streaming_;
 }
 
 bool PipelineImpl::IsLoaded() const {
   base::AutoLock auto_lock(lock_);
   return loaded_;
@@ skipping 35 matching lines @@
   seek_pending_     = false;
   tearing_down_     = false;
   error_caused_teardown_ = false;
   playback_rate_change_pending_ = false;
   duration_         = kZero;
   buffered_time_    = kZero;
   buffered_bytes_   = 0;
   streaming_        = false;
   loaded_           = false;
   total_bytes_      = 0;
-  video_width_      = 0;
-  video_height_     = 0;
+  natural_size_.SetSize(0, 0);
   volume_           = 1.0f;
   preload_          = AUTO;
   playback_rate_    = 0.0f;
   pending_playback_rate_ = 0.0f;
   status_           = PIPELINE_OK;
   has_audio_        = false;
   has_video_        = false;
   waiting_for_clock_update_ = false;
   audio_disabled_   = false;
   clock_->SetTime(kZero);
@@ skipping 143 matching lines @@
 void PipelineImpl::SetBufferedBytes(int64 buffered_bytes) {
   DCHECK(IsRunning());
   base::AutoLock auto_lock(lock_);
 
   // See comments in SetCurrentReadPosition() about capping.
   if (buffered_bytes < current_bytes_)
     current_bytes_ = buffered_bytes;
   buffered_bytes_ = buffered_bytes;
 }
 
-void PipelineImpl::SetVideoSize(size_t width, size_t height) {
+void PipelineImpl::SetNaturalVideoSize(const gfx::Size& size) {
   DCHECK(IsRunning());
-  media_log_->AddEvent(media_log_->CreateVideoSizeSetEvent(width, height));
+  media_log_->AddEvent(media_log_->CreateVideoSizeSetEvent(
+      size.width(), size.height()));
 
   base::AutoLock auto_lock(lock_);
-  video_width_ = width;
-  video_height_ = height;
+  natural_size_ = size;
 }
 
 void PipelineImpl::SetStreaming(bool streaming) {
   DCHECK(IsRunning());
   media_log_->AddEvent(
       media_log_->CreateBooleanEvent(
           MediaLogEvent::STREAMING_SET, "streaming", streaming));
 
   base::AutoLock auto_lock(lock_);
   streaming_ = streaming;
@@ skipping 813 matching lines @@
 
   if (status == PIPELINE_OK && pipeline_filter_) {
     pipeline_filter_->Seek(seek_timestamp, done_cb);
     return;
   }
 
   done_cb.Run(status);
 }
 
 }  // namespace media