commit 14d5dbe5b35c560e978dab0c02c48cb16d28273d
author ivoc <ivoc@webrtc.org> Mon Jul 04 07:06:55 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jul 04 14:07:03 2016 +0000
tree aa73a0a6a99a86ab13489ea0358f7235c7bf1ae9
parent 77ad394fa6680aa9fb36d0bcac330dd84b29dfc2

Reland of "Move RtcEventLog object from inside VoiceEngine to Call.", "Fix to make the start/stop functions for the Rtc Eventlog non-virtual." and "Fix for RtcEventLog ObjC interface"

The breaking tests in Chromium have been temporarily disabled, they will be fixed and reenabled soon.

Original CLs: https://codereview.webrtc.org/1748403002/, https://codereview.webrtc.org/2107253002/ and https://codereview.webrtc.org/2106103003/.

TBR=solenberg@webrtc.org,tommi@webrtc.org,stefan@webrtc.org,terelius@webrtc.org,tkchin@webrtc.org
BUG=webrtc:4741, webrtc:5603, chromium:609749

Review-Url: https://codereview.webrtc.org/2110113003
Cr-Commit-Position: refs/heads/master@{#13379}

webrtc/examples/objc/AppRTCDemo/ARDAppClient.m

diff --git a/webrtc/examples/objc/AppRTCDemo/ARDAppClient.m b/webrtc/examples/objc/AppRTCDemo/ARDAppClient.m
index 88431c6..43eb6f4 100644
--- a/webrtc/examples/objc/AppRTCDemo/ARDAppClient.m
+++ b/webrtc/examples/objc/AppRTCDemo/ARDAppClient.m
@@ -308,11 +308,13 @@
   _isInitiator = NO;
   _hasReceivedSdp = NO;
   _messageQueue = [NSMutableArray array];
+#if defined(WEBRTC_IOS)
+  [_peerConnection stopRtcEventLog];
+#endif
   _peerConnection = nil;
   self.state = kARDAppClientStateDisconnected;
 #if defined(WEBRTC_IOS)
   RTCStopInternalCapture();
-  [_factory stopRtcEventLog];
 #endif
 }
 
@@ -526,17 +528,6 @@
   }
   self.state = kARDAppClientStateConnected;
 
-#if defined(WEBRTC_IOS)
-  // Start event log.
-  if (kARDAppClientEnableRtcEventLog) {
-    NSString *filePath = [self documentsFilePathForFileName:@"webrtc-rtceventlog"];
-    if (![_factory startRtcEventLogWithFilePath:filePath
-                                 maxSizeInBytes:kARDAppClientRtcEventLogMaxSizeInBytes]) {
-      RTCLogError(@"Failed to start event logging.");
-    }
-  }
-#endif
-
   // Create peer connection.
   RTCMediaConstraints *constraints = [self defaultPeerConnectionConstraints];
   RTCConfiguration *config = [[RTCConfiguration alloc] init];
@@ -562,6 +553,16 @@
     // Check if we've received an offer.
     [self drainMessageQueueIfReady];
   }
+#if defined(WEBRTC_IOS)
+  // Start event log.
+  if (kARDAppClientEnableRtcEventLog) {
+    NSString *filePath = [self documentsFilePathForFileName:@"webrtc-rtceventlog"];
+    if (![_peerConnection startRtcEventLogWithFilePath:filePath
+                                 maxSizeInBytes:kARDAppClientRtcEventLogMaxSizeInBytes]) {
+      RTCLogError(@"Failed to start event logging.");
+    }
+  }
+#endif
 }
 
 // Processes the messages that we've received from the room server and the