Merge pull request #1814 from ashvarma/release_1_23

Release 1 23
microsoft · Jan 25, 2017 · 71ce028 · 71ce028
2 parents 09d9f19 + b50e3e6
commit 71ce028
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 22 deletions.
diff --git a/Frameworks/AudioToolbox/AudioConverter.mm b/Frameworks/AudioToolbox/AudioConverter.mm
@@ -54,9 +54,9 @@ - (float)getSizeChangeMultiplier {
 @end
 
 /**
- @Status Caveat: AudioConverter supported only for conversions through AudioConverterConvertBuffer.
-                 Returns kAudioConverterErr_UnspecifiedError on failure and noErr (0) on success. Other return types not supported.
- @Notes
+ @Status Caveat
+ @Notes AudioConverter supported only for conversions through AudioConverterConvertBuffer. 
+        Returns kAudioConverterErr_UnspecifiedError on failure and noErr (0) on success. Other return types not supported.
 */
 OSStatus AudioConverterDispose(AudioConverterRef inAudioConverter) {
     RETURN_AUDIOERR_IF_FAILED_WITH_MSG(MFShutdown(), @"MFShutdown Failed");
@@ -98,9 +98,10 @@ OSStatus _setMFProperties(const AudioStreamBasicDescription* format, IMFMediaTyp
 }
 
 /**
-@Status Caveat: AudioConverter supported only for conversions through AudioConverterConvertBuffer.
-                Only Linear PCM formats are supported with 1 Frame per Packet and equal source & destination Channels per Frame.
-                Returns kAudioConverterErr_UnspecifiedError on failure and noErr (0) on success. Other return types not supported.
+@Status Caveat
+@Notes AudioConverter supported only for conversions through AudioConverterConvertBuffer.
+       Only Linear PCM formats are supported with 1 Frame per Packet and equal source & destination Channels per Frame.
+       Returns kAudioConverterErr_UnspecifiedError on failure and noErr (0) on success. Other return types not supported.
 */
 OSStatus AudioConverterNew(const AudioStreamBasicDescription* inSourceFormat,
                            const AudioStreamBasicDescription* inDestinationFormat,
@@ -212,9 +213,9 @@ OSStatus AudioConverterSetProperty(AudioConverterRef inAudioConverter,
 }
 
 /**
- @Status Caveat: Returns kAudioConverterErr_UnspecifiedError, kAudioConverterErr_InvalidInputSize or
-                 kAudioConverterErr_InvalidOutputSize on failure and noErr (0) on success. Other return types not supported.
- @Notes
+ @Status Caveat
+ @Notes Returns kAudioConverterErr_UnspecifiedError, kAudioConverterErr_InvalidInputSize or
+        kAudioConverterErr_InvalidOutputSize on failure and noErr (0) on success. Other return types not supported.
 */
 OSStatus AudioConverterConvertBuffer(
     AudioConverterRef inAudioConverter, UInt32 inInputDataSize, const void* inInputData, UInt32* ioOutputDataSize, void* outOutputData) {

diff --git a/Frameworks/SystemConfiguration/SCNetworkReachability.mm b/Frameworks/SystemConfiguration/SCNetworkReachability.mm
@@ -134,15 +134,19 @@ + (void)_testAllReachabilityObjects {
 
 + (void)_checkGlobalReachability {
     WNCConnectionProfile* internetConnectionProfile = [WNCNetworkInformation getInternetConnectionProfile];
-    if (internetConnectionProfile &&
-        [internetConnectionProfile getNetworkConnectivityLevel] == WNCNetworkConnectivityLevelInternetAccess) {
-        SCNetworkReachabilityFlags newFlags = kSCNetworkReachabilityFlagsReachable;
+    @try {
+        if (internetConnectionProfile &&
+            [internetConnectionProfile getNetworkConnectivityLevel] == WNCNetworkConnectivityLevelInternetAccess) {
+            SCNetworkReachabilityFlags newFlags = kSCNetworkReachabilityFlagsReachable;
 
-        if (internetConnectionProfile.isWwanConnectionProfile) {
-            newFlags |= kSCNetworkReachabilityFlagsIsWWAN;
+            if (internetConnectionProfile.isWwanConnectionProfile) {
+                newFlags |= kSCNetworkReachabilityFlagsIsWWAN;
+            }
+            _globalReachableFlags = newFlags;
+        } else {
+            _globalReachableFlags = 0;
         }
-        _globalReachableFlags = newFlags;
-    } else {
+    } @catch (...) {
         _globalReachableFlags = 0;
     }
 }
@@ -237,12 +241,11 @@ - (void)_availabilityChanged {
     if (_callbackQueue != NULL && _isPerformingCallback == FALSE) {
         _isPerformingCallback = TRUE;
         [self retain];
-        dispatch_async(_callbackQueue,
-                       ^void() {
-                           [self _performCallback];
-                           [self release];
-                           _isPerformingCallback = FALSE;
-                       });
+        dispatch_async(_callbackQueue, ^void() {
+            [self _performCallback];
+            [self release];
+            _isPerformingCallback = FALSE;
+        });
     }
 
     [_reachabilityFlagsValid unlock];

diff --git a/include/AudioToolbox/AudioConverterInternal.h b/include/AudioToolbox/AudioConverterInternal.h
@@ -30,6 +30,9 @@
 #include <wmcodecdsp.h>
 #include <COMIncludes_End.h>
 
+#import <Foundation/NSObject.h>
+#import <CoreAudio/CoreAudioTypes.h>
+
 using namespace Microsoft::WRL;
 using namespace Microsoft::WRL::Wrappers;