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

media/base/pipeline_impl.cc

 // Copyright (c) 2012 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/pipeline_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 16 matching lines @@
 #include "media/base/text_renderer.h"
 #include "media/base/text_track_config.h"
 #include "media/base/timestamp_constants.h"
 #include "media/base/video_decoder_config.h"
 
 static const double kDefaultPlaybackRate = 0.0;
 static const float kDefaultVolume = 1.0f;
 
 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
+
 class PipelineImpl::RendererWrapper : public DemuxerHost,
                                       public RendererClient {
  public:
   RendererWrapper(scoped_refptr<base::SingleThreadTaskRunner> media_task_runner,
                   scoped_refptr<MediaLog> media_log);
   ~RendererWrapper() final;
 
   void Start(Demuxer* demuxer,
              std::unique_ptr<Renderer> renderer,
              std::unique_ptr<TextRenderer> text_renderer,
@@ skipping 840 matching lines @@
 
   PipelineMetadata metadata;
   DemuxerStream* stream;
 
   switch (demuxer_->GetType()) {
     case DemuxerStreamProvider::Type::STREAM:
       metadata.timeline_offset = demuxer_->GetTimelineOffset();
       stream = demuxer_->GetStream(DemuxerStream::VIDEO);
       if (stream) {
         metadata.has_video = true;
-        metadata.natural_size = stream->video_decoder_config().natural_size();
+        metadata.natural_size =
+            GetRotatedVideoSize(stream->video_rotation(),
+                                stream->video_decoder_config().natural_size());
         metadata.video_rotation = stream->video_rotation();
         metadata.video_decoder_config = stream->video_decoder_config();
       }
       stream = demuxer_->GetStream(DemuxerStream::AUDIO);
       if (stream) {
         metadata.has_audio = true;
         metadata.audio_decoder_config = stream->audio_decoder_config();
       }
       break;
 
@@ skipping 413 matching lines @@
 void PipelineImpl::OnSuspendDone() {
   DVLOG(3) << __func__;
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(IsRunning());
 
   DCHECK(!suspend_cb_.is_null());
   base::ResetAndReturn(&suspend_cb_).Run(PIPELINE_OK);
 }
 
 }  // namespace media