commit 06aa209645ceeff95129dafc4f82cf65a04b40ba
author Magnus Jedvert <magjed@webrtc.org> Fri Oct 26 14:00:18 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Fri Oct 26 12:30:32 2018 +0000
tree a5fc8f0682c2c9800b40b3748a50d059977e522d
parent 904903705fa9098b88afe7741505e5cb83229c87

Add support to adapt video without preserving aspect ratio

This is implemented by allowing users to set two different aspect
ratios, one for landscape input and one for portrait input. This extra
control might be useful in other scenarios as well.

Bug: webrtc:9903
Change-Id: I91676737f4aa1f5d94cfe79ac51d5f866779945b
Reviewed-on: https://webrtc-review.googlesource.com/c/108086
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25387}

sdk/android/api/org/webrtc/VideoSource.java

diff --git a/sdk/android/api/org/webrtc/VideoSource.java b/sdk/android/api/org/webrtc/VideoSource.java
index 7f9f3e5..a8ef662 100644
--- a/sdk/android/api/org/webrtc/VideoSource.java
+++ b/sdk/android/api/org/webrtc/VideoSource.java
@@ -30,7 +30,20 @@
    * maintain the input orientation, so it doesn't matter if e.g. 1280x720 or 720x1280 is requested.
    */
   public void adaptOutputFormat(int width, int height, int fps) {
-    nativeAdaptOutputFormat(getNativeVideoTrackSource(), width, height, fps);
+    final int maxSide = Math.max(width, height);
+    final int minSide = Math.min(width, height);
+    adaptOutputFormat(maxSide, minSide, minSide, maxSide, fps);
+  }
+
+  /**
+   * Same as above, but allows setting two different target resolutions depending on incoming
+   * frame orientation. This gives more fine-grained control and can e.g. be used to force landscape
+   * video to be cropped to portrait video.
+   */
+  public void adaptOutputFormat(
+      int landscapeWidth, int landscapeHeight, int portraitWidth, int portraitHeight, int fps) {
+    nativeAdaptOutputFormat(getNativeVideoTrackSource(), landscapeWidth, landscapeHeight,
+        portraitWidth, portraitHeight, fps);
   }
 
   public CapturerObserver getCapturerObserver() {
@@ -44,5 +57,6 @@
 
   // Returns source->internal() from webrtc::VideoTrackSourceProxy.
   private static native long nativeGetInternalSource(long source);
-  private static native void nativeAdaptOutputFormat(long source, int width, int height, int fps);
+  private static native void nativeAdaptOutputFormat(long source, int landscapeWidth,
+      int landscapeHeight, int portraitWidth, int portraitHeight, int fps);
 }