move get audio capture to CapturerFactory

lsqt68 · Jul 18, 2021 · 1c68cb6 · 1c68cb6
1 parent 4922c95
commit 1c68cb6
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 15 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -1,9 +1,10 @@
 {
     "configurations": [
         {
+            "name": "default",
             "includePath": [
                 "${workspaceFolder}/**",
-                "/${workspaceFolder}/../webrtc/src"
+                "${workspaceFolder}/../webrtc/src"
             ],
             "intelliSenseMode": "linux-gcc-x64",
             "compilerPath": "/usr/bin/gcc",

diff --git a/inc/CapturerFactory.h b/inc/CapturerFactory.h
@@ -192,6 +192,27 @@ class CapturerFactory {
 		return videoSource;
 	}
 
+	static const std::list<std::string> GetAudioCaptureDeviceList(const std::regex & publishFilter, rtc::scoped_refptr<webrtc::AudioDeviceModule>   audioDeviceModule) {
+		std::list<std::string> audioList;
+		if (std::regex_match("audiocap://", publishFilter))
+		{
+			int16_t num_audioDevices = audioDeviceModule->RecordingDevices();
+			RTC_LOG(INFO) << "nb audio devices:" << num_audioDevices;
+
+			for (int i = 0; i < num_audioDevices; ++i)
+			{
+				char name[webrtc::kAdmMaxDeviceNameSize] = {0};
+				char id[webrtc::kAdmMaxGuidSize] = {0};
+				if (audioDeviceModule->RecordingDeviceName(i, name, id) != -1)
+				{
+					RTC_LOG(INFO) << "audio device name:" << name << " id:" << id;
+					audioList.push_back(name);
+				}
+			}
+		}	
+		return 	audioList;
+	}
+
 	static rtc::scoped_refptr<webrtc::AudioSourceInterface> CreateAudioSource(const std::string & audiourl, 
 							const std::map<std::string,std::string> & opts, 
 							const std::regex & publishFilter, 

diff --git a/src/PeerConnectionManager.cpp b/src/PeerConnectionManager.cpp
@@ -410,21 +410,10 @@ const Json::Value PeerConnectionManager::getAudioDeviceList()
 {
 	Json::Value value(Json::arrayValue);
 
-	if (std::regex_match("audiocap://", m_publishFilter))
+	const std::list<std::string> audioCaptureDevice = CapturerFactory::GetAudioCaptureDeviceList(m_publishFilter, m_audioDeviceModule);
+	for (auto audioDevice : audioCaptureDevice)
 	{
-		int16_t num_audioDevices = m_audioDeviceModule->RecordingDevices();
-		RTC_LOG(INFO) << "nb audio devices:" << num_audioDevices;
-
-		for (int i = 0; i < num_audioDevices; ++i)
-		{
-			char name[webrtc::kAdmMaxDeviceNameSize] = {0};
-			char id[webrtc::kAdmMaxGuidSize] = {0};
-			if (m_audioDeviceModule->RecordingDeviceName(i, name, id) != -1)
-			{
-				RTC_LOG(INFO) << "audio device name:" << name << " id:" << id;
-				value.append(name);
-			}
-		}
+		value.append(audioDevice);
 	}
 
 	return value;