Cleanup of iOS AudioDevice implementation

webrtc/modules/utility/source/helpers_ios.mm

 /*
- *  Copyright 2015 The WebRTC Project Authors. All rights reserved.
+ *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #if defined(WEBRTC_IOS)
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
+#import <AVFoundation/AVFoundation.h>
 #import <Foundation/Foundation.h>
-#include <string.h>
+#include <pthread.h>
 
 #include "webrtc/base/checks.h"
-#include "webrtc/typedefs.h"
+#include "webrtc/modules/utility/interface/helpers_ios.h"
 
 namespace webrtc {
-namespace test {
+namespace ios {
 
 // TODO(henrika): move to shared location.
 // See https://code.google.com/p/webrtc/issues/detail?id=4773 for details.
 NSString* NSStringFromStdString(const std::string& stdString) {
   // std::string may contain null termination character so we construct
   // using length.
   return [[NSString alloc] initWithBytes:stdString.data()
                                   length:stdString.length()
                                 encoding:NSUTF8StringEncoding];
 }
 
 std::string StdStringFromNSString(NSString* nsString) {
   NSData* charData = [nsString dataUsingEncoding:NSUTF8StringEncoding];
   return std::string(reinterpret_cast<const char*>([charData bytes]),
                      [charData length]);
 }
 
-// For iOS, resource files are added to the application bundle in the root
-// and not in separate folders as is the case for other platforms. This method
-// therefore removes any prepended folders and uses only the actual file name.
-std::string IOSResourcePath(std::string name, std::string extension) {
-  @autoreleasepool {
-    NSString* path = NSStringFromStdString(name);
-    NSString* fileName = path.lastPathComponent;
-    NSString* fileType = NSStringFromStdString(extension);
-    // Get full pathname for the resource identified by the name and extension.
-    NSString* pathString = [[NSBundle mainBundle] pathForResource:fileName
-                                                           ofType:fileType];
-    return StdStringFromNSString(pathString);
+bool CheckAndLogError(BOOL success, NSError* error) {
+  if (!success) {
+    NSLog(@"Error: %ld, %@", (long)error.code, error.localizedDescription);

[tkchin_webrtc, 2015/07/06 03:46:29]

I think it is better to stick with webrtc LOG macros for logging (Hoping to
convert the rest of our bits from NSLog -> LOG). They will show up in console in
debug builds. And you can set a flag if you want them enabled in Release builds
with the rest of the webrtc logs.

[henrika_webrtc, 2015/07/07 16:01:39]

Done.

[henrika_webrtc, 2015/07/08 15:20:10]

Not sure if my way is what you wanted. Hope it looks OK.

[tkchin_webrtc, 2015/07/08 19:41:14]

Yeah, just wanted LS_ERROR. Format is up to you, looks fine to me.

+    return false;
   }
+  return true;
 }
 
-}  // namespace test
+std::string GetCurrentThreadDescription() {
+  NSString* name = [NSString stringWithFormat:@"%@", [NSThread currentThread]];

[tkchin_webrtc, 2015/07/06 03:46:29]

I would add these functions to logging.cc so that it logs thread info when you
set LogThreads(true)

[henrika_webrtc, 2015/07/07 16:01:39]

Great idea, let me add support for GetThreadId as well then. But hope it is OK
if I keep GetCurrentThreadDescription() here since it is a special format that I
only log once at construction. Example: <NSThread: 0x170261100>{number = 1, name
= main}
A default thread ID looks like: [tid=2055] only.

Also, do you know where to call rtc::LogMessage::LogThreads() or how to add
command-line flag to add thread IDs to the logs? I tried unittest_main.cc but it
had no effect AFAIK.

[henrika_webrtc, 2015/07/08 15:20:10]

Found a way. Done. Given new calls in the added unit test, we now log lines
like:

[000:001] [2055] AudioDeviceIOS::Init

since I have added both extra timestamp and thread id here. Can be removed in
the unit test if needed.

+  return StdStringFromNSString(name);
+}
+
+std::string GetThreadId() {
+  char buf[21];  // Big enough to hold a kuint64max plus terminating NULL.
+  pid_t thread_id = pthread_mach_thread_np(pthread_self());
+  CHECK_LT(snprintf(buf, sizeof(buf), "%i", thread_id),
+           static_cast<int>(sizeof(buf)))
+      << "Thread id is bigger than uint64??";
+  return std::string(buf);
+}
+
+std::string GetThreadInfo() {
+  return "@[tid=" + GetThreadId() + "]";
+}
+
+AVAudioSession* GetAudioSession() {

[tkchin_webrtc, 2015/07/06 03:46:29]

Is this necessary since it's a one-liner?

[henrika_webrtc, 2015/07/07 16:01:39]

Removed.

+  // Implicit initialization happens when we obtain a reference to the
+  // AVAudioSession object.
+  return [AVAudioSession sharedInstance];
+}
+
+}  // namespace ios
 }  // namespace webrtc
 
 #endif  // defined(WEBRTC_IOS)