Detect frames from rotated devices in VideoTrackAdapter on Android.

content/renderer/media/video_track_adapter.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_VIDEO_TRACK_ADAPTER_H_
 #define CONTENT_RENDERER_MEDIA_VIDEO_TRACK_ADAPTER_H_
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "content/renderer/media/media_stream_video_track.h"
 #include "media/base/video_frame.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace content {
 
 struct CONTENT_EXPORT VideoTrackAdapterSettings {
   VideoTrackAdapterSettings();
-  VideoTrackAdapterSettings(int max_width,
-                            int max_height,
-                            double min_aspect_ratio,
-                            double max_aspect_ratio,
-                            double max_frame_rate);
+  VideoTrackAdapterSettings(
+      int max_width,
+      int max_height,
+      double min_aspect_ratio,
+      double max_aspect_ratio,
+      double max_frame_rate,
+      const base::Optional<gfx::Size>& expected_native_resolution);
+  VideoTrackAdapterSettings(const VideoTrackAdapterSettings& other);
+  VideoTrackAdapterSettings& operator=(const VideoTrackAdapterSettings& other);
   int max_width;
   int max_height;
   double min_aspect_ratio;
   double max_aspect_ratio;
   double max_frame_rate;
+  // If supplied, this can be used to detect frames from a rotated device.
+  base::Optional<gfx::Size> expected_native_size;
 };
 
 // VideoTrackAdapter is a helper class used by MediaStreamVideoSource used for
 // adapting the video resolution from a source implementation to the resolution
 // a track requires. Different tracks can have different resolution constraints.
 // The constraints can be set as max width and height as well as max and min
 // aspect ratio.
 // Video frames are delivered to a track using a VideoCaptureDeliverFrameCB on
 // the IO-thread.
 // Adaptations is done by wrapping the original media::VideoFrame in a new
@@ skipping 27 matching lines @@
     return io_task_runner_.get();
   }
 
   // Start monitor that frames are delivered to this object. I.E, that
   // |DeliverFrameOnIO| is called with a frame rate of |source_frame_rate|.
   // |on_muted_callback| is triggered on the main render thread.
   void StartFrameMonitoring(double source_frame_rate,
                             const OnMutedCallback& on_muted_callback);
   void StopFrameMonitoring();
 
-  static void CalculateTargetSize(const gfx::Size& input_size,
+  static void CalculateTargetSize(bool is_rotated,
+                                  const gfx::Size& input_size,
                                   const gfx::Size& max_frame_size,
                                   double min_aspect_ratio,
                                   double max_aspect_ratio,
                                   gfx::Size* desired_size);
 
  private:
   virtual ~VideoTrackAdapter();
   friend class base::RefCountedThreadSafe<VideoTrackAdapter>;
 
   void AddTrackOnIO(const MediaStreamVideoTrack* track,
@@ skipping 41 matching lines @@
 
   // Frame rate configured on the video source, accessed on the IO-thread.
   float source_frame_rate_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoTrackAdapter);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_VIDEO_TRACK_ADAPTER_H_