From 5f38c8d1b8e842652e55410333870acfc5395ea6 Mon Sep 17 00:00:00 2001
From: "glaznev@webrtc.org" <glaznev@webrtc.org>
Date: Mon, 3 Nov 2014 22:18:52 +0000
Subject: [PATCH] Android AppRTCDemo improvements: - Add a room list to
 ConnectActivity with buttons to add/remove rooms. - Add loopback call button.
 - Add option to toggle full screen / letterbox video. - Add camera fps
 settings. - Fix device to landscape orientation for HD video until issue 3936
 will be fixed. - Fix a few crashes by avoiding calling peer connection and
 GAE signaling function while connection is closing. - Better handling GAE
 channel error - catch channel exceptions and display dialog with error
 messages.

BUG=3939, 3935
R=kjellander@webrtc.org, pthatcher@webrtc.org, tkchin@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/26979004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7601 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../android/org/webrtc/VideoRendererGui.java  | 136 ++++----
 .../drawable-hdpi/ic_action_full_screen.png   | Bin 0 -> 587 bytes
 .../ic_action_return_from_full_screen.png     | Bin 0 -> 663 bytes
 .../res/drawable-hdpi/ic_loopback_call.png    | Bin 0 -> 1859 bytes
 .../drawable-ldpi/ic_action_full_screen.png   | Bin 0 -> 461 bytes
 .../ic_action_return_from_full_screen.png     | Bin 0 -> 477 bytes
 .../res/drawable-ldpi/ic_loopback_call.png    | Bin 0 -> 1859 bytes
 .../drawable-mdpi/ic_action_full_screen.png   | Bin 0 -> 461 bytes
 .../ic_action_return_from_full_screen.png     | Bin 0 -> 477 bytes
 .../res/drawable-mdpi/ic_loopback_call.png    | Bin 0 -> 1859 bytes
 .../drawable-xhdpi/ic_action_full_screen.png  | Bin 0 -> 743 bytes
 .../ic_action_return_from_full_screen.png     | Bin 0 -> 761 bytes
 .../res/drawable-xhdpi/ic_loopback_call.png   | Bin 0 -> 1859 bytes
 .../android/res/layout/activity_connect.xml   |  67 ++--
 .../android/res/layout/fragment_menubar.xml   |  10 +
 talk/examples/android/res/values/arrays.xml   |   7 +
 talk/examples/android/res/values/strings.xml  |  15 +-
 talk/examples/android/res/xml/preferences.xml |   8 +
 .../src/org/appspot/apprtc/AppRTCClient.java  |   4 +-
 .../appspot/apprtc/AppRTCDemoActivity.java    | 184 ++++++----
 .../org/appspot/apprtc/ConnectActivity.java   | 210 +++++++++---
 .../org/appspot/apprtc/GAEChannelClient.java  |  82 ++---
 .../src/org/appspot/apprtc/GAERTCClient.java  | 151 ++++-----
 .../appspot/apprtc/PeerConnectionClient.java  | 317 +++++++++++-------
 .../org/appspot/apprtc/SettingsActivity.java  |   6 +-
 talk/libjingle_examples.gyp                   |  20 +-
 26 files changed, 766 insertions(+), 451 deletions(-)
 create mode 100644 talk/examples/android/res/drawable-hdpi/ic_action_full_screen.png
 create mode 100644 talk/examples/android/res/drawable-hdpi/ic_action_return_from_full_screen.png
 create mode 100644 talk/examples/android/res/drawable-hdpi/ic_loopback_call.png
 create mode 100644 talk/examples/android/res/drawable-ldpi/ic_action_full_screen.png
 create mode 100644 talk/examples/android/res/drawable-ldpi/ic_action_return_from_full_screen.png
 create mode 100644 talk/examples/android/res/drawable-ldpi/ic_loopback_call.png
 create mode 100644 talk/examples/android/res/drawable-mdpi/ic_action_full_screen.png
 create mode 100644 talk/examples/android/res/drawable-mdpi/ic_action_return_from_full_screen.png
 create mode 100644 talk/examples/android/res/drawable-mdpi/ic_loopback_call.png
 create mode 100644 talk/examples/android/res/drawable-xhdpi/ic_action_full_screen.png
 create mode 100644 talk/examples/android/res/drawable-xhdpi/ic_action_return_from_full_screen.png
 create mode 100644 talk/examples/android/res/drawable-xhdpi/ic_loopback_call.png

diff --git a/talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java b/talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java
index acaa31e785..dd1692cf0f 100644
--- a/talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java
+++ b/talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java
@@ -253,6 +253,8 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
     private FloatBuffer textureCoords;
     // Flag if texture vertices or coordinates update is needed.
     private boolean updateTextureProperties;
+    // Texture properties update lock.
+    private final Object updateTextureLock = new Object();
     // Viewport dimensions.
     private int screenWidth;
     private int screenHeight;
@@ -319,64 +321,68 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
           scalingType == ScalingType.SCALE_FILL) {
         return;
       }
