From dc0e381eb59b61218b2649c77a3cddc0bb83f5d6 Mon Sep 17 00:00:00 2001
From: Alex Glaznev <glaznev@google.com>
Date: Mon, 22 Feb 2016 16:48:29 -0800
Subject: [PATCH] Add more camera resolutions to camera scaling slider.

Plus allow to use loopback adapter in loopback call.

BUG=b/26287075
R=wzh@webrtc.org

Review URL: https://codereview.webrtc.org/1720283002 .

Cr-Commit-Position: refs/heads/master@{#11714}
---
 .../androidapp/src/org/appspot/apprtc/CallActivity.java     | 6 ++++++
 .../src/org/appspot/apprtc/CaptureQualityController.java    | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
index b9abf11eb3..e2f130663b 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
@@ -32,6 +32,7 @@ import android.widget.Toast;
 
 import org.webrtc.EglBase;
 import org.webrtc.IceCandidate;
+import org.webrtc.PeerConnectionFactory;
 import org.webrtc.SessionDescription;
 import org.webrtc.StatsReport;
 import org.webrtc.RendererCommon.ScalingType;
@@ -262,6 +263,11 @@ public class CallActivity extends Activity
     }
 
     peerConnectionClient = PeerConnectionClient.getInstance();
+    if (loopback) {
+      PeerConnectionFactory.Options options = new PeerConnectionFactory.Options();
+      options.networkIgnoreMask = 0;
+      peerConnectionClient.setPeerConnectionFactoryOptions(options);
+    }
     peerConnectionClient.createPeerConnectionFactory(
         CallActivity.this, peerConnectionParameters, CallActivity.this);
   }
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/CaptureQualityController.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/CaptureQualityController.java
index 6886e6eeac..02e7c2e1bb 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/CaptureQualityController.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/CaptureQualityController.java
@@ -26,7 +26,9 @@ import java.util.List;
 public class CaptureQualityController implements SeekBar.OnSeekBarChangeListener {
   private final List<CaptureFormat> formats = Arrays.asList(
       new CaptureFormat(1280, 720, 0, 30000),
+      new CaptureFormat(960, 540, 0, 30000),
       new CaptureFormat(640, 480, 0, 30000),
+      new CaptureFormat(480, 360, 0, 30000),
       new CaptureFormat(320, 240, 0, 30000),
       new CaptureFormat(256, 144, 0, 30000));
   // Prioritize framerate below this threshold and resolution above the threshold.