webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java - Issue 2938103002: ran git cl format webrtc/sdk/android/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java

Issue 2938103002: ran git cl format webrtc/sdk/android/

Patch Set: Created 3 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/examples/androidapp/res/layout/activity_call.xml ('k') | webrtc/sdk/android/BUILD.gn » ('j') | webrtc/sdk/android/api/org/webrtc/SurfaceViewRenderer.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java

diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java

index 0197bcb3227dbc0fa0f290ab334199a4efa243ca..663730a160fb128427c79dbd33e23d421c02a4da 100644

--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java

+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java

@@ -55,6 +55,7 @@ import org.webrtc.ScreenCapturerAndroid;

import org.webrtc.SessionDescription;

import org.webrtc.StatsReport;

import org.webrtc.SurfaceViewRenderer;

+import org.webrtc.TextureViewRenderer;

import org.webrtc.VideoCapturer;

import org.webrtc.VideoFileRenderer;

import org.webrtc.VideoRenderer;

@@ -161,7 +162,7 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven

private AppRTCAudioManager audioManager = null;

private EglBase rootEglBase;

private SurfaceViewRenderer pipRenderer;

- private SurfaceViewRenderer fullscreenRenderer;

+ private TextureViewRenderer fullscreenRenderer;

sakal 2017/06/16 07:47:02 Please do not change this or make it a setting.

private VideoFileRenderer videoFileRenderer;

private final List<VideoRenderer.Callbacks> remoteRenderers =

new ArrayList<VideoRenderer.Callbacks>();

@@ -206,7 +207,7 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven

// Create UI controls.

pipRenderer = (SurfaceViewRenderer) findViewById(R.id.pip_video_view);

- fullscreenRenderer = (SurfaceViewRenderer) findViewById(R.id.fullscreen_video_view);

+ fullscreenRenderer = (TextureViewRenderer) findViewById(R.id.fullscreen_video_view);

callFragment = new CallFragment();

hudFragment = new HudFragment();

@@ -253,7 +254,7 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven

fullscreenRenderer.init(rootEglBase.getEglBaseContext(), null);

fullscreenRenderer.setScalingType(ScalingType.SCALE_ASPECT_FILL);

- pipRenderer.setZOrderMediaOverlay(true);

+ //pipRenderer.setZOrderMediaOverlay(true);

pipRenderer.setEnableHardwareScaler(true /* enabled */);

fullscreenRenderer.setEnableHardwareScaler(true /* enabled */);

// Start with local feed in fullscreen and swap it to the pip when the call is connected.