-      // Re - calculate texture vertices to preserve video aspect ratio.
-      float texRight = this.texRight;
-      float texLeft = this.texLeft;
-      float texTop = this.texTop;
-      float texBottom = this.texBottom;
-      float texOffsetU = 0;
-      float texOffsetV = 0;
-      float displayWidth = (texRight - texLeft) * screenWidth / 2;
-      float displayHeight = (texTop - texBottom) * screenHeight / 2;
-      Log.d(TAG, "ID: "  + id + ". Display: " + displayWidth +
-          " x " + displayHeight + ". Video: " + videoWidth +
-          " x " + videoHeight);
-      if (displayWidth > 1 && displayHeight > 1 &&
-          videoWidth > 1 && videoHeight > 1) {
-        float displayAspectRatio = displayWidth / displayHeight;
-        float videoAspectRatio = (float)videoWidth / videoHeight;
-        if (scalingType == ScalingType.SCALE_ASPECT_FIT) {
-          // Need to re-adjust vertices width or height to match video AR.
-          if (displayAspectRatio > videoAspectRatio) {
-            float deltaX = (displayWidth - videoAspectRatio * displayHeight) /
-                    instance.screenWidth;
-            texRight -= deltaX;
-            texLeft += deltaX;
-          } else {
-            float deltaY = (displayHeight - displayWidth / videoAspectRatio) /
-                    instance.screenHeight;
-            texTop -= deltaY;
-            texBottom += deltaY;
+      synchronized(updateTextureLock) {
+        // Re - calculate texture vertices to preserve video aspect ratio.
+        float texRight = this.texRight;
+        float texLeft = this.texLeft;
+        float texTop = this.texTop;
+        float texBottom = this.texBottom;
+        float texOffsetU = 0;
+        float texOffsetV = 0;
+        float displayWidth = (texRight - texLeft) * screenWidth / 2;
+        float displayHeight = (texTop - texBottom) * screenHeight / 2;
+        Log.d(TAG, "ID: "  + id + ". Display: " + displayWidth +
+            " x " + displayHeight + ". Video: " + videoWidth +
+            " x " + videoHeight);
+        if (displayWidth > 1 && displayHeight > 1 &&
+            videoWidth > 1 && videoHeight > 1) {
+          float displayAspectRatio = displayWidth / displayHeight;
+          float videoAspectRatio = (float)videoWidth / videoHeight;
+          if (scalingType == ScalingType.SCALE_ASPECT_FIT) {
+            // Need to re-adjust vertices width or height to match video AR.
+            if (displayAspectRatio > videoAspectRatio) {
+              float deltaX = (displayWidth - videoAspectRatio * displayHeight) /
+                      instance.screenWidth;
+              texRight -= deltaX;
+              texLeft += deltaX;
+            } else {
+              float deltaY = (displayHeight - displayWidth / videoAspectRatio) /
+                      instance.screenHeight;
+              texTop -= deltaY;
+              texBottom += deltaY;
+            }
           }
-        }
-        if (scalingType == ScalingType.SCALE_ASPECT_FILL) {
-          // Need to re-adjust UV coordinates to match display AR.
-          if (displayAspectRatio > videoAspectRatio) {
-            texOffsetV = (1.0f - videoAspectRatio / displayAspectRatio) / 2.0f;
-          } else {
-            texOffsetU = (1.0f - displayAspectRatio / videoAspectRatio) / 2.0f;
+          if (scalingType == ScalingType.SCALE_ASPECT_FILL) {
+            // Need to re-adjust UV coordinates to match display AR.
+            if (displayAspectRatio > videoAspectRatio) {
+              texOffsetV = (1.0f - videoAspectRatio / displayAspectRatio) /
+                  2.0f;
+            } else {
+              texOffsetU = (1.0f - displayAspectRatio / videoAspectRatio) /
+                  2.0f;
+            }
           }
-        }
-        Log.d(TAG, "  Texture vertices: (" + texLeft + "," + texBottom +
-            ") - (" + texRight + "," + texTop + ")");
-        float textureVeticesFloat[] = new float[] {
-            texLeft, texTop,
-            texLeft, texBottom,
-            texRight, texTop,
-            texRight, texBottom
-        };
-        textureVertices = directNativeFloatBuffer(textureVeticesFloat);
+          Log.d(TAG, "  Texture vertices: (" + texLeft + "," + texBottom +
+              ") - (" + texRight + "," + texTop + ")");
+          float textureVeticesFloat[] = new float[] {
+              texLeft, texTop,
+              texLeft, texBottom,
+              texRight, texTop,
+              texRight, texBottom
+          };
+          textureVertices = directNativeFloatBuffer(textureVeticesFloat);
 
-        Log.d(TAG, "  Texture UV offsets: " + texOffsetU + ", " + texOffsetV);
-        float textureCoordinatesFloat[] = new float[] {
-            texOffsetU, texOffsetV,               // left top
-            texOffsetU, 1.0f - texOffsetV,        // left bottom
-            1.0f - texOffsetU, texOffsetV,        // right top
-            1.0f - texOffsetU, 1.0f - texOffsetV  // right bottom
-        };
-        textureCoords = directNativeFloatBuffer(textureCoordinatesFloat);
+          Log.d(TAG, "  Texture UV offsets: " + texOffsetU + ", " + texOffsetV);
+          float textureCoordinatesFloat[] = new float[] {
+              texOffsetU, texOffsetV,               // left top
+              texOffsetU, 1.0f - texOffsetV,        // left bottom
+              1.0f - texOffsetU, texOffsetV,        // right top
+              1.0f - texOffsetU, 1.0f - texOffsetV  // right bottom
+          };
+          textureCoords = directNativeFloatBuffer(textureCoordinatesFloat);
+        }
+        updateTextureProperties = false;
       }
-      updateTextureProperties = false;
     }
 
     private void draw() {
@@ -489,19 +495,23 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
     }
 
     public void setScreenSize(final int screenWidth, final int screenHeight) {
-      this.screenWidth = screenWidth;
-      this.screenHeight = screenHeight;
-      updateTextureProperties = true;
+      synchronized(updateTextureLock) {
+        this.screenWidth = screenWidth;
+        this.screenHeight = screenHeight;
+        updateTextureProperties = true;
+      }
     }
 
     public void setPosition(int x, int y, int width, int height,
         ScalingType scalingType) {
-      texLeft = (x - 50) / 50.0f;
-      texTop = (50 - y) / 50.0f;
-      texRight = Math.min(1.0f, (x + width - 50) / 50.0f);
-      texBottom = Math.max(-1.0f, (50 - y - height) / 50.0f);
-      this.scalingType = scalingType;
-      updateTextureProperties = true;
+      synchronized(updateTextureLock) {
+        texLeft = (x - 50) / 50.0f;
+        texTop = (50 - y) / 50.0f;
+        texRight = Math.min(1.0f, (x + width - 50) / 50.0f);
+        texBottom = Math.max(-1.0f, (50 - y - height) / 50.0f);
+        this.scalingType = scalingType;
+        updateTextureProperties = true;
+      }
     }
 
     @Override
diff --git a/talk/examples/android/res/drawable-hdpi/ic_action_full_screen.png b/talk/examples/android/res/drawable-hdpi/ic_action_full_screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..22f30d31ca8e3b1dea9072f43f67afbcaa6e74d7
GIT binary patch
literal 587
zcmV-R0<`^!P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz?MXyIRCwC#SkY~RFc1aAF9Re4cmW1T
z^Pdee00VRZ7U%#BkU66KHw!R8GXMinpL(fW3%F-6qzIp6;aHb@_w4ie>?jHnBuJ1T
zTb5W-Xxlc|AEjHZ+ar$SuQ?skczgZXJux-jeMmnAY?7gO1Asncv|&=z8VRUpVluX`
zxSv~UAB;7LK;1F+1bQ<ZB0^_rg?NT9?C==uKav1O9)J!xUm)SdItBk{GIjz2BF@+F
z#{1C~NgxxFfSC6eBp3)2B``Eo6w8&4ZRN0mNw*UALF1Ev6do`M(0OPBk0sFb%#KJx
zaNf3C&k;fmZ@$8n1mL`F7Yd=+A#Sf`wgDXaJrji7-*nm4zmGmwAYzAVFcsd+6v+J>
zl7hK^UM$zqjM3`o_Q|ar&@BzUt4rouibM(MmjB9mtH$xJ8)P%G>JVD>CVq7qO{Oe+
z&uM(>BEe%Pu<Y1-CqSiu2_}>h2h$1eACTIK`xmbSj0<?hAtM%M9i@a=0Gf6gQ<M}W
znwenM7<9d)G3`{*L%hpw<}-wp1?J>DSOD5~)m#K7UF^{dy>9}U59b|8cnzUET3&K5
z1c018*Q*3{9v~~Q14FDr09mI3Lqx<*M{eNJkGp&(9Kpw3B|UJh{&_t}kRU;VY+Jqs
Z7ywhGh57>;H-7*C002ovPDHLkV1h~e@ZkUe

literal 0
HcmV?d00001

diff --git a/talk/examples/android/res/drawable-hdpi/ic_action_return_from_full_screen.png b/talk/examples/android/res/drawable-hdpi/ic_action_return_from_full_screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9436e5248883f7ac916854d836fabea9cb64040
GIT binary patch
literal 663
zcmV;I0%-k-P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!IY~r8RCwC#SkZ06AP`Ng{4zj2fEREF
z$N*{A@Bqnw7f1%k0__6%Zw6=<@Br=r9v}tj5nYfC2Zq#DISDx?`0hQpI}VD)AD1E%
z$OJNhOdu0@7=i2cTB()_Oj7+)@mjV|v?>vJZ~X;R`HOt)WfN$}m?WU<7^1)6%)ETO
z8Qp_M<huab(TPxFEa0vBLsy`atsm&WGXh`=$i|{;gKvZdeB2;jE|;x*G!7CqfK+H>
zqW`Dg41rg+8rZhu3-nVL>E{t0Ukp=h@Lp-uu@WZGn$tHGy!SrfL84^#O#&aZ6T`sH
zG3<%iM`h;=K8OG^$ks8eV)jwlnkhC#DIrL<iS0raO|hv~poXu0Cs=_VZS4bS<>~)t
z`8XS?wFI~leqQ6hQjYKRZ=$Bf=GbB)Iyvq#s}dI_g)rXB6t-3=l*$?H2j2S>w(^N=
z#D&TM7ZS5`A(RI?cxgZ@c_nV6{(qO_)$fZAULDXO8(0tl)cPBM6plFP=<W^hIu)CG
z7lhOYvRx7vI+IhAO<HE3S!xKZP?{J(Hfb1Ox{-~_MY=IFSc+m!88`&2fNN$CzTiWP
zxe5n-n|w3-sO&>73W@;moKsoH>~mfeL?hsNq`YwYVvr~zfHwoXcT}9WfaTnF#JCr7
zg2(J?60IY+TjQHaB&L)ScV}3VVo#QDPBc~eTog>YRvB1@pab}C>AxA7<K=FMky%}@
x`yMIVMM8PVwaULZ&}0IcKqin0u;oX90RXhua^33mKY{=N002ovPDHLkV1ibyAbbD-

literal 0
HcmV?d00001

diff --git a/talk/examples/android/res/drawable-hdpi/ic_loopback_call.png b/talk/examples/android/res/drawable-hdpi/ic_loopback_call.png
new file mode 100644
index 0000000000000000000000000000000000000000..39311853b36e67569b67a1f31fea06f99720c29b
GIT binary patch
literal 1859
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

literal 0
HcmV?d00001

diff --git a/talk/examples/android/res/drawable-ldpi/ic_action_full_screen.png b/talk/examples/android/res/drawable-ldpi/ic_action_full_screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4a9ff0a8e0130a794cd63f907cc18d3e8d38593
GIT binary patch
literal 461
zcmV;;0W$uHP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzZ%IT!RCwC#R_$%WAP_ZCewG2cfEP%|
zs0Zi*@c>>R9UucZ10(~`F`5OuKnGv|_lTY=MDF-#TBWKu37yTsdk1$MG)<K%cNWEU
z&hxy%r&UT#w-69kOG;nJlsbp@b!6@c0H>T2mYM_jARr@<b)+7tZ9v+3=AN4)IbehT
z1;_!vCKkQT#FRsT)x0y^ds_V|vE?tMhASeap1AR=2o@LnjtF#w+}XNJtfT|nmbp-j
zoD=99gSbbxKjpxZvHM^JS564z6XyC@MLEzRc19q0BijyRoqi6;d$L;}r@8SwYidWA
zoX|SQ_M-x#os<KTt;+uh!EYtuDs~K)Bg7oTHYm44VEd{QK2FJH)ZkXz(&Pt}SE<M>
z#j0hTFmUehokBF?_T%dMrN|VN;xmo!OG~lNB}b*Rxbvq>tfT|nN(@IHIAJoeWC!q!
z;$(;=6l_BY<~nox{U=#U4#Ja6|H(&bl`40aPXPu1Z?+6KTW5<S00000NkvXXu0mjf
D$jZfq

literal 0
HcmV?d00001

diff --git a/talk/examples/android/res/drawable-ldpi/ic_action_return_from_full_screen.png b/talk/examples/android/res/drawable-ldpi/ic_action_return_from_full_screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5c80f00e7e0ccacf6bde2ae68b47603a5b27ce9
GIT binary patch
literal 477
zcmV<30V4j1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUze@R3^RCwC#R?CgTKnzVHt|=fC;08hg
zG>`_i0Jtv|Yyrz13ZRXo0BC>$pnw#R^&k(jtnqx3J#d&OS+U~y6Wil)QDkI%GNx$)
zq<Wz~EK%-}E^~rl`n@lRN>j$i3CTEq@jM8ZLH<tY*Q5{80U(}47VjXCIx;R{<ehM?
z*?Xh(q_8GKAPhAx#j@Op@2|v;!ucI(kKd0e87N3$PX;U+=CF0~DbBqCh#*|)TPr-z
zme+YO0K%64xhoqU`8H&{3LPbU>=ZF5JjZuv4y*ztFg5I0o$av%Q5M4wRCB{WQ1_Nc
zc?`;g(b`hCH?{<r=3kN>=>45&j4i<`q6y_xvlv7Zw!G_6*Y?JNdTG`iFp5V-%#CV)
zd-gexodbh1h@J{BPsXA-VDAIhpm``fA4I3nRbC}tMk6cF&BbfCXzD(oIXCyh4-Z7h
zjqFSG2gGDT+h(pry<_3<EhIH<QcnGUU8#H}q#*jGdm+r7aufs<85y69KLG{+CT|$U
T7s`1_00000NkvXXu0mjfTN}l!

literal 0
HcmV?d00001

diff --git a/talk/examples/android/res/drawable-ldpi/ic_loopback_call.png b/talk/examples/android/res/drawable-ldpi/ic_loopback_call.png
new file mode 100644
index 0000000000000000000000000000000000000000..39311853b36e67569b67a1f31fea06f99720c29b
GIT binary patch
literal 1859
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

literal 0
HcmV?d00001

diff --git a/talk/examples/android/res/drawable-mdpi/ic_action_full_screen.png b/talk/examples/android/res/drawable-mdpi/ic_action_full_screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4a9ff0a8e0130a794cd63f907cc18d3e8d38593
GIT binary patch
literal 461
zcmV;;0W$uHP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzZ%IT!RCwC#R_$%WAP_ZCewG2cfEP%|
zs0Zi*@c>>R9UucZ10(~`F`5OuKnGv|_lTY=MDF-#TBWKu37yTsdk1$MG)<K%cNWEU
z&hxy%r&UT#w-69kOG;nJlsbp@b!6@c0H>T2mYM_jARr@<b)+7tZ9v+3=AN4)IbehT
z1;_!vCKkQT#FRsT)x0y^ds_V|vE?tMhASeap1AR=2o@LnjtF#w+}XNJtfT|nmbp-j
zoD=99gSbbxKjpxZvHM^JS564z6XyC@MLEzRc19q0BijyRoqi6;d$L;}r@8SwYidWA
zoX|SQ_M-x#os<KTt;+uh!EYtuDs~K)Bg7oTHYm44VEd{QK2FJH)ZkXz(&Pt}SE<M>
z#j0hTFmUehokBF?_T%dMrN|VN;xmo!OG~lNB}b*Rxbvq>tfT|nN(@IHIAJoeWC!q!
z;$(;=6l_BY<~nox{U=#U4#Ja6|H(&bl`40aPXPu1Z?+6KTW5<S00000NkvXXu0mjf
D$jZfq

literal 0
HcmV?d00001

diff --git a/talk/examples/android/res/drawable-mdpi/ic_action_return_from_full_screen.png b/talk/examples/android/res/drawable-mdpi/ic_action_return_from_full_screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5c80f00e7e0ccacf6bde2ae68b47603a5b27ce9
GIT binary patch
literal 477
zcmV<30V4j1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUze@R3^RCwC#R?CgTKnzVHt|=fC;08hg
zG>`_i0Jtv|Yyrz13ZRXo0BC>$pnw#R^&k(jtnqx3J#d&OS+U~y6Wil)QDkI%GNx$)
zq<Wz~EK%-}E^~rl`n@lRN>j$i3CTEq@jM8ZLH<tY*Q5{80U(}47VjXCIx;R{<ehM?
z*?Xh(q_8GKAPhAx#j@Op@2|v;!ucI(kKd0e87N3$PX;U+=CF0~DbBqCh#*|)TPr-z
zme+YO0K%64xhoqU`8H&{3LPbU>=ZF5JjZuv4y*ztFg5I0o$av%Q5M4wRCB{WQ1_Nc
zc?`;g(b`hCH?{<r=3kN>=>45&j4i<`q6y_xvlv7Zw!G_6*Y?JNdTG`iFp5V-%#CV)
zd-gexodbh1h@J{BPsXA-VDAIhpm``fA4I3nRbC}tMk6cF&BbfCXzD(oIXCyh4-Z7h
zjqFSG2gGDT+h(pry<_3<EhIH<QcnGUU8#H}q#*jGdm+r7aufs<85y69KLG{+CT|$U
T7s`1_00000NkvXXu0mjfTN}l!

literal 0
HcmV?d00001

diff --git a/talk/examples/android/res/drawable-mdpi/ic_loopback_call.png b/talk/examples/android/res/drawable-mdpi/ic_loopback_call.png
new file mode 100644
index 0000000000000000000000000000000000000000..39311853b36e67569b67a1f31fea06f99720c29b
GIT binary patch
literal 1859
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

literal 0
HcmV?d00001

diff --git a/talk/examples/android/res/drawable-xhdpi/ic_action_full_screen.png b/talk/examples/android/res/drawable-xhdpi/ic_action_full_screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d90c071d5f9b3b339d43e7303eeafc7324500b8
GIT binary patch
literal 743
zcmV<D0vP>?P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!iAh93RCwC#n(b|aFc5|f>R$#R1F!%c
zplhT9Gy^1KBm<BEnlYLI$^srB8Gr%OvvjnM<+Q%@M<VrJ$wERHzxM#=FO(9AL?V$$
zBoc}Kr7FtBm&;`hhY89V$_a|Ds%pAt0N|;CLkDF6rG?Ufr(J0MCt`ah*f+<3Ij1cs
zqqz=D=){4VAWg8n73_S@)}C@-DuA=++-%A<tPqR=bO0bnV!$tOSmOP=NRKyF69Jrv
z*UwLAWIXhd5j@!=6@X@3zvAQxtg~XanFj!xnsNsp0b!!HS2KKtn%Sl3A@Cl%Om8R)
zKxmTLV&+bf{kJ(1AQwPrk}(Nvh=G802Txa*DoL{dP%=6j0wZ{;H#Pw3cTI-C44&hS
z4!|?Q)0nBJ6c7S~_x28)(Pz#4Jhju+jVT~dg16e#+#VnXz~uJxNS_UX7`*n36Q+^?
z4!%K7AOsZwedWI97KB6g>2QK1<_#jYUa|FnNC-heaO*v!OfXPBuyncWJu-x@R6UVM
zB$6a3-JlGFWGI|<GGsO_a7&6hrRB~Bf1OGjFSwCXY&N(=LrtQU9QMi*dKl1CF#z+9
z%{K(je4a6tzJg!{-*KT=%unFcSsgO#_FHc7%!QE+l(n+9&fwn9*#V%z_Y{j6kq~@(
zr6$Un`TA!IK5}KLDUk#EoWVyz=t}@t<PJUp!lDF#Ht@Plih&E>W0Tlh6oAmN`TEvi
ziI{X7%=Rh0@c^KihG1rhf#CG>K}nF>UY+UbM?+u)&+<qGKut39j!n;a0ebbb1C`Aq
z^)IpZMz&A>n;iaCc60_uA-~DBIRTi)_UaBlN?Jfi&!=+rqofjvL?V$$Boc{4f9Xqr
Z0RZxLy7e4pk^%q#002ovPDHLkV1oTcMn?bu

literal 0
HcmV?d00001

diff --git a/talk/examples/android/res/drawable-xhdpi/ic_action_return_from_full_screen.png b/talk/examples/android/res/drawable-xhdpi/ic_action_return_from_full_screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..a773b342089106c0f5b0f7c9bcafd19a1ea0a41a
GIT binary patch
literal 761
zcmV<V0tWqwP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!n@L1LRCwC#THTGpFbqyBUKs!eC<F8s
zxB*z>cxM5`0=&ZlH$d;51=<1V0A&CM;8Mvwg^;$f^HUD_ldRJ<C9c0Zw(CR)27|$1
zFc=I5gMr2UeqT$;Cf2{6Qh6!mJOv4g{xUiVn)2u*81$1#NGQtXpPgaoCS{W(Ngdkw
z9{nx$Qh$M&FZHN=F6G$g3GH>8w=@)2M)bGXVLc&5zJLq7X@MaD{y$2wSteP}9An0J
zUU&&c0J!%CLxN)b96^9ShpqAGC72M`p=#9710AGnmHTe;0Y69PKCAaj`Ihn(!gw+P
z2og+Q^f5ATiF_2N;G0qjuv`u%19Qq)2;-dya3Enx91D_mod_V3upo{FsX3epP)Imf
z-kuT1R2+O2TwVx(fVhpg1h&3P@6?m=m~7y~0|u+kXarDGq5R#_=2{FATs>d~g-Rvm
zium2aApi={)$06#XCPzd82pMJuULXRFTpT9zvp0peoaRO5x)j$E6K{|*JUCiK@!t_
z3$#+}hCmUNfuUD9-UtSR!3d0)L9ojRHbJl*zr}d2SpY+GrTf!$ck~o@>PdrN$~;1;
zFB%}G@!fQtIU2iG49yS~VP$zOH|P`!DHWv5Vk!@~h{u)}rjj##;$kYvZaHlxD}||D
zAybh<aP5EF5UGh{Z_^NIMhtuVhDePJj&Iixxe~|TrXkW0$6l);;;=DNQN}`%kOnsX
zqy;vcAgABI7laMjU<4qHZ};j?T8gxZ+_jeK3W3~^4MqUc_`*;p*b?xN=PA3=p*&!P
zG2T!t*%I(n<RC~uHA#IQkue${;A?Zp3xn(bBf-}pB`OJUFspo(lVZ`&>S-iQdRA~6
r<--2p6@$TGFc=I5gTZ*huK)u81gQRI%bw>700000NkvXXu0mjf1bavy

literal 0
HcmV?d00001

diff --git a/talk/examples/android/res/drawable-xhdpi/ic_loopback_call.png b/talk/examples/android/res/drawable-xhdpi/ic_loopback_call.png
new file mode 100644
index 0000000000000000000000000000000000000000..39311853b36e67569b67a1f31fea06f99720c29b
GIT binary patch
literal 1859
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

literal 0
HcmV?d00001

diff --git a/talk/examples/android/res/layout/activity_connect.xml b/talk/examples/android/res/layout/activity_connect.xml
index 2d6f6f8adc..5ca0f191b1 100644
--- a/talk/examples/android/res/layout/activity_connect.xml
+++ b/talk/examples/android/res/layout/activity_connect.xml
@@ -7,37 +7,66 @@
         android:weightSum="1"
         android:layout_margin="8dp"
         android:layout_centerHorizontal="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+            <ImageButton
+                android:id="@+id/add_room_button"
+                android:background="@android:drawable/ic_menu_add"
+                android:contentDescription="@string/add_room_description"
+                android:layout_marginRight="20dp"
+                android:layout_width="48dp"
+                android:layout_height="48dp"/>
+            <ImageButton
+                android:id="@+id/remove_room_button"
+                android:background="@android:drawable/ic_delete"
+                android:contentDescription="@string/remove_room_description"
+                android:layout_marginRight="20dp"
+                android:layout_width="48dp"
+                android:layout_height="48dp"/>
+            <ImageButton
+                android:id="@+id/connect_button"
+                android:background="@android:drawable/sym_action_call"
+                android:contentDescription="@string/connect_description"
+                android:layout_marginRight="20dp"
+                android:layout_width="48dp"
+                android:layout_height="48dp"/>
+            <ImageButton
+                android:id="@+id/connect_loopback_button"
+                android:background="@drawable/ic_loopback_call"
+                android:contentDescription="@string/connect_loopback_description"
+                android:layout_width="48dp"
+                android:layout_height="48dp"/>
+    </LinearLayout>
     <TextView
+            android:id="@+id/room_edittext_description"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:lines="1"
-            android:maxLines="1"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/room_name"/>
+            android:layout_margin="5dp"
+            android:text="@string/room_description"/>
     <EditText
+            android:id="@+id/room_edittext"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:id="@+id/room_edittext"
-            android:imeOptions="actionGo"/>
+            android:imeOptions="actionDone"/>
     <TextView
+            android:id="@+id/room_listview_description"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:lines="1"
+            android:maxLines="1"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_margin="15dp"
-            android:text="@string/room_description"/>
-    <CheckBox
-            android:id="@+id/check_loopback"
+            android:text="@string/room_names"/>
+    <ListView
+            android:id="@+id/room_listview"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/loopback_text" />
-    <Button
-            android:id="@+id/connect_button"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/connect_text"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
+            android:choiceMode="singleChoice"
+            android:listSelector="@android:color/darker_gray"
+            android:drawSelectorOnTop="false" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/talk/examples/android/res/layout/fragment_menubar.xml b/talk/examples/android/res/layout/fragment_menubar.xml
index 1ff0a97261..77dc819db5 100644
--- a/talk/examples/android/res/layout/fragment_menubar.xml
+++ b/talk/examples/android/res/layout/fragment_menubar.xml
@@ -13,6 +13,7 @@
         android:id="@+id/button_disconnect"
         android:background="@drawable/disconnect"
         android:contentDescription="@string/disconnect_call"
+        android:layout_marginRight="16dp"
         android:layout_width="48dp"
         android:layout_height="48dp"/>
 
@@ -22,6 +23,7 @@
         android:id="@+id/button_switch_camera"
         android:background="@android:drawable/ic_menu_camera"
         android:contentDescription="@string/switch_camera"
+        android:layout_marginRight="8dp"
         android:layout_width="48dp"
         android:layout_height="48dp"/>
 
@@ -29,6 +31,14 @@
         android:id="@+id/button_toggle_debug"
         android:background="@android:drawable/ic_menu_info_details"
         android:contentDescription="@string/disconnect_call"
+        android:layout_marginRight="8dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"/>
+
+    <ImageButton
+        android:id="@+id/button_scaling_mode"
+        android:background="@drawable/ic_action_return_from_full_screen"
+        android:contentDescription="@string/disconnect_call"
         android:layout_width="48dp"
         android:layout_height="48dp"/>
 
diff --git a/talk/examples/android/res/values/arrays.xml b/talk/examples/android/res/values/arrays.xml
index af56eb94ac..3127a85970 100644
--- a/talk/examples/android/res/values/arrays.xml
+++ b/talk/examples/android/res/values/arrays.xml
@@ -12,4 +12,11 @@
         <item>640 x 480</item>
         <item>320 x 240</item>
     </string-array>
+
+    <string-array name="cameraFps">
+        <item>Default</item>
+        <item>30 fps</item>
+        <item>15 fps</item>
+    </string-array>
+
 </resources>
diff --git a/talk/examples/android/res/values/strings.xml b/talk/examples/android/res/values/strings.xml
index abe599c4e0..2a1d64ab36 100644
--- a/talk/examples/android/res/values/strings.xml
+++ b/talk/examples/android/res/values/strings.xml
@@ -3,24 +3,29 @@
     <string name="app_name" translatable="no">AppRTC</string>
     <string name="settings_name" translatable="no">AppRTC Settings</string>
     <string name="disconnect_call">Disconnect Call</string>
-    <string name="room_name">Room name:</string>
+    <string name="room_names">Room names:</string>
     <string name="room_description">
         Please enter a room name. Room names are shared with everyone, so think
         of something unique and send it to a friend.
     </string>
     <string name="connect_text">Connect</string>
-    <string name="loopback_text">Loopback connection</string>
     <string name="invalid_url_title">Invalid URL</string>
     <string name="invalid_url_text">The URL or room name you entered resulted in an invalid URL: %1$s
     </string>
+    <string name="channel_error_title">Connection error</string>
     <string name="connecting_to">Connecting to: %1$s</string>
     <string name="missing_url">FATAL ERROR: Missing URL to connect to.</string>
     <string name="ok">OK</string>
     <string name="switch_camera">Switch front/back camera</string>
     <string name="action_settings">Settings</string>
+    <string name="add_room_description">Add new room to the list</string>
+    <string name="remove_room_description">Remove room from the list</string>
+    <string name="connect_description">Connect to the room</string>
+    <string name="connect_loopback_description">Loopback connection</string>
 
     <!-- Settings strings. -->
     <string name="pref_room_key">room_preference</string>
+    <string name="pref_room_list_key">room_list_preference</string>
 
     <string name="pref_url_key">url_preference</string>
     <string name="pref_url_title">Connection URL:</string>
@@ -33,4 +38,10 @@
     <string name="pref_resolution_summary">Video resolution.</string>
     <string name="pref_resolution_dlg">Enter AppRTC local video resolution.</string>
     <string name="pref_resolution_default">Default</string>
+
+    <string name="pref_fps_key">fps_preference</string>
+    <string name="pref_fps_title">Camera fps.</string>
+    <string name="pref_fps_summary">Camera fps.</string>
+    <string name="pref_fps_dlg">Enter local camera fps.</string>
+    <string name="pref_fps_default">Default</string>
 </resources>
diff --git a/talk/examples/android/res/xml/preferences.xml b/talk/examples/android/res/xml/preferences.xml
index efabd3e3b4..f3f91d87c9 100644
--- a/talk/examples/android/res/xml/preferences.xml
+++ b/talk/examples/android/res/xml/preferences.xml
@@ -15,4 +15,12 @@
         android:dialogTitle="@string/pref_resolution_dlg"
         android:entries="@array/videoResolutions"
         android:entryValues="@array/videoResolutionsValues" />
+    <ListPreference
+        android:key="@string/pref_fps_key"
+        android:title="@string/pref_fps_title"
+        android:summary="@string/pref_fps_summary"
+        android:defaultValue="@string/pref_fps_default"
+        android:dialogTitle="@string/pref_fps_dlg"
+        android:entries="@array/cameraFps"
+        android:entryValues="@array/cameraFps" />
 </PreferenceScreen>
\ No newline at end of file
diff --git a/talk/examples/android/src/org/appspot/apprtc/AppRTCClient.java b/talk/examples/android/src/org/appspot/apprtc/AppRTCClient.java
index 4728e51587..5c34fcad19 100644
--- a/talk/examples/android/src/org/appspot/apprtc/AppRTCClient.java
+++ b/talk/examples/android/src/org/appspot/apprtc/AppRTCClient.java
@@ -80,7 +80,9 @@ public interface AppRTCClient {
   }
 
   /**
-   * Signaling callbacks.
+   * Callback interface for messages delivered on signalling channel.
+   *
+   * Methods are guaranteed to be invoked on the UI thread of |activity|.
    */
   public static interface AppRTCSignalingEvents {
     /**
diff --git a/talk/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java b/talk/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java
index 8a875b205c..ad0e2d5506 100644
--- a/talk/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java
+++ b/talk/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java
@@ -32,6 +32,7 @@ import android.app.AlertDialog;
 import android.app.Fragment;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.graphics.Color;
 import android.media.AudioManager;
 import android.net.Uri;
@@ -45,7 +46,6 @@ import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -58,6 +58,7 @@ import org.webrtc.StatsObserver;
 import org.webrtc.StatsReport;
 import org.webrtc.VideoRenderer;
 import org.webrtc.VideoRendererGui;
+import org.webrtc.VideoRendererGui.ScalingType;
 
 /**
  * Main Activity of the AppRTCDemo Android app demonstrating interoperability
@@ -76,13 +77,14 @@ public class AppRTCDemoActivity extends Activity
   private GLSurfaceView videoView;
   private VideoRenderer.Callbacks localRender;
   private VideoRenderer.Callbacks remoteRender;
+  private ScalingType scalingType;
   private Toast logToast;
   private final LayoutParams hudLayout =
       new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
   private TextView hudView;
   private TextView roomName;
-  // Synchronize on quit[0] to avoid teardown-related crashes.
-  private final Boolean[] quit = new Boolean[] { false };
+  private ImageButton videoScalingButton;
+  private boolean iceConnected;
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
@@ -102,6 +104,7 @@ public class AppRTCDemoActivity extends Activity
 
     Thread.setDefaultUncaughtExceptionHandler(
         new UnhandledExceptionHandler(this));
+    iceConnected = false;
 
     rootView = findViewById(android.R.id.content);
     menuBar = findViewById(R.id.menubar_fragment);
@@ -109,10 +112,9 @@ public class AppRTCDemoActivity extends Activity
     videoView = (GLSurfaceView) findViewById(R.id.glview);
 
     VideoRendererGui.setView(videoView);
-    remoteRender = VideoRendererGui.create(0, 0, 100, 100,
-        VideoRendererGui.ScalingType.SCALE_ASPECT_FILL);
-    localRender = VideoRendererGui.create(0, 0, 100, 100,
-        VideoRendererGui.ScalingType.SCALE_ASPECT_FILL);
+    scalingType = ScalingType.SCALE_ASPECT_FILL;
+    remoteRender = VideoRendererGui.create(0, 0, 100, 100, scalingType);
+    localRender = VideoRendererGui.create(0, 0, 100, 100, scalingType);
 
     videoView.setOnClickListener(
         new View.OnClickListener() {
@@ -143,7 +145,9 @@ public class AppRTCDemoActivity extends Activity
         new View.OnClickListener() {
           @Override
           public void onClick(View view) {
-            pc.switchCamera();
+            if (pc != null) {
+              pc.switchCamera();
+            }
           }
         });
 
@@ -157,6 +161,24 @@ public class AppRTCDemoActivity extends Activity
           }
         });
 
+    videoScalingButton = (ImageButton) findViewById(R.id.button_scaling_mode);
+    videoScalingButton.setOnClickListener(
+        new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+            if (scalingType == ScalingType.SCALE_ASPECT_FILL) {
+              videoScalingButton.setBackgroundResource(
+                  R.drawable.ic_action_full_screen);
+              scalingType = ScalingType.SCALE_ASPECT_FIT;
+            } else {
+              videoScalingButton.setBackgroundResource(
+                  R.drawable.ic_action_return_from_full_screen);
+              scalingType = ScalingType.SCALE_ASPECT_FILL;
+            }
+            updateVideoView();
+          }
+        });
+
     hudView = new TextView(this);
     hudView.setTextColor(Color.BLACK);
     hudView.setBackgroundColor(Color.WHITE);
@@ -184,7 +206,11 @@ public class AppRTCDemoActivity extends Activity
           (loopback != null && loopback.equals("loopback"))) {
         logAndToast(getString(R.string.connecting_to, url));
         appRtcClient.connectToRoom(url.toString());
-        roomName.setText(room);
+        if (room != null && !room.equals("")) {
+          roomName.setText(room);
+        } else {
+          roomName.setText("loopback");
+        }
       } else {
         logAndToast("Empty or missing room name!");
         finish();
@@ -230,6 +256,16 @@ public class AppRTCDemoActivity extends Activity
     super.onDestroy();
   }
 
+  private void updateVideoView() {
+    VideoRendererGui.update(remoteRender, 0, 0, 100, 100, scalingType);
+    if (iceConnected) {
+      VideoRendererGui.update(localRender, 70, 70, 28, 28,
+          ScalingType.SCALE_ASPECT_FIT);
+    } else {
+      VideoRendererGui.update(localRender, 0, 0, 100, 100, scalingType);
+    }
+  }
+
   // Update the heads-up display with information from |reports|.
   private void updateHUD(StatsReport[] reports) {
     StringBuilder builder = new StringBuilder();
@@ -279,21 +315,28 @@ public class AppRTCDemoActivity extends Activity
 
   // Disconnect from remote resources, dispose of local resources, and exit.
   private void disconnect() {
-    synchronized (quit[0]) {
-      if (quit[0]) {
-        return;
-      }
-      quit[0] = true;
-      if (pc != null) {
-        pc.close();
-        pc = null;
-      }
-      if (appRtcClient != null) {
-        appRtcClient.disconnect();
-        appRtcClient = null;
-      }
-      finish();
+    if (appRtcClient != null) {
+      appRtcClient.disconnect();
+      appRtcClient = null;
     }
+    if (pc != null) {
+      pc.close();
+      pc = null;
+    }
+    finish();
+  }
+
+  private void disconnectWithMessage(String errorMessage) {
+    new AlertDialog.Builder(this)
+    .setTitle(getText(R.string.channel_error_title))
+    .setMessage(errorMessage)
+    .setCancelable(false)
+    .setNeutralButton(R.string.ok, new DialogInterface.OnClickListener() {
+        public void onClick(DialogInterface dialog, int id) {
+          dialog.cancel();
+          disconnect();
+        }
+      }).create().show();
   }
 
   // Poor-man's assert(): die with |msg| unless |condition| is true.
@@ -324,39 +367,41 @@ public class AppRTCDemoActivity extends Activity
     logAndToast("Creating peer connection...");
     pc = new PeerConnectionClient(
         this, localRender, remoteRender, appRtcParameters, this);
+    if (pc.isHDVideo()) {
+      setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+    } else {
+      setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+    }
 
     {
-      final PeerConnectionClient finalPC = pc;
       final Runnable repeatedStatsLogger = new Runnable() {
-          public void run() {
-            synchronized (quit[0]) {
-              if (quit[0]) {
-                return;
-              }
-              final Runnable runnableThis = this;
-              if (hudView.getVisibility() == View.INVISIBLE) {
-                videoView.postDelayed(runnableThis, 1000);
-                return;
-              }
-              boolean success = finalPC.getStats(new StatsObserver() {
-                  public void onComplete(final StatsReport[] reports) {
-                    runOnUiThread(new Runnable() {
-                        public void run() {
-                          updateHUD(reports);
-                        }
-                      });
-                    for (StatsReport report : reports) {
-                      Log.d(TAG, "Stats: " + report.toString());
-                    }
-                    videoView.postDelayed(runnableThis, 1000);
+        public void run() {
+            if (pc == null) {
+              return;
+            }
+            final Runnable runnableThis = this;
+            if (hudView.getVisibility() == View.INVISIBLE) {
+              videoView.postDelayed(runnableThis, 1000);
+              return;
+            }
+            boolean success = pc.getStats(new StatsObserver() {
+                public void onComplete(final StatsReport[] reports) {
+                  runOnUiThread(new Runnable() {
+                      public void run() {
+                        updateHUD(reports);
+                      }
+                    });
+                  for (StatsReport report : reports) {
+                    Log.d(TAG, "Stats: " + report.toString());
                   }
-                }, null);
-              if (!success) {
-                throw new RuntimeException("getStats() return false!");
-              }
+                  videoView.postDelayed(runnableThis, 1000);
+                }
+              }, null);
+            if (!success) {
+              throw new RuntimeException("getStats() return false!");
             }
           }
-        };
+      };
       videoView.postDelayed(repeatedStatsLogger, 1000);
     }
 
@@ -365,6 +410,9 @@ public class AppRTCDemoActivity extends Activity
 
   @Override
   public void onChannelOpen() {
+    if (pc == null) {
+      return;
+    }
     if (appRtcParameters.initiator) {
       logAndToast("Creating OFFER...");
       // Create offer. Offer SDP will be sent to answering client in
@@ -375,6 +423,9 @@ public class AppRTCDemoActivity extends Activity
 
   @Override
   public void onRemoteDescription(final SessionDescription sdp) {
+    if (pc == null) {
+      return;
+    }
     logAndToast("Received remote " + sdp.type + " ...");
     pc.setRemoteDescription(sdp);
     if (!appRtcParameters.initiator) {
@@ -387,7 +438,9 @@ public class AppRTCDemoActivity extends Activity
 
   @Override
   public void onRemoteIceCandidate(final IceCandidate candidate) {
-    pc.addRemoteIceCandidate(candidate);
+    if (pc != null) {
+      pc.addRemoteIceCandidate(candidate);
+    }
   }
 
   @Override
@@ -398,8 +451,7 @@ public class AppRTCDemoActivity extends Activity
 
   @Override
   public void onChannelError(int code, String description) {
-    logAndToast("Channel error: " + code + ". " + description);
-    disconnect();
+    disconnectWithMessage(description);
   }
 
   // -----Implementation of PeerConnectionClient.PeerConnectionEvents.---------
@@ -407,19 +459,35 @@ public class AppRTCDemoActivity extends Activity
   // All callbacks are invoked from UI thread.
   @Override
   public void onLocalDescription(final SessionDescription sdp) {
-    logAndToast("Sending " + sdp.type + " ...");
-    appRtcClient.sendLocalDescription(sdp);
+    if (appRtcClient != null) {
+      logAndToast("Sending " + sdp.type + " ...");
+      appRtcClient.sendLocalDescription(sdp);
+    }
   }
 
   @Override
   public void onIceCandidate(final IceCandidate candidate) {
-    appRtcClient.sendLocalIceCandidate(candidate);
+    if (appRtcClient != null) {
+      appRtcClient.sendLocalIceCandidate(candidate);
+    }
   }
 
   @Override
   public void onIceConnected() {
     logAndToast("ICE connected");
-    VideoRendererGui.update(localRender, 70, 70, 28, 28,
-        VideoRendererGui.ScalingType.SCALE_ASPECT_FIT);
+    iceConnected = true;
+    updateVideoView();
   }
+
+  @Override
+  public void onIceDisconnected() {
+    logAndToast("ICE disconnected");
+    disconnect();
+  }
+
+  @Override
+  public void onPeerConnectionError(String description) {
+    disconnectWithMessage(description);
+  }
+
 }
diff --git a/talk/examples/android/src/org/appspot/apprtc/ConnectActivity.java b/talk/examples/android/src/org/appspot/apprtc/ConnectActivity.java
index 6a2ca5b315..8f00c1c815 100644
--- a/talk/examples/android/src/org/appspot/apprtc/ConnectActivity.java
+++ b/talk/examples/android/src/org/appspot/apprtc/ConnectActivity.java
@@ -32,7 +32,6 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.ActivityInfo;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
@@ -44,26 +43,40 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.inputmethod.EditorInfo;
 import android.webkit.URLUtil;
-import android.widget.Button;
-import android.widget.CheckBox;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
 import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.ListView;
 import android.widget.TextView;
 
+import java.util.ArrayList;
+
+import org.json.JSONArray;
+import org.json.JSONException;
 import org.webrtc.MediaCodecVideoEncoder;
 
+
 /**
  * Handles the initial setup where the user selects which room to join.
  */
 public class ConnectActivity extends Activity {
 
   private static final String TAG = "ConnectActivity";
-  private Button connectButton;
+  private ImageButton addRoomButton;
+  private ImageButton removeRoomButton;
+  private ImageButton connectButton;
+  private ImageButton connectLoopbackButton;
   private EditText roomEditText;
-  private CheckBox loopbackCheckBox;
+  private ListView roomListView;
   private SharedPreferences sharedPref;
   private String keyprefUrl;
   private String keyprefResolution;
+  private String keyprefFps;
   private String keyprefRoom;
+  private String keyprefRoomList;
+  private ArrayList<String> roomList;
+  private ArrayAdapter<String> adapter;
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
@@ -74,7 +87,9 @@ public class ConnectActivity extends Activity {
     sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
     keyprefUrl = getString(R.string.pref_url_key);
     keyprefResolution = getString(R.string.pref_resolution_key);
+    keyprefFps = getString(R.string.pref_fps_key);
     keyprefRoom = getString(R.string.pref_room_key);
+    keyprefRoomList = getString(R.string.pref_room_list_key);
 
     // If an implicit VIEW intent is launching the app, go directly to that URL.
     final Intent intent = getIntent();
@@ -85,17 +100,14 @@ public class ConnectActivity extends Activity {
 
     setContentView(R.layout.activity_connect);
 
-    loopbackCheckBox = (CheckBox) findViewById(R.id.check_loopback);
-    loopbackCheckBox.setChecked(false);
-
     roomEditText = (EditText) findViewById(R.id.room_edittext);
     roomEditText.setOnEditorActionListener(
         new TextView.OnEditorActionListener() {
           @Override
           public boolean onEditorAction(
               TextView textView, int i, KeyEvent keyEvent) {
-            if (i == EditorInfo.IME_ACTION_GO) {
-              connectButton.performClick();
+            if (i == EditorInfo.IME_ACTION_DONE) {
+              addRoomButton.performClick();
               return true;
             }
             return false;
@@ -103,42 +115,18 @@ public class ConnectActivity extends Activity {
     });
     roomEditText.requestFocus();
 
-    connectButton = (Button) findViewById(R.id.connect_button);
-    connectButton.setOnClickListener(new OnClickListener() {
-      @Override
-      public void onClick(View view) {
-        String url = sharedPref.getString(keyprefUrl,
-            getString(R.string.pref_url_default));
-        if (loopbackCheckBox.isChecked()) {
-          url += "/?debug=loopback";
-        } else {
-          url += "/?r=" + roomEditText.getText();
-        }
+    roomListView = (ListView) findViewById(R.id.room_listview);
+    roomListView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
 
-        // Add video resolution constraints.
-        String resolution = sharedPref.getString(keyprefResolution,
-            getString(R.string.pref_resolution_default));
-        String[] dimensions = resolution.split("[ x]+");
-        if (dimensions.length == 2) {
-          try {
-            int maxWidth = Integer.parseInt(dimensions[0]);
-            int maxHeight = Integer.parseInt(dimensions[1]);
-            if (maxWidth > 0 && maxHeight > 0) {
-              url += "&video=minHeight=" + maxHeight + ",maxHeight=" +
-                  maxHeight + ",minWidth=" + maxWidth + ",maxWidth=" + maxWidth;
-            }
-          } catch (NumberFormatException e) {
-            Log.e(TAG, "Wrong video resolution setting: " + resolution);
-          }
-        } else {
-          if (MediaCodecVideoEncoder.isPlatformSupported()) {
-            url += "&hd=true";
-          }
-        }
-        // TODO(kjellander): Add support for custom parameters to the URL.
-        connectToRoom(url);
-      }
-    });
+    addRoomButton = (ImageButton) findViewById(R.id.add_room_button);
+    addRoomButton.setOnClickListener(addRoomListener);
+    removeRoomButton = (ImageButton) findViewById(R.id.remove_room_button);
+    removeRoomButton.setOnClickListener(removeRoomListener);
+    connectButton = (ImageButton) findViewById(R.id.connect_button);
+    connectButton.setOnClickListener(connectListener);
+    connectLoopbackButton =
+        (ImageButton) findViewById(R.id.connect_loopback_button);
+    connectLoopbackButton.setOnClickListener(connectListener);
   }
 
   @Override
@@ -163,8 +151,10 @@ public class ConnectActivity extends Activity {
   public void onPause() {
     super.onPause();
     String room = roomEditText.getText().toString();
+    String roomListJson = new JSONArray(roomList).toString();
     SharedPreferences.Editor editor = sharedPref.edit();
     editor.putString(keyprefRoom, room);
+    editor.putString(keyprefRoomList, roomListJson);
     editor.commit();
   }
 
@@ -173,8 +163,100 @@ public class ConnectActivity extends Activity {
     super.onResume();
     String room = sharedPref.getString(keyprefRoom, "");
     roomEditText.setText(room);
+    roomList = new ArrayList<String>();
+    String roomListJson = sharedPref.getString(keyprefRoomList, null);
+    if (roomListJson != null) {
+      try {
+        JSONArray jsonArray = new JSONArray(roomListJson);
+        for (int i = 0; i < jsonArray.length(); i++) {
+          roomList.add(jsonArray.get(i).toString());
+        }
+      } catch (JSONException e) {
+        Log.e(TAG, "Failed to load room list: " + e.toString());
+      }
+    }
+    adapter = new ArrayAdapter<String>(
+        this, android.R.layout.simple_list_item_1, roomList);
+    roomListView.setAdapter(adapter);
+    if (adapter.getCount() > 0) {
+      roomListView.requestFocus();
+      roomListView.setItemChecked(0, true);
+    }
   }
 
+  private final OnClickListener connectListener = new OnClickListener() {
+    @Override
+    public void onClick(View view) {
+      boolean loopback = false;
+      if (view.getId() == R.id.connect_loopback_button) {
+        loopback = true;
+      }
+      String url = sharedPref.getString(keyprefUrl,
+          getString(R.string.pref_url_default));
+      if (loopback) {
+        url += "/?debug=loopback";
+      } else {
+        String roomName = getSelectedItem();
+        if (roomName == null) {
+          roomName = roomEditText.getText().toString();
+        }
+        url += "/?r=" + roomName;
+      }
+      String parametersResolution = null;
+      String parametersFps = null;
+      // Add video resolution constraints.
+      String resolution = sharedPref.getString(keyprefResolution,
+          getString(R.string.pref_resolution_default));
+      String[] dimensions = resolution.split("[ x]+");
+      if (dimensions.length == 2) {
+        try {
+          int maxWidth = Integer.parseInt(dimensions[0]);
+          int maxHeight = Integer.parseInt(dimensions[1]);
+          if (maxWidth > 0 && maxHeight > 0) {
+            parametersResolution = "minHeight=" + maxHeight + ",maxHeight=" +
+                maxHeight + ",minWidth=" + maxWidth + ",maxWidth=" + maxWidth;
+          }
+        } catch (NumberFormatException e) {
+          Log.e(TAG, "Wrong video resolution setting: " + resolution);
+        }
+      }
+      // Add camera fps constraints.
+      String fps = sharedPref.getString(keyprefFps,
+          getString(R.string.pref_fps_default));
+      String[] fpsValues = fps.split("[ x]+");
+      if (fpsValues.length == 2) {
+        try {
+          int cameraFps = Integer.parseInt(fpsValues[0]);
+          if (cameraFps > 0) {
+            parametersFps = "minFrameRate=" + cameraFps +
+                ",maxFrameRate=" + cameraFps;
+          }
+        } catch (NumberFormatException e) {
+          Log.e(TAG, "Wrong camera fps setting: " + fps);
+        }
+      }
+      // Modify connection URL.
+      if (parametersResolution != null || parametersFps != null) {
+        url += "&video=";
+        if (parametersResolution != null) {
+          url += parametersResolution;
+          if (parametersFps != null) {
+            url += ",";
+          }
+        }
+        if (parametersFps != null) {
+          url += parametersFps;
+        }
+      } else {
+        if (MediaCodecVideoEncoder.isPlatformSupported()) {
+          url += "&hd=true";
+        }
+      }
+      // TODO(kjellander): Add support for custom parameters to the URL.
+      connectToRoom(url);
+    }
+  };
+
   private void connectToRoom(String roomUrl) {
     if (validateUrl(roomUrl)) {
       Uri url = Uri.parse(roomUrl);
@@ -199,4 +281,42 @@ public class ConnectActivity extends Activity {
           }).create().show();
     return false;
   }
+
+  private final OnClickListener addRoomListener = new OnClickListener() {
+    @Override
+    public void onClick(View view) {
+      String newRoom = roomEditText.getText().toString();
+      if (newRoom.length() > 0 && !roomList.contains(newRoom)) {
+        adapter.add(newRoom);
+        adapter.notifyDataSetChanged();
+      }
+    }
+  };
+
+  private final OnClickListener removeRoomListener = new OnClickListener() {
+    @Override
+    public void onClick(View view) {
+      String selectedRoom = getSelectedItem();
+      if (selectedRoom != null) {
+        adapter.remove(selectedRoom);
+        adapter.notifyDataSetChanged();
+      }
+    }
+  };
+
+  private String getSelectedItem() {
+    int position = AdapterView.INVALID_POSITION;
+    if (roomListView.getCheckedItemCount() > 0 && adapter.getCount() > 0) {
+      position = roomListView.getCheckedItemPosition();
+      if (position >= adapter.getCount()) {
+        position = AdapterView.INVALID_POSITION;
+      }
+    }
+    if (position != AdapterView.INVALID_POSITION) {
+      return adapter.getItem(position);
+    } else {
+      return null;
+    }
+  }
+
 }
diff --git a/talk/examples/android/src/org/appspot/apprtc/GAEChannelClient.java b/talk/examples/android/src/org/appspot/apprtc/GAEChannelClient.java
index bcc06ab49c..5fd0a54ed4 100644
--- a/talk/examples/android/src/org/appspot/apprtc/GAEChannelClient.java
+++ b/talk/examples/android/src/org/appspot/apprtc/GAEChannelClient.java
@@ -51,15 +51,12 @@ public class GAEChannelClient {
 
   /**
    * Callback interface for messages delivered on the Google AppEngine channel.
-   *
-   * Methods are guaranteed to be invoked on the UI thread of |activity| passed
-   * to GAEChannelClient's constructor.
    */
   public interface GAEMessageHandler {
     public void onOpen();
-    public void onMessage(String data);
+    public void onMessage(final String data);
     public void onClose();
-    public void onError(int code, String description);
+    public void onError(final int code, final String description);
   }
 
   /** Asynchronously open an AppEngine channel. */
@@ -83,8 +80,7 @@ public class GAEChannelClient {
               ", desc: " + description);
         }
       });
-    proxyingMessageHandler =
-        new ProxyingMessageHandler(activity, handler, token);
+    proxyingMessageHandler = new ProxyingMessageHandler(handler, token);
     webView.addJavascriptInterface(
         proxyingMessageHandler, "androidMessageHandler");
     webView.loadUrl("file:///android_asset/channel.html");
@@ -102,72 +98,52 @@ public class GAEChannelClient {
   }
 
   // Helper class for proxying callbacks from the Java<->JS interaction
-  // (private, background) thread to the Activity's UI thread.
+  // (private, background) thread.
   private static class ProxyingMessageHandler {
-    private final Activity activity;
     private final GAEMessageHandler handler;
-    private final boolean[] disconnected = { false };
+    private boolean disconnected = false;
     private final String token;
 
-    public
-     ProxyingMessageHandler(Activity activity, GAEMessageHandler handler,
-                            String token) {
-      this.activity = activity;
+    public ProxyingMessageHandler(GAEMessageHandler handler, String token) {
       this.handler = handler;
       this.token = token;
     }
 
     public void disconnect() {
-      disconnected[0] = true;
+      disconnected = true;
     }
 
-    private boolean disconnected() {
-      return disconnected[0];
-    }
-
-    @JavascriptInterface public String getToken() {
+    @JavascriptInterface
+    public String getToken() {
       return token;
     }
 
-    @JavascriptInterface public void onOpen() {
-      activity.runOnUiThread(new Runnable() {
-          public void run() {
-            if (!disconnected()) {
-              handler.onOpen();
-            }
-          }
-        });
+    @JavascriptInterface
+    public void onOpen() {
+      if (!disconnected) {
+        handler.onOpen();
+      }
     }
 
-    @JavascriptInterface public void onMessage(final String data) {
-      activity.runOnUiThread(new Runnable() {
-          public void run() {
-            if (!disconnected()) {
-              handler.onMessage(data);
-            }
-          }
-        });
+    @JavascriptInterface
+    public void onMessage(final String data) {
+      if (!disconnected) {
+        handler.onMessage(data);
+      }
     }
 
-    @JavascriptInterface public void onClose() {
-      activity.runOnUiThread(new Runnable() {
-          public void run() {
-            if (!disconnected()) {
-              handler.onClose();
-            }
-          }
-        });
+    @JavascriptInterface
+    public void onClose() {
+      if (!disconnected) {
+        handler.onClose();
+      }
     }
 
-    @JavascriptInterface public void onError(
-        final int code, final String description) {
-      activity.runOnUiThread(new Runnable() {
-          public void run() {
-            if (!disconnected()) {
-              handler.onError(code, description);
-            }
-          }
-        });
+    @JavascriptInterface
+    public void onError(final int code, final String description) {
+      if (!disconnected) {
+        handler.onError(code, description);
+      }
     }
   }
 }
diff --git a/talk/examples/android/src/org/appspot/apprtc/GAERTCClient.java b/talk/examples/android/src/org/appspot/apprtc/GAERTCClient.java
index 1d1f81705d..c3d95641da 100644
--- a/talk/examples/android/src/org/appspot/apprtc/GAERTCClient.java
+++ b/talk/examples/android/src/org/appspot/apprtc/GAERTCClient.java
@@ -29,7 +29,6 @@ package org.appspot.apprtc;
 import android.app.Activity;
 import android.os.AsyncTask;
 import android.util.Log;
-import android.webkit.JavascriptInterface;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -41,7 +40,6 @@ import org.webrtc.SessionDescription;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.LinkedList;
@@ -83,11 +81,6 @@ public class GAERTCClient implements AppRTCClient {
    */
   @Override
   public void connectToRoom(String url) {
-    while (url.indexOf('?') < 0) {
-      // Keep redirecting until we get a room number.
-      (new RedirectResolver()).execute(url);
-      return;  // RedirectResolver above calls us back with the next URL.
-    }
     (new RoomParameterGetter()).execute(url);
   }
 
@@ -97,6 +90,7 @@ public class GAERTCClient implements AppRTCClient {
   @Override
   public void disconnect() {
     if (channelClient != null) {
+      Log.d(TAG, "Closing GAE Channel.");
       sendMessage("{\"type\": \"bye\"}");
       channelClient.close();
       channelClient = null;
@@ -151,68 +145,36 @@ public class GAERTCClient implements AppRTCClient {
     }
   }
 
-  // Load the given URL and return the value of the Location header of the
-  // resulting 302 response.  If the result is not a 302, throws.
-  private class RedirectResolver extends AsyncTask<String, Void, String> {
-    @Override
-    protected String doInBackground(String... urls) {
-      if (urls.length != 1) {
-        throw new RuntimeException("Must be called with a single URL");
-      }
-      try {
-        return followRedirect(urls[0]);
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-    }
-
-    @Override
-    protected void onPostExecute(String url) {
-      connectToRoom(url);
-    }
-
-    private String followRedirect(String url) throws IOException {
-      HttpURLConnection connection = (HttpURLConnection)
-          new URL(url).openConnection();
-      connection.setInstanceFollowRedirects(false);
-      int code = connection.getResponseCode();
-      if (code != HttpURLConnection.HTTP_MOVED_TEMP) {
-        throw new IOException("Unexpected response: " + code + " for " + url +
-            ", with contents: " + drainStream(connection.getInputStream()));
-      }
-      int n = 0;
-      String name, value;
-      while ((name = connection.getHeaderFieldKey(n)) != null) {
-        value = connection.getHeaderField(n);
-        if (name.equals("Location")) {
-          return value;
-        }
-        ++n;
-      }
-      throw new IOException("Didn't find Location header!");
-    }
-  }
-
   // AsyncTask that converts an AppRTC room URL into the set of signaling
   // parameters to use with that room.
   private class RoomParameterGetter
       extends AsyncTask<String, Void, AppRTCSignalingParameters> {
+    private Exception exception = null;
+
     @Override
     protected AppRTCSignalingParameters doInBackground(String... urls) {
       if (urls.length != 1) {
-        throw new RuntimeException("Must be called with a single URL");
+        exception = new RuntimeException("Must be called with a single URL");
+        return null;
       }
       try {
+        exception = null;
         return getParametersForRoomUrl(urls[0]);
       } catch (JSONException e) {
-        throw new RuntimeException(e);
+        exception = e;
       } catch (IOException e) {
-        throw new RuntimeException(e);
+        exception = e;
       }
+      return null;
     }
 
     @Override
     protected void onPostExecute(AppRTCSignalingParameters params) {
+      if (exception != null) {
+        Log.e(TAG, "Room connection error: " + exception.toString());
+        events.onChannelError(0, exception.getMessage());
+        return;
+      }
       channelClient =
           new GAEChannelClient(activity, channelToken, gaeHandler);
       synchronized (sendQueue) {
@@ -445,42 +407,67 @@ public class GAERTCClient implements AppRTCClient {
   // Implementation detail: handler for receiving GAE messages and dispatching
   // them appropriately.
   private class GAEHandler implements GAEChannelClient.GAEMessageHandler {
-    @JavascriptInterface public void onOpen() {
-      events.onChannelOpen();
-    }
+    private boolean channelOpen = false;
 
-    @JavascriptInterface public void onMessage(String msg) {
-      Log.d(TAG, "RECEIVE: " + msg);
-      try {
-        JSONObject json = new JSONObject(msg);
-        String type = (String) json.get("type");
-        if (type.equals("candidate")) {
-          IceCandidate candidate = new IceCandidate(
-              (String) json.get("id"),
-              json.getInt("label"),
-              (String) json.get("candidate"));
-          events.onRemoteIceCandidate(candidate);
-        } else if (type.equals("answer") || type.equals("offer")) {
-          SessionDescription sdp = new SessionDescription(
-              SessionDescription.Type.fromCanonicalForm(type),
-              (String)json.get("sdp"));
-          events.onRemoteDescription(sdp);
-        } else if (type.equals("bye")) {
-          events.onChannelClose();
-        } else {
-          throw new RuntimeException("Unexpected message: " + msg);
+    public void onOpen() {
+      activity.runOnUiThread(new Runnable() {
+        public void run() {
+          events.onChannelOpen();
+          channelOpen = true;
         }
-      } catch (JSONException e) {
-        throw new RuntimeException(e);
-      }
+      });
     }
 
-    @JavascriptInterface public void onClose() {
-      events.onChannelClose();
+    public void onMessage(final String msg) {
+      Log.d(TAG, "RECEIVE: " + msg);
+      activity.runOnUiThread(new Runnable() {
+        public void run() {
+          if (!channelOpen) {
+            return;
+          }
+          try {
+            JSONObject json = new JSONObject(msg);
+            String type = (String) json.get("type");
+            if (type.equals("candidate")) {
+              IceCandidate candidate = new IceCandidate(
+                  (String) json.get("id"),
+                  json.getInt("label"),
+                  (String) json.get("candidate"));
+              events.onRemoteIceCandidate(candidate);
+            } else if (type.equals("answer") || type.equals("offer")) {
+              SessionDescription sdp = new SessionDescription(
+                  SessionDescription.Type.fromCanonicalForm(type),
+                  (String)json.get("sdp"));
+              events.onRemoteDescription(sdp);
+            } else if (type.equals("bye")) {
+              events.onChannelClose();
+            } else {
+              events.onChannelError(1, "Unexpected channel message: " + msg);
+            }
+          } catch (JSONException e) {
+            events.onChannelError(1, "Channel message JSON parsing error: " +
+                e.toString());
+          }
+        }
+      });
     }
 
-    @JavascriptInterface public void onError(int code, String description) {
-      events.onChannelError(code, description);
+    public void onClose() {
+      activity.runOnUiThread(new Runnable() {
+        public void run() {
+          events.onChannelClose();
+          channelOpen = false;
+        }
+      });
+    }
+
+    public void onError(final int code, final String description) {
+      activity.runOnUiThread(new Runnable() {
+        public void run() {
+          events.onChannelError(code, description);
+          channelOpen = false;
+        }
+      });
     }
   }
 
diff --git a/talk/examples/android/src/org/appspot/apprtc/PeerConnectionClient.java b/talk/examples/android/src/org/appspot/apprtc/PeerConnectionClient.java
index 68159989f3..daea5fb067 100644
--- a/talk/examples/android/src/org/appspot/apprtc/PeerConnectionClient.java
+++ b/talk/examples/android/src/org/appspot/apprtc/PeerConnectionClient.java
@@ -37,6 +37,7 @@ import org.webrtc.MediaConstraints;
 import org.webrtc.MediaStream;
 import org.webrtc.MediaStreamTrack;
 import org.webrtc.PeerConnection;
+import org.webrtc.MediaConstraints.KeyValuePair;
 import org.webrtc.PeerConnection.IceConnectionState;
 import org.webrtc.PeerConnectionFactory;
 import org.webrtc.SdpObserver;
@@ -60,13 +61,13 @@ public class PeerConnectionClient {
   private boolean videoSourceStopped;
   private final PCObserver pcObserver = new PCObserver();
   private final SDPObserver sdpObserver = new SDPObserver();
-  private final MediaConstraints videoConstraints;
   private final VideoRenderer.Callbacks localRender;
   private final VideoRenderer.Callbacks remoteRender;
   private LinkedList<IceCandidate> queuedRemoteCandidates =
       new LinkedList<IceCandidate>();
-  private final MediaConstraints sdpMediaConstraints;
-  private final PeerConnectionEvents events;
+  private MediaConstraints sdpMediaConstraints;
+  private MediaConstraints videoConstraints;
+  private PeerConnectionEvents events;
   private boolean isInitiator;
   private boolean useFrontFacingCamera = true;
   private SessionDescription localSdp = null; // either offer or answer SDP
@@ -79,7 +80,6 @@ public class PeerConnectionClient {
       AppRTCSignalingParameters appRtcParameters,
       PeerConnectionEvents events) {
     this.activity = activity;
-    this.videoConstraints = appRtcParameters.videoConstraints;
     this.localRender = localRender;
     this.remoteRender = remoteRender;
     this.events = events;
@@ -90,9 +90,9 @@ public class PeerConnectionClient {
         "OfferToReceiveAudio", "true"));
     sdpMediaConstraints.mandatory.add(new MediaConstraints.KeyValuePair(
         "OfferToReceiveVideo", "true"));
+    videoConstraints = appRtcParameters.videoConstraints;
 
     factory = new PeerConnectionFactory();
-
     MediaConstraints pcConstraints = appRtcParameters.pcConstraints;
     pcConstraints.optional.add(
         new MediaConstraints.KeyValuePair("RtpDataChannels", "true"));
@@ -122,38 +122,91 @@ public class PeerConnectionClient {
     }
   }
 
+  public boolean isHDVideo() {
+    if (videoConstraints == null) {
+      return false;
+    }
+    int minWidth = 0;
+    int minHeight = 0;
+    for (KeyValuePair keyValuePair : videoConstraints.mandatory) {
+      if (keyValuePair.getKey().equals("minWidth")) {
+        try {
+          minWidth = Integer.parseInt(keyValuePair.getValue());
+        } catch (NumberFormatException e) {
+          Log.e(TAG, "Can not parse video width from video constraints");
+        }
+      } else if (keyValuePair.getKey().equals("minHeight")) {
+        try {
+          minHeight = Integer.parseInt(keyValuePair.getValue());
+        } catch (NumberFormatException e) {
+          Log.e(TAG, "Can not parse video height from video constraints");
+        }
+      }
+    }
+    if (minWidth * minHeight >= 1280 * 720) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
   public boolean getStats(StatsObserver observer, MediaStreamTrack track) {
     return pc.getStats(observer, track);
   }
 
   public void createOffer() {
-    isInitiator = true;
-    pc.createOffer(sdpObserver, sdpMediaConstraints);
+    activity.runOnUiThread(new Runnable() {
+      public void run() {
+        if (pc != null) {
+          isInitiator = true;
+          pc.createOffer(sdpObserver, sdpMediaConstraints);
+        }
+      }
+    });
   }
 
   public void createAnswer() {
-    isInitiator = false;
-    pc.createAnswer(sdpObserver, sdpMediaConstraints);
+    activity.runOnUiThread(new Runnable() {
+      public void run() {
+        if (pc != null) {
+          isInitiator = false;
+          pc.createAnswer(sdpObserver, sdpMediaConstraints);
+        }
+      }
+    });
   }
 
 
-  public void addRemoteIceCandidate(IceCandidate candidate) {
-    if (queuedRemoteCandidates != null) {
-      queuedRemoteCandidates.add(candidate);
-    } else {
-      pc.addIceCandidate(candidate);
-    }
+  public void addRemoteIceCandidate(final IceCandidate candidate) {
+    activity.runOnUiThread(new Runnable() {
+      public void run() {
+        if (pc != null) {
+          if (queuedRemoteCandidates != null) {
+            queuedRemoteCandidates.add(candidate);
+          } else {
+            pc.addIceCandidate(candidate);
+          }
+        }
+      }
+    });
   }
 
-  public void setRemoteDescription(SessionDescription sdp) {
-    SessionDescription sdpISAC = new SessionDescription(
-        sdp.type, preferISAC(sdp.description));
-    Log.d(TAG, "Set remote SDP");
-    pc.setRemoteDescription(sdpObserver, sdpISAC);
+  public void setRemoteDescription(final SessionDescription sdp) {
+    activity.runOnUiThread(new Runnable() {
+      public void run() {
+        if (pc != null) {
+          SessionDescription sdpISAC = new SessionDescription(
+              sdp.type, preferISAC(sdp.description));
+          Log.d(TAG, "Set remote SDP");
+          pc.setRemoteDescription(sdpObserver, sdpISAC);
+        }
+      }
+    });
   }
 
   public void stopVideoSource() {
     if (videoSource != null) {
+      Log.d(TAG, "Stop video source.");
       videoSource.stop();
       videoSourceStopped = true;
     }
@@ -161,24 +214,30 @@ public class PeerConnectionClient {
 
   public void startVideoSource() {
     if (videoSource != null && videoSourceStopped) {
+      Log.d(TAG, "Restart video source.");
       videoSource.restart();
       videoSourceStopped = false;
     }
   }
 
   public void close() {
-    if (pc != null) {
-      pc.dispose();
-      pc = null;
-    }
-    if (videoSource != null) {
-      videoSource.dispose();
-      videoSource = null;
-    }
-    if (factory != null) {
-      factory.dispose();
-      factory = null;
-    }
+    activity.runOnUiThread(new Runnable() {
+      public void run() {
+        Log.d(TAG, "Closing peer connection.");
+        if (pc != null) {
+          pc.dispose();
+          pc = null;
+        }
+        if (videoSource != null) {
+          videoSource.dispose();
+          videoSource = null;
+        }
+        if (factory != null) {
+          factory.dispose();
+          factory = null;
+        }
+      }
+    });
   }
 
   /**
@@ -200,6 +259,25 @@ public class PeerConnectionClient {
      * CONNECTED).
      */
     public void onIceConnected();
+
+    /**
+     * Callback fired once connection is closed (IceConnectionState is
+     * DISCONNECTED).
+     */
+    public void onIceDisconnected();
+
+    /**
+     * Callback fired once peer connection error happened.
+     */
+    public void onPeerConnectionError(String description);
+  }
+
+  private void reportError(final String errorMessage) {
+    activity.runOnUiThread(new Runnable() {
+      public void run() {
+        events.onPeerConnectionError(errorMessage);
+      }
+    });
   }
 
   // Cycle through likely device names for the camera and return the first
@@ -225,29 +303,30 @@ public class PeerConnectionClient {
         }
       }
     }
-    throw new RuntimeException("Failed to open capturer");
+    reportError("Failed to open capturer");
+    return null;
   }
 
   private VideoTrack createVideoTrack(boolean frontFacing) {
-      VideoCapturer capturer = getVideoCapturer(frontFacing);
-      if (videoSource != null) {
-        videoSource.stop();
-        videoSource.dispose();
-      }
+    VideoCapturer capturer = getVideoCapturer(frontFacing);
+    if (videoSource != null) {
+      videoSource.stop();
+      videoSource.dispose();
+    }
 
-      videoSource = factory.createVideoSource(
-          capturer, videoConstraints);
-      String trackExtension = frontFacing ? "frontFacing" : "backFacing";
-      VideoTrack videoTrack =
-          factory.createVideoTrack("ARDAMSv0" + trackExtension, videoSource);
-      videoTrack.addRenderer(new VideoRenderer(localRender));
-      return videoTrack;
+    videoSource = factory.createVideoSource(
+        capturer, videoConstraints);
+    String trackExtension = frontFacing ? "frontFacing" : "backFacing";
+    VideoTrack videoTrack =
+        factory.createVideoTrack("ARDAMSv0" + trackExtension, videoSource);
+    videoTrack.addRenderer(new VideoRenderer(localRender));
+    return videoTrack;
   }
 
   // Poor-man's assert(): die with |msg| unless |condition| is true.
-  private static void abortUnless(boolean condition, String msg) {
+  private void abortUnless(boolean condition, String msg) {
     if (!condition) {
-      throw new RuntimeException(msg);
+      reportError(msg);
     }
   }
 
@@ -355,19 +434,15 @@ public class PeerConnectionClient {
     @Override
     public void onIceCandidate(final IceCandidate candidate){
       activity.runOnUiThread(new Runnable() {
-          public void run() {
-            events.onIceCandidate(candidate);
-          }
-        });
+        public void run() {
+          events.onIceCandidate(candidate);
+        }
+      });
     }
 
     @Override
-    public void onError(){
-      activity.runOnUiThread(new Runnable() {
-          public void run() {
-            throw new RuntimeException("PeerConnection error!");
-          }
-        });
+    public void onError() {
+      reportError("PeerConnection error!");
     }
 
     @Override
@@ -386,47 +461,50 @@ public class PeerConnectionClient {
             events.onIceConnected();
           }
         });
+      } else if (newState == IceConnectionState.DISCONNECTED) {
+        activity.runOnUiThread(new Runnable() {
+          public void run() {
+            events.onIceDisconnected();
+          }
+        });
+      } else if (newState == IceConnectionState.FAILED) {
+        reportError("ICE connection failed.");
       }
     }
 
     @Override
     public void onIceGatheringChange(
-        PeerConnection.IceGatheringState newState) {
+      PeerConnection.IceGatheringState newState) {
     }
 
     @Override
     public void onAddStream(final MediaStream stream){
       activity.runOnUiThread(new Runnable() {
-          public void run() {
-            abortUnless(stream.audioTracks.size() <= 1 &&
-                stream.videoTracks.size() <= 1,
-                "Weird-looking stream: " + stream);
-            if (stream.videoTracks.size() == 1) {
-              stream.videoTracks.get(0).addRenderer(
-                  new VideoRenderer(remoteRender));
-            }
+        public void run() {
+          abortUnless(stream.audioTracks.size() <= 1 &&
+              stream.videoTracks.size() <= 1,
+              "Weird-looking stream: " + stream);
+          if (stream.videoTracks.size() == 1) {
+            stream.videoTracks.get(0).addRenderer(
+                new VideoRenderer(remoteRender));
           }
-        });
+        }
+      });
     }
 
     @Override
     public void onRemoveStream(final MediaStream stream){
       activity.runOnUiThread(new Runnable() {
-          public void run() {
-            stream.videoTracks.get(0).dispose();
-          }
-        });
+        public void run() {
+          stream.videoTracks.get(0).dispose();
+        }
+      });
     }
 
     @Override
     public void onDataChannel(final DataChannel dc) {
-      activity.runOnUiThread(new Runnable() {
-          public void run() {
-            throw new RuntimeException(
-                "AppRTC doesn't use data channels, but got: " + dc.label() +
-                " anyway!");
-          }
-        });
+      reportError("AppRTC doesn't use data channels, but got: " + dc.label() +
+          " anyway!");
     }
 
     @Override
@@ -446,65 +524,62 @@ public class PeerConnectionClient {
           origSdp.type, preferISAC(origSdp.description));
       localSdp = sdp;
       activity.runOnUiThread(new Runnable() {
-          public void run() {
+        public void run() {
+          if (pc != null) {
             Log.d(TAG, "Set local SDP from " + sdp.type);
             pc.setLocalDescription(sdpObserver, sdp);
           }
-        });
+        }
+      });
     }
 
     @Override
     public void onSetSuccess() {
       activity.runOnUiThread(new Runnable() {
-          public void run() {
-            if (isInitiator) {
-              // For offering peer connection we first create offer and set
-              // local SDP, then after receiving answer set remote SDP.
-              if (pc.getRemoteDescription() == null) {
-                // We've just set our local SDP so time to send it.
-                Log.d(TAG, "Local SDP set succesfully");
-                events.onLocalDescription(localSdp);
-              } else {
-                // We've just set remote description,
-                // so drain remote ICE candidates.
-                Log.d(TAG, "Remote SDP set succesfully");
-                drainRemoteCandidates();
-              }
+        public void run() {
+          if (pc == null) {
+            return;
+          }
+          if (isInitiator) {
+            // For offering peer connection we first create offer and set
+            // local SDP, then after receiving answer set remote SDP.
+            if (pc.getRemoteDescription() == null) {
+              // We've just set our local SDP so time to send it.
+              Log.d(TAG, "Local SDP set succesfully");
+              events.onLocalDescription(localSdp);
             } else {
-              // For answering peer connection we set remote SDP and then
-              // create answer and set local SDP.
-              if (pc.getLocalDescription() != null) {
-                // We've just set our local SDP so time to send it and drain
-                // remote ICE candidates.
-                Log.d(TAG, "Local SDP set succesfully");
-                events.onLocalDescription(localSdp);
-                drainRemoteCandidates();
-              } else {
-                // We've just set remote SDP - do nothing for now -
-                // answer will be created soon.
-                Log.d(TAG, "Remote SDP set succesfully");
-              }
+              // We've just set remote description,
+              // so drain remote ICE candidates.
+              Log.d(TAG, "Remote SDP set succesfully");
+              drainRemoteCandidates();
+            }
+          } else {
+            // For answering peer connection we set remote SDP and then
+            // create answer and set local SDP.
+            if (pc.getLocalDescription() != null) {
+              // We've just set our local SDP so time to send it and drain
+              // remote ICE candidates.
+              Log.d(TAG, "Local SDP set succesfully");
+              events.onLocalDescription(localSdp);
+              drainRemoteCandidates();
+            } else {
+              // We've just set remote SDP - do nothing for now -
+              // answer will be created soon.
+              Log.d(TAG, "Remote SDP set succesfully");
             }
           }
-        });
+        }
+      });
     }
 
     @Override
     public void onCreateFailure(final String error) {
-      activity.runOnUiThread(new Runnable() {
-          public void run() {
-            throw new RuntimeException("createSDP error: " + error);
-          }
-        });
+      reportError("createSDP error: " + error);
     }
 
     @Override
     public void onSetFailure(final String error) {
-      activity.runOnUiThread(new Runnable() {
-          public void run() {
-            throw new RuntimeException("setSDP error: " + error);
-          }
-        });
+      reportError("setSDP error: " + error);
     }
   }
 
@@ -524,11 +599,7 @@ public class PeerConnectionClient {
 
     @Override
     public void onSetFailure(final String error) {
-      activity.runOnUiThread(new Runnable() {
-        public void run() {
-          throw new RuntimeException("setSDP error while switching camera: " + error);
-        }
-      });
+      reportError("setSDP error while switching camera: " + error);
     }
   }
 }
diff --git a/talk/examples/android/src/org/appspot/apprtc/SettingsActivity.java b/talk/examples/android/src/org/appspot/apprtc/SettingsActivity.java
index e974aafce8..2354ceb4aa 100644
--- a/talk/examples/android/src/org/appspot/apprtc/SettingsActivity.java
+++ b/talk/examples/android/src/org/appspot/apprtc/SettingsActivity.java
@@ -38,12 +38,14 @@ public class SettingsActivity extends Activity
   private SettingsFragment settingsFragment;
   private String keyprefUrl;
   private String keyprefResolution;
+  private String keyprefFps;
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     keyprefUrl = getString(R.string.pref_url_key);
     keyprefResolution = getString(R.string.pref_resolution_key);
+    keyprefFps = getString(R.string.pref_fps_key);
 
     // Display the fragment as the main content.
     settingsFragment = new SettingsFragment();
@@ -61,6 +63,7 @@ public class SettingsActivity extends Activity
     sharedPreferences.registerOnSharedPreferenceChangeListener(this);
     updateSummary(sharedPreferences, keyprefUrl);
     updateSummary(sharedPreferences, keyprefResolution);
+    updateSummary(sharedPreferences, keyprefFps);
   }
 
   @Override
@@ -74,7 +77,8 @@ public class SettingsActivity extends Activity
   @Override
   public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
       String key) {
-    if (key.equals(keyprefUrl) || key.equals(keyprefResolution)) {
+    if (key.equals(keyprefUrl) || key.equals(keyprefResolution) ||
+        key.equals(keyprefFps)) {
       updateSummary(sharedPreferences, key);
     }
   }
diff --git a/talk/libjingle_examples.gyp b/talk/libjingle_examples.gyp
index a610146eed..d0f1747626 100755
--- a/talk/libjingle_examples.gyp
+++ b/talk/libjingle_examples.gyp
@@ -317,14 +317,26 @@
                 'examples/android/build.xml',
                 'examples/android/jni/Android.mk',
                 'examples/android/project.properties',
-                'examples/android/res/drawable-hdpi/ic_launcher.png',
                 'examples/android/res/drawable-hdpi/disconnect.png',
-                'examples/android/res/drawable-ldpi/ic_launcher.png',
+                'examples/android/res/drawable-hdpi/ic_action_full_screen.png',
+                'examples/android/res/drawable-hdpi/ic_action_return_from_full_screen.png',
+                'examples/android/res/drawable-hdpi/ic_loopback_call.png',
+                'examples/android/res/drawable-hdpi/ic_launcher.png',
                 'examples/android/res/drawable-ldpi/disconnect.png',
-                'examples/android/res/drawable-mdpi/ic_launcher.png',
+                'examples/android/res/drawable-ldpi/ic_action_full_screen.png',
+                'examples/android/res/drawable-ldpi/ic_action_return_from_full_screen.png',
+                'examples/android/res/drawable-ldpi/ic_loopback_call.png',
+                'examples/android/res/drawable-ldpi/ic_launcher.png',
                 'examples/android/res/drawable-mdpi/disconnect.png',
-                'examples/android/res/drawable-xhdpi/ic_launcher.png',
+                'examples/android/res/drawable-mdpi/ic_action_full_screen.png',
+                'examples/android/res/drawable-mdpi/ic_action_return_from_full_screen.png',
+                'examples/android/res/drawable-mdpi/ic_loopback_call.png',
+                'examples/android/res/drawable-mdpi/ic_launcher.png',
                 'examples/android/res/drawable-xhdpi/disconnect.png',
+                'examples/android/res/drawable-xhdpi/ic_action_full_screen.png',
+                'examples/android/res/drawable-xhdpi/ic_action_return_from_full_screen.png',
+                'examples/android/res/drawable-xhdpi/ic_loopback_call.png',
+                'examples/android/res/drawable-xhdpi/ic_launcher.png',
                 'examples/android/res/layout/activity_connect.xml',
                 'examples/android/res/layout/activity_fullscreen.xml',
                 'examples/android/res/layout/fragment_menubar.xml',