Merge to M53: Account for video rotation in OnVideoNaturalSizeChange()

media/blink/webmediaplayer_impl_unittest.cc

 // Copyright 2016 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/blink/webmediaplayer_impl.h"
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "media/base/media_log.h"
 #include "media/base/test_helpers.h"
 #include "media/blink/mock_webframeclient.h"
 #include "media/blink/webmediaplayer_delegate.h"
 #include "media/blink/webmediaplayer_params.h"
 #include "media/renderers/default_renderer_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"
 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
+#include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/web/WebFrameClient.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "url/gurl.h"
 
 namespace media {
 
 int64_t OnAdjustAllocatedMemory(int64_t delta) {
   return 0;
 }
@@ skipping 94 matching lines @@
   void SetEnded(bool is_ended) { wmpi_->ended_ = is_ended; }
   void SetFullscreen(bool is_fullscreen) { wmpi_->fullscreen_ = is_fullscreen; }
 
   void SetMetadata(bool has_audio, bool has_video) {
     wmpi_->SetNetworkState(blink::WebMediaPlayer::NetworkStateLoaded);
     wmpi_->SetReadyState(blink::WebMediaPlayer::ReadyStateHaveMetadata);
     wmpi_->pipeline_metadata_.has_audio = has_audio;
     wmpi_->pipeline_metadata_.has_video = has_video;
   }
 
+  void OnMetadata(PipelineMetadata metadata) { wmpi_->OnMetadata(metadata); }
+
+  void OnVideoNaturalSizeChange(const gfx::Size& size) {
+    wmpi_->OnVideoNaturalSizeChange(size);
+  }
+
   WebMediaPlayerImpl::PlayState ComputePlayState() {
     wmpi_->is_idle_ = false;
     wmpi_->must_suspend_ = false;
     return wmpi_->UpdatePlayState_ComputePlayState(false, false, false);
   }
 
   WebMediaPlayerImpl::PlayState ComputePlayStateSuspended() {
     wmpi_->is_idle_ = false;
     wmpi_->must_suspend_ = false;
     return wmpi_->UpdatePlayState_ComputePlayState(false, true, false);
@@ skipping 277 matching lines @@
   EXPECT_FALSE(state.is_memory_reporting_enabled);
   EXPECT_FALSE(state.is_suspended);
 
   SetPaused(false);
   state = ComputePlayStateSuspended();
   EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state);
   EXPECT_TRUE(state.is_memory_reporting_enabled);
   EXPECT_FALSE(state.is_suspended);
 }
 
+TEST_F(WebMediaPlayerImplTest, NaturalSizeChange) {
+  PipelineMetadata metadata;
+  metadata.has_video = true;
+  metadata.natural_size = gfx::Size(320, 240);
+
+  OnMetadata(metadata);
+  ASSERT_EQ(blink::WebSize(320, 240), wmpi_->naturalSize());
+
+  // TODO(sandersd): Verify that the client is notified of the size change?
+  OnVideoNaturalSizeChange(gfx::Size(1920, 1080));
+  ASSERT_EQ(blink::WebSize(1920, 1080), wmpi_->naturalSize());
+}
+
+TEST_F(WebMediaPlayerImplTest, NaturalSizeChange_Rotated) {
+  PipelineMetadata metadata;
+  metadata.has_video = true;
+  metadata.natural_size = gfx::Size(320, 240);
+  metadata.video_rotation = VIDEO_ROTATION_90;
+
+  // For 90/270deg rotations, the natural size should be transposed.
+  OnMetadata(metadata);
+  ASSERT_EQ(blink::WebSize(240, 320), wmpi_->naturalSize());
+
+  OnVideoNaturalSizeChange(gfx::Size(1920, 1080));
+  ASSERT_EQ(blink::WebSize(1080, 1920), wmpi_->naturalSize());
+}
+
 }  // namespace media