diff options
| author | glaznev@webrtc.org <glaznev@webrtc.org> | 2014-09-29 23:07:08 +0000 |
|---|---|---|
| committer | glaznev@webrtc.org <glaznev@webrtc.org> | 2014-09-29 23:07:08 +0000 |
| commit | c1c0fa645b14638556ce84e33d060fa4d2d7babf (patch) | |
| tree | 41c3c5d2f8195d4d235faff1c2f4080bfd7c3939 /examples | |
| parent | 002a4b0e381e528099b118ce9f63e23f91acbe06 (diff) | |
| download | talk-c1c0fa645b14638556ce84e33d060fa4d2d7babf.tar.gz | |
Allow Android apps to set video renderer scaling type.
Also add type check for EGL context object received from apps and
switch to byte buffer video decoding if EGL context is incorrect
BUG=3851
R=tkchin@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/25669004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7326 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java b/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java index 468ce22..2925368 100644 --- a/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java +++ b/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java @@ -113,8 +113,10 @@ public class AppRTCDemoActivity extends Activity vsv = new AppRTCGLView(this, displaySize); VideoRendererGui.setView(vsv); - remoteRender = VideoRendererGui.create(0, 0, 100, 100); - localRender = VideoRendererGui.create(70, 5, 25, 25); + remoteRender = VideoRendererGui.create(0, 0, 100, 100, + VideoRendererGui.ScalingType.SCALE_ASPECT_FIT); + localRender = VideoRendererGui.create(70, 5, 25, 25, + VideoRendererGui.ScalingType.SCALE_ASPECT_FIT); vsv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { |