Fixed audio device names on mac #28

Author: devopvoid

webrtc-jni/src/main/cpp/include/platform/macos/MacUtils.h

@@ -38,4 +38,9 @@ inline void ThrowIfFailed(OSStatus status, const char * msg, ...)
 	}
 }
 
+namespace jni
+{
+	const std::string CFStringRefToUTF8(CFStringRef stringRef);
+}
+
 #endif

webrtc-jni/src/main/cpp/src/media/audio/macos/CoreAudioDeviceManager.cpp

@@ -275,7 +275,7 @@ namespace jni
 
 		AudioDevicePtr CoreAudioDeviceManager::createAudioDevice(const AudioDeviceID & deviceID, const AudioObjectPropertyScope & scope) {
 			AudioDevicePtr device = nullptr;
-			CFStringRef devNameRef;
+			CFStringRef devNameRef = nullptr;
 			UInt32 dataSize = sizeof(devNameRef);
 
 			AudioObjectPropertyAddress pa;
@@ -286,16 +286,11 @@ namespace jni
 			OSStatus status = AudioObjectGetPropertyData(deviceID, &pa, 0, nullptr, &dataSize, &devNameRef);
 			ThrowIfFailed(status, "CoreAudio: Get device name failed");
 
-			CFIndex length = CFStringGetLength(devNameRef) + 1;
-
-			char deviceName[length];
+			std::string name = CFStringRefToUTF8(devNameRef);
+			std::string id = std::to_string(deviceID);
 
-			CFStringGetCString(devNameRef, deviceName, length, kCFStringEncodingUTF8);
 			CFRelease(devNameRef);
 
-			std::string name(deviceName, length);
-			std::string id = std::to_string(deviceID);
-
 			unsigned channels = getChannelCount(deviceID, scope);
 
 			if (channels > 0) {

webrtc-jni/src/main/cpp/src/platform/macos/MacUtils.cpp

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2022 Alex Andres
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "platform/macos/MacUtils.h"
+
+#include <vector>
+
+namespace jni
+{
+	const std::string CFStringRefToUTF8(CFStringRef stringRef) {
+		CFIndex length = CFStringGetLength(stringRef);
+
+		if (length == 0) {
+			return std::string();
+		}
+
+		CFRange range = CFRangeMake(0, length);
+		CFIndex outputSize;
+		CFIndex converted = CFStringGetBytes(stringRef, range, kCFStringEncodingUTF8, 0, false, nullptr, 0, &outputSize);
+
+		if (converted == 0 || outputSize <= 0) {
+			return std::string();
+		}
+
+		size_t elements = static_cast<size_t>(outputSize) * sizeof(UInt8) / sizeof(char) + 1;
+
+		std::vector<char> buffer(elements);
+
+		converted = CFStringGetBytes(stringRef, range, kCFStringEncodingUTF8, 0, false,
+			reinterpret_cast<UInt8*>(&buffer[0]), outputSize, nullptr);
+
+		if (converted == 0) {
+			return std::string();
+		}
+
+		// Terminate string.
+		buffer[elements - 1] = '\0';
+
+		return std::string(&buffer[0], elements - 1);
+	}
+}