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/APPRTCViewController.m

diff --git a/talk/examples/ios/AppRTCDemo/APPRTCViewController.m b/talk/examples/ios/AppRTCDemo/APPRTCViewController.m
index bd346ef..cacac14 100644
--- a/talk/examples/ios/AppRTCDemo/APPRTCViewController.m
+++ b/talk/examples/ios/AppRTCDemo/APPRTCViewController.m
@@ -27,8 +27,12 @@
 
 #import "APPRTCViewController.h"
 
+#import "VideoView.h"
+
 @interface APPRTCViewController ()
 
+@property (nonatomic, assign) UIInterfaceOrientation statusBarOrientation;
+
 @end
 
 @implementation APPRTCViewController
@@ -36,13 +40,31 @@
 @synthesize textField = _textField;
 @synthesize textInstructions = _textInstructions;
 @synthesize textOutput = _textOutput;
+@synthesize blackView = _blackView;
+
+@synthesize remoteVideoView = _remoteVideoView;
+@synthesize localVideoView = _localVideoView;
+
+@synthesize statusBarOrientation = _statusBarOrientation;
 
 - (void)viewDidLoad {
   [super viewDidLoad];
+  self.statusBarOrientation =
+    [UIApplication sharedApplication].statusBarOrientation;
   self.textField.delegate = self;
   [self.textField becomeFirstResponder];
 }
 
+- (void)viewDidLayoutSubviews {
+    if (self.statusBarOrientation !=
+        [UIApplication sharedApplication].statusBarOrientation) {
+        self.statusBarOrientation =
+            [UIApplication sharedApplication].statusBarOrientation;
+        [[NSNotificationCenter defaultCenter]
+         postNotificationName:@"StatusBarOrientationDidChange" object:nil];
+    }
+}
+
 - (void)displayText:(NSString *)text {
   dispatch_async(dispatch_get_main_queue(), ^(void) {
     NSString *output =
@@ -52,11 +74,75 @@
 }
 
 - (void)resetUI {
+  [self.textField resignFirstResponder];
   self.textField.text = nil;
   self.textField.hidden = NO;
   self.textInstructions.hidden = NO;
   self.textOutput.hidden = YES;
   self.textOutput.text = nil;
+  self.blackView.hidden = YES;
+
+  [_remoteVideoView stop];
+  [_remoteVideoView removeFromSuperview];
+  self.remoteVideoView = nil;
+
+  [_localVideoView stop];
+  [_localVideoView removeFromSuperview];
+  self.localVideoView = nil;
+}
+
+// TODO(fischman): Use video dimensions from the incoming video stream
+// and resize the Video View accordingly w.r.t. aspect ratio.
+enum {
+    // Remote video view dimensions.
+    kRemoteVideoWidth = 640,
+    kRemoteVideoHeight = 480,
+    // Padding space for local video view with its parent.
+    kLocalViewPadding = 20
+};
+
+- (void)setupCaptureSession {
+    self.blackView.hidden = NO;
+
+    CGRect frame = CGRectMake((self.blackView.bounds.size.width
+                               -kRemoteVideoWidth)/2,
+                              (self.blackView.bounds.size.height
+                               -kRemoteVideoHeight)/2,
+                              kRemoteVideoWidth,
+                              kRemoteVideoHeight);
+    VideoView *videoView = [[VideoView alloc] initWithFrame:frame];
+    videoView.isRemote = TRUE;
+
+    [self.blackView addSubview:videoView];
+    videoView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin |
+                                    UIViewAutoresizingFlexibleRightMargin |
+                                    UIViewAutoresizingFlexibleBottomMargin |
+                                    UIViewAutoresizingFlexibleTopMargin;
+    videoView.translatesAutoresizingMaskIntoConstraints = YES;
+    _remoteVideoView = videoView;
+
+    CGSize screenSize = [[UIScreen mainScreen] bounds].size;
+    CGFloat localVideoViewWidth =
+        UIInterfaceOrientationIsPortrait(self.statusBarOrientation) ?
+                        screenSize.width/4 : screenSize.height/4;
+    CGFloat localVideoViewHeight =
+        UIInterfaceOrientationIsPortrait(self.statusBarOrientation) ?
+                        screenSize.height/4 : screenSize.width/4;
+    frame = CGRectMake(self.blackView.bounds.size.width
+                       -localVideoViewWidth-kLocalViewPadding,
+                       kLocalViewPadding,
+                       localVideoViewWidth,
+                       localVideoViewHeight);
+    videoView = [[VideoView alloc] initWithFrame:frame];
+    videoView.isRemote = FALSE;
+
+    [self.blackView addSubview:videoView];
+    videoView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin |
+                                    UIViewAutoresizingFlexibleBottomMargin |
+                                    UIViewAutoresizingFlexibleHeight |
+                                    UIViewAutoresizingFlexibleWidth;
+    videoView.translatesAutoresizingMaskIntoConstraints = YES;
+    _localVideoView = videoView;
 }
 
 #pragma mark - UITextFieldDelegate
@@ -76,6 +162,10 @@
   NSString *url =
       [NSString stringWithFormat:@"apprtc://apprtc.appspot.com/?r=%@", room];
   [[UIApplication sharedApplication] openURL:[NSURL URLWithString:url]];
+
+  dispatch_async(dispatch_get_main_queue(), ^{
+      [self setupCaptureSession];
+  });
 }
 
 - (BOOL)textFieldShouldReturn:(UITextField *)textField {