Detect frames from rotated devices in VideoTrackAdapter on Android.

content/renderer/media/media_stream_constraints_util.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_constraints_util.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/strings/string_number_conversions.h"
@@ skipping 194 matching lines @@
   if (GetConstraintValueAsBoolean(constraints, picker, &value)) {
     return rtc::Optional<bool>(value);
   }
   return rtc::Optional<bool>();
 }
 
 VideoTrackAdapterSettings SelectVideoTrackAdapterSettings(
     const blink::WebMediaTrackConstraintSet& basic_constraint_set,
     const ResolutionSet& resolution_set,
     const NumericRangeSet<double>& frame_rate_set,
-    const media::VideoCaptureFormat& source_format) {
+    const media::VideoCaptureFormat& source_format,
+    bool expect_source_native_size) {
   ResolutionSet::Point resolution = resolution_set.SelectClosestPointToIdeal(
       basic_constraint_set, source_format.frame_size.height(),
       source_format.frame_size.width());
   int track_max_height = static_cast<int>(std::round(resolution.height()));
   int track_max_width = static_cast<int>(std::round(resolution.width()));
   double track_min_aspect_ratio =
       std::max(resolution_set.min_aspect_ratio(),
                static_cast<double>(resolution_set.min_width()) /
                    static_cast<double>(resolution_set.max_height()));
   double track_max_aspect_ratio =
       std::min(resolution_set.max_aspect_ratio(),
                static_cast<double>(resolution_set.max_width()) /
                    static_cast<double>(resolution_set.min_height()));
   double track_max_frame_rate = frame_rate_set.Max();
   if (basic_constraint_set.frame_rate.HasIdeal()) {
     track_max_frame_rate = std::min(
         track_max_frame_rate, std::max(basic_constraint_set.frame_rate.Ideal(),
                                        frame_rate_set.Min()));
   }
   // VideoTrackAdapter uses a frame rate of 0.0 to disable frame-rate
   // adjustment.
   if (track_max_frame_rate >= source_format.frame_rate)
     track_max_frame_rate = 0.0;
 
+  base::Optional<gfx::Size> expected_native_size;
+  if (expect_source_native_size)
+    expected_native_size = source_format.frame_size;
+
   return VideoTrackAdapterSettings(
       track_max_width, track_max_height, track_min_aspect_ratio,
-      track_max_aspect_ratio, track_max_frame_rate);
+      track_max_aspect_ratio, track_max_frame_rate, expected_native_size);
 }
 
 }  // namespace content