expand capture options

-added channels -added sample rate -fixed up windows links to use the options properly
jfnascimento · Apr 28, 2017 · e4349aa · e4349aa
1 parent e0fa095
commit e4349aa
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/Source/AudioCapture/Private/AudioCaptureData.cpp b/Source/AudioCapture/Private/AudioCaptureData.cpp
@@ -4,4 +4,6 @@
 FAudioCaptureOptions::FAudioCaptureOptions()
 {
 	SampleRate = 22050;
+	BitsPerSample = 16;
+	Channels = 1;
 }
diff --git a/Source/AudioCapture/Private/FWindowsAudioCapture.cpp b/Source/AudioCapture/Private/FWindowsAudioCapture.cpp
@@ -13,8 +13,6 @@ using namespace std;
 FWindowsAudioCapture::FWindowsAudioCapture()
 {
 	bRunLoopActive = false;
-	SampleRate = 22050;
-	//SampleRate = 44100;
 }
 
 void FWindowsAudioCapture::StartCapture(TFunction<void(const TArray<uint8>&)> OnAudioData /*= nullptr*/, TFunction<void(const TArray<uint8>&)> OnCaptureFinished /*= nullptr*/)
@@ -35,18 +33,19 @@ void FWindowsAudioCapture::StartCapture(TFunction<void(const TArray<uint8>&)> On
 		WAVEFORMATEX pFormat;
 
 		pFormat.wFormatTag = WAVE_FORMAT_PCM;
-		pFormat.nChannels = 1;							//mono
-		pFormat.nSamplesPerSec = SampleRate;
-		pFormat.nAvgBytesPerSec = SampleRate * 2;		// = nSamplesPerSec * n.Channels * wBitsPerSample/8
-		pFormat.nBlockAlign = 2;						// = n.Channels * wBitsPerSample/8
-		pFormat.wBitsPerSample = 16;					// 16 for high quality, 8 for telephone-grade
+		pFormat.nChannels = Options.Channels;									//typically 1 or 2
+		pFormat.nSamplesPerSec = Options.SampleRate;
+		pFormat.wBitsPerSample = Options.BitsPerSample;							// 16 for high quality, 8 for telephone-grade
+		pFormat.nBlockAlign = pFormat.nChannels * pFormat.wBitsPerSample / 8;	// = n.Channels * wBitsPerSample/8
+		pFormat.nAvgBytesPerSec = Options.SampleRate * pFormat.nBlockAlign;		// = nSamplesPerSec * n.Channels * wBitsPerSample/8
+
 		pFormat.cbSize = 0;
 
 		result = waveInOpen(&hWaveIn, WAVE_MAPPER, &pFormat, 0L, 0L, WAVE_FORMAT_DIRECT);
 
 		WAVEHDR hWaveInHdr;
 		TArray<uint8> AudioBuffer;
-		AudioBuffer.SetNum(SampleRate / 2);				//half a second of mono
+		AudioBuffer.SetNum(pFormat.nAvgBytesPerSec / 2);		//half a second
 
 		hWaveInHdr.lpData = (LPSTR)AudioBuffer.GetData();
 		hWaveInHdr.dwBufferLength = AudioBuffer.Num();
@@ -103,9 +102,9 @@ void FWindowsAudioCapture::StopCapture()
 	bRunLoopActive = false;
 }
 
-void FWindowsAudioCapture::SetOptions(const FAudioCaptureOptions& Options)
+void FWindowsAudioCapture::SetOptions(const FAudioCaptureOptions& InOptions)
 {
-	SampleRate = Options.SampleRate;
+	Options = InOptions;
 }
 
 #include "HideWindowsPlatformTypes.h"
diff --git a/Source/AudioCapture/Private/FWindowsAudioCapture.h b/Source/AudioCapture/Private/FWindowsAudioCapture.h
@@ -9,9 +9,9 @@ class FWindowsAudioCapture : public IAudioCaptureInterface
 
 	virtual void StartCapture(TFunction<void(const TArray<uint8>&)> OnAudioData = nullptr, TFunction<void(const TArray<uint8>&)> OnCaptureFinished = nullptr) override;
 	virtual void StopCapture() override;
-	virtual void SetOptions(const FAudioCaptureOptions& SampleRate) override;
+	virtual void SetOptions(const FAudioCaptureOptions& InOptions) override;
 
-	int32 SampleRate;
+	FAudioCaptureOptions Options;
 private:
 	FThreadSafeBool bRunLoopActive;
 };
diff --git a/Source/AudioCapture/Private/IAudioCaptureInterface.h b/Source/AudioCapture/Private/IAudioCaptureInterface.h
@@ -12,5 +12,5 @@ class IAudioCaptureInterface
 	/** Stop the audio capture and cleanup */
 	virtual void StopCapture() {};
 
-	virtual void SetOptions(const FAudioCaptureOptions& Options) {};
+	virtual void SetOptions(const FAudioCaptureOptions& InOptions) {};
 };
diff --git a/Source/AudioCapture/Public/AudioCaptureData.h b/Source/AudioCapture/Public/AudioCaptureData.h
@@ -10,4 +10,10 @@ struct AUDIOCAPTURE_API FAudioCaptureOptions
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Audio Capture Options")
 	int32 SampleRate;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Audio Capture Options")
+	int32 BitsPerSample;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Audio Capture Options")
+	int32 Channels;
 };