Added additional fields for devices and fixes merge request. It can be useful, for example, if there is a need in the application code to set a priority for selecting a playback device. I also added a patch that fixes an empty device GUID on macOS.

Author: Stasonych

webrtc-jni/src/main/cpp/CMakeLists.txt

@@ -50,6 +50,7 @@ add_subdirectory(dependencies/jni-voithos)
 
 file(GLOB SOURCES_ROOT "src/*.cpp")
 file(GLOB SOURCES_API "src/api/*.cpp")
+file(GLOB SOURCES_API_AUDIO "src/api/audio/*.cpp")
 file(GLOB SOURCES_MEDIA "src/media/*.cpp")
 file(GLOB SOURCES_MEDIA_AUDIO "src/media/audio/*.cpp")
 file(GLOB SOURCES_MEDIA_AUDIO_OS "src/media/audio/${SOURCE_TARGET}/*.cpp")
@@ -63,6 +64,7 @@ file(GLOB SOURCES_RTC "src/rtc/*.cpp")
 list(APPEND SOURCES
     ${SOURCES_ROOT}
     ${SOURCES_API}
+    ${SOURCES_API_AUDIO}
     ${SOURCES_MEDIA}
     ${SOURCES_MEDIA_AUDIO}
     ${SOURCES_MEDIA_AUDIO_OS}

webrtc-jni/src/main/cpp/dependencies/webrtc/CMakeLists.txt

@@ -237,14 +237,16 @@ if (PATCHES)
         message(STATUS "Applying ${PATCH}")
 
         execute_process(
-            COMMAND patch -p0 --forward
-            WORKING_DIRECTORY "${WEBRTC_SRC_DIR}"
+            COMMAND git apply
+            WORKING_DIRECTORY "${WEBRTC_SRC}"
             INPUT_FILE "${PATCH}"
             OUTPUT_VARIABLE OUTPUT
             RESULT_VARIABLE RESULT)
 
         if (RESULT EQUAL 0)
             message(STATUS "Patch applied: ${PATCH}")
+        else()
+            message(STATUS "Warning: Patch ${PATCH} not applied ....")
         endif()
     endforeach(PATCH)
 endif()

webrtc-jni/src/main/cpp/dependencies/webrtc/patches/macos/patch_for_mac_deviceId.patch

@@ -6,35 +6,27 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 <+>UTF-8
 ===================================================================
 diff --git a/modules/audio_device/mac/audio_device_mac.cc b/modules/audio_device/mac/audio_device_mac.cc
---- a/modules/audio_device/mac/audio_device_mac.cc	(revision d75b9e9ff07ee42841b4e416629c9fbd4b058905)
-+++ b/modules/audio_device/mac/audio_device_mac.cc	(date 1696335540383)
-@@ -831,9 +831,11 @@
-
-   memset(name, 0, kAdmMaxDeviceNameSize);
-
--  if (guid != NULL) {
--    memset(guid, 0, kAdmMaxGuidSize);
--  }
-+  memset(guid, 0, kAdmMaxGuidSize);
-+  AudioDeviceID deviceIds[MaxNumberDevices];
-+  int numberDevices = GetNumberDevices(kAudioDevicePropertyScopeOutput, deviceIds, MaxNumberDevices);
-+  std::string deviceId = std::to_string(deviceIds[index]);
-+  deviceId.copy(guid, kAdmMaxGuidSize);
-
+--- a/modules/audio_device/mac/audio_device_mac.cc	(revision e4445e46a910eb407571ec0b0b8b7043562678cf)
++++ b/modules/audio_device/mac/audio_device_mac.cc	(date 1757498230183)
+@@ -834,6 +834,10 @@
+ 
+   if (guid != NULL) {
+     memset(guid, 0, kAdmMaxGuidSize);
++    AudioDeviceID deviceIds[MaxNumberDevices];
++    int numberDevices = GetNumberDevices(kAudioDevicePropertyScopeOutput, deviceIds, MaxNumberDevices);
++    std::string deviceId = std::to_string(deviceIds[index]);
++    deviceId.copy(guid, kAdmMaxGuidSize);
+   }
+ 
    return GetDeviceName(kAudioDevicePropertyScopeOutput, index,
-                        rtc::ArrayView<char>(name, kAdmMaxDeviceNameSize));
-@@ -850,9 +852,11 @@
-
-   memset(name, 0, kAdmMaxDeviceNameSize);
-
--  if (guid != NULL) {
--    memset(guid, 0, kAdmMaxGuidSize);
--  }
-+  memset(guid, 0, kAdmMaxGuidSize);
-+  AudioDeviceID deviceIds[MaxNumberDevices];
-+  int numberDevices = GetNumberDevices(kAudioDevicePropertyScopeInput, deviceIds, MaxNumberDevices);
-+  std::string deviceId = std::to_string(deviceIds[index]);
-+  deviceId.copy(guid, kAdmMaxGuidSize);
-
+@@ -853,6 +857,10 @@
+ 
+   if (guid != NULL) {
+     memset(guid, 0, kAdmMaxGuidSize);
++    AudioDeviceID deviceIds[MaxNumberDevices];
++    int numberDevices = GetNumberDevices(kAudioDevicePropertyScopeInput, deviceIds, MaxNumberDevices);
++    std::string deviceId = std::to_string(deviceIds[index]);
++    deviceId.copy(guid, kAdmMaxGuidSize);
+   }
+ 
    return GetDeviceName(kAudioDevicePropertyScopeInput, index,
-                        rtc::ArrayView<char>(name, kAdmMaxDeviceNameSize));

webrtc-jni/src/main/cpp/include/media/Device.h

@@ -29,7 +29,7 @@ namespace jni
 	namespace avdev
 	{
 	    /**
-	    DeviceTransport and DeviceFormFactor only foe audio devices.
+	    DeviceTransport and DeviceFormFactor only for audio devices.
 	    */
 	    enum class DeviceTransport {
             trUnknown,
@@ -59,8 +59,6 @@ namespace jni
 				std::string getDescriptor() const;
 				DeviceTransport getDeviceTransport();
                 DeviceFormFactor getDeviceFormFactor();
-                void setDeviceTransport(DeviceTransport deviceTransport);
-                void setDeviceFormFactor(DeviceFormFactor deviceFormFactor);
 
 			protected:
 				Device(std::string name, std::string descriptor);

webrtc-jni/src/main/cpp/include/media/audio/AudioDevice.h

@@ -28,18 +28,18 @@ namespace jni
 	namespace avdev
 	{
 
-	    enum class AudioDeviceDirectionType {
-                    adtUnknown,
-                    adtCapture,
-                    adtRender
-                };
+enum class AudioDeviceDirectionType {
+            adtUnknown,
+            adtCapture,
+            adtRender
+        };
 
 		class AudioDevice : public Device
 		{
 			public:
 				AudioDevice(std::string name, std::string descriptor);
 				virtual ~AudioDevice() {};
-				AudioDeviceDirectionType audioDeviceDirectionType;
+				AudioDeviceDirectionType directionType;
 		};
 	}
 
@@ -54,7 +54,7 @@ namespace jni
 				jmethodID ctor;
 				jfieldID name;
 				jfieldID descriptor;
-				jfieldID audioDeviceDirectionType;
+				jfieldID directionType;
 		};
 
 		JavaLocalRef<jobject> toJavaAudioDevice(JNIEnv * env, avdev::DevicePtr device);