commit d3d6bce9edfb708aee93518e9d5a4a222a35a935
author henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Mar 10 20:41:22 2014 +0000
committer henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Mar 10 20:41:22 2014 +0000
tree 96ede2d1d89d1fd5a8561f0fa319bb68f4deeccf
parent d32797f8530882bea873ab6a42079b9c1912e3b9

(Auto)update libjingle 62865357-> 62871616

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5674 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/examples/ios/AppRTCDemo/APPRTCAppClient.m

diff --git a/talk/examples/ios/AppRTCDemo/APPRTCAppClient.m b/talk/examples/ios/AppRTCDemo/APPRTCAppClient.m
index 7108116..5b035e3 100644
--- a/talk/examples/ios/AppRTCDemo/APPRTCAppClient.m
+++ b/talk/examples/ios/AppRTCDemo/APPRTCAppClient.m
@@ -31,6 +31,8 @@
 
 #import "GAEChannelClient.h"
 #import "RTCICEServer.h"
+#import "APPRTCAppDelegate.h"
+#import "RTCMediaConstraints.h"
 
 @interface APPRTCAppClient ()
 
@@ -62,6 +64,7 @@
 @synthesize token = _token;
 @synthesize verboseLogging = _verboseLogging;
 @synthesize initiator = _initiator;
+@synthesize videoConstraints = _videoConstraints;
 
 - (id)init {
   if (self = [super init]) {
@@ -263,6 +266,9 @@
                           options:0
                             range:NSMakeRange(0, [self.roomHtml length])]) {
     [self showMessage:@"Room full"];
+    APPRTCAppDelegate *ad =
+      (APPRTCAppDelegate *)[[UIApplication sharedApplication] delegate];
+    [ad closeVideoUI];
     return;
   }
 
@@ -331,6 +337,18 @@
   }
   [self updateICEServers:ICEServers withTurnServer:turnServerUrl];
 
+  NSString* mc = [self findVar:@"mediaConstraints" strippingQuotes:NO];
+  if (mc) {
+    error = nil;
+    NSData *mcData = [mc dataUsingEncoding:NSUTF8StringEncoding];
+    json =
+      [NSJSONSerialization JSONObjectWithData:mcData options:0 error:&error];
+    NSAssert(!error, @"Unable to parse.  %@", error.localizedDescription);
+    if ([[json objectForKey:@"video"] boolValue]) {
+      self.videoConstraints = [[RTCMediaConstraints alloc] init];
+    }
+  }
+
   [self maybeLogMessage:
           [NSString stringWithFormat:@"About to open GAE with token:  %@",
               self.token]];