Clean-up: media::PipelineMetadata stores the rotated video size.

media/remoting/remoting_renderer_controller.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/remoting/remoting_renderer_controller.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/threading/thread_checker.h"
 #include "media/remoting/remoting_cdm_context.h"
 
 namespace media {
 
-namespace {
-
-gfx::Size GetRotatedVideoSize(VideoRotation rotation, gfx::Size natural_size) {
-  if (rotation == VIDEO_ROTATION_90 || rotation == VIDEO_ROTATION_270)
-    return gfx::Size(natural_size.height(), natural_size.width());
-  return natural_size;
-}
-
-}  // namespace
-
 RemotingRendererController::RemotingRendererController(
     scoped_refptr<RemotingSourceImpl> remoting_source)
     : remoting_source_(remoting_source), weak_factory_(this) {
   remoting_source_->AddClient(this);
 }
 
 RemotingRendererController::~RemotingRendererController() {
   DCHECK(thread_checker_.CalledOnValidThread());
   remoting_source_->RemoveClient(this);
 }
@@ skipping 132 matching lines @@
 }
 
 void RemotingRendererController::OnMetadataChanged(
     const PipelineMetadata& metadata) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   const gfx::Size old_size = pipeline_metadata_.natural_size;
   pipeline_metadata_ = metadata;
 
   is_encrypted_ = false;
-  if (has_video()) {
+  if (has_video())
     is_encrypted_ |= metadata.video_decoder_config.is_encrypted();
-    pipeline_metadata_.natural_size = GetRotatedVideoSize(
-        pipeline_metadata_.video_rotation, pipeline_metadata_.natural_size);
-  }
-  if (has_audio()) {
+  if (has_audio())
     is_encrypted_ |= metadata.audio_decoder_config.is_encrypted();
-  }
 
   if (pipeline_metadata_.natural_size != old_size)
     UpdateInterstitial(base::nullopt);
 
   UpdateAndMaybeSwitch();
 }
 
 bool RemotingRendererController::IsVideoCodecSupported() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(has_video());
@@ skipping 201 matching lines @@
     const GURL& download_url,
     const SkBitmap& image) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (download_url != poster_url_)
     return;  // The poster image URL has changed during the download.
   UpdateInterstitial(image);
 }
 
 }  // namespace media