Detect frames from rotated devices in VideoTrackAdapter on Android.

content/renderer/media/media_stream_video_source.cc

 // Copyright 2014 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 "content/renderer/media/media_stream_video_source.h"
 
 #include <algorithm>
 #include <limits>
 #include <memory>
 #include <string>
@@ skipping 626 matching lines @@
                                      &max_aspect_ratio);
       double max_frame_rate = 0.0f;
       // Note: Optional and ideal constraints are ignored; this is
       // purely a hard max limit.
       if (track.constraints.Basic().frame_rate.HasMax())
         max_frame_rate = track.constraints.Basic().frame_rate.Max();
 
       track_adapter_->AddTrack(
           track.track, track.frame_callback,
           VideoTrackAdapterSettings(max_width, max_height, min_aspect_ratio,
-                                    max_aspect_ratio, max_frame_rate));
+                                    max_aspect_ratio, max_frame_rate,
+                                    base::Optional<gfx::Size>()));
       // Calculate resulting frame size if the source delivers frames
       // according to the current format. Note: Format may change later.
       gfx::Size desired_size;
       VideoTrackAdapter::CalculateTargetSize(
-          current_format_.frame_size, gfx::Size(max_width, max_height),
-          min_aspect_ratio, max_aspect_ratio, &desired_size);
+          false /* is_rotated */, current_format_.frame_size,
+          gfx::Size(max_width, max_height), min_aspect_ratio, max_aspect_ratio,
+          &desired_size);
       track.track->SetTargetSizeAndFrameRate(
           desired_size.width(), desired_size.height(), max_frame_rate);
     }
 
     DVLOG(3) << "FinalizeAddTrackLegacy() result " << result;
 
     if (!track.callback.is_null())
       track.callback.Run(this, result,
                          blink::WebString::FromUTF8(unsatisfied_constraint));
   }
@@ skipping 10 matching lines @@
       result = MEDIA_DEVICE_TRACK_START_FAILURE;
 
     if (result == MEDIA_DEVICE_OK) {
       track_adapter_->AddTrack(track.track, track.frame_callback,
                                *track.adapter_settings);
 
       // Calculate resulting frame size if the source delivers frames
       // according to the current format. Note: Format may change later.
       gfx::Size desired_size;
       VideoTrackAdapter::CalculateTargetSize(
+          false /* is_rotated */,
           GetCurrentFormat() ? GetCurrentFormat()->frame_size
                              : gfx::Size(track.adapter_settings->max_width,
                                          track.adapter_settings->max_height),
           gfx::Size(track.adapter_settings->max_width,
                     track.adapter_settings->max_height),
           track.adapter_settings->min_aspect_ratio,
           track.adapter_settings->max_aspect_ratio, &desired_size);
       track.track->SetTargetSizeAndFrameRate(
           desired_size.width(), desired_size.height(),
           track.adapter_settings->max_frame_rate);
@@ skipping 51 matching lines @@
 MediaStreamVideoSource::TrackDescriptor::TrackDescriptor(
     TrackDescriptor&& other) = default;
 MediaStreamVideoSource::TrackDescriptor&
 MediaStreamVideoSource::TrackDescriptor::operator=(
     MediaStreamVideoSource::TrackDescriptor&& other) = default;
 
 MediaStreamVideoSource::TrackDescriptor::~TrackDescriptor() {
 }
 
 }  // namespace content