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}
This commit is contained in:
Alex Glaznev
2016-02-22 16:48:29 -08:00
parent 18fcbcf48c
commit dc0e381eb5
2 changed files with 8 additions and 0 deletions

View File

@ -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);
}

View File

@ -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.