Extension - Handle stereo audio from TeamSpeak (cherry pick) (#1240)

IDI-Systems · Apr 13, 2023 · e119b15 · e119b15
1 parent 342f25b
commit e119b15
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/extensions/src/ACRE2Core/FilterPosition.cpp b/extensions/src/ACRE2Core/FilterPosition.cpp
@@ -8,6 +8,7 @@
 
 #include <cmath>
 #pragma comment(lib, "x3daudio.lib")
+#pragma comment(lib, "xaudio2.lib")
 
 #define MAX_FALLOFF_DISTANCE    75
 #define MAX_FALLOFF_RANGE        150

diff --git a/extensions/src/ACRE2Core/SoundEngine.cpp b/extensions/src/ACRE2Core/SoundEngine.cpp
@@ -37,7 +37,7 @@ acre::Result CSoundEngine::onEditPlaybackVoiceDataEvent(acre::id_t id, short* sa
             for (size_t i = 0; i < player->channels.size(); ++i) {
                 if (player->channels[i]) {
                     player->channels[i]->lock();
-                    player->channels[i]->In(samples, sampleCount);
+                    player->channels[i]->In(samples, sampleCount, channels);
                     player->channels[i]->unlock();
                 }
             }

diff --git a/extensions/src/ACRE2Core/SoundMonoChannel.cpp b/extensions/src/ACRE2Core/SoundMonoChannel.cpp
@@ -44,10 +44,17 @@ CSoundChannelMono::~CSoundChannelMono() {
     }
 }
 
-int CSoundChannelMono::In(short *samples, int sampleCount) {
+int CSoundChannelMono::In(short *samples, int sampleCount, const int channels) {
     //memset(samples, 0x00, sampleCount*sizeof(short));
-    if (this->bufferLength+sampleCount <= this->bufferMaxSize) {
-        memcpy(this->buffer+this->bufferLength, samples, sampleCount*sizeof(short));
+    if (this->bufferLength + sampleCount <= this->bufferMaxSize) {
+        if (channels == 1) {
+            memcpy(this->buffer + this->bufferLength, samples, sampleCount * sizeof(short));
+        } else {
+            // rare but for multi channel input just capture mono, samples[channels*sampleCount]={Left,Right,Left,...}
+            for (int i = 0; i < sampleCount; i++) {
+                this->buffer[this->bufferLength + i] = samples[channels * i];
+            }
+        }
         this->bufferLength += sampleCount;
     }
     return this->bufferLength;
@@ -113,4 +120,4 @@ CSoundMixdownEffect * CSoundChannelMono::getMixdownEffectInsert(int index) {
     if (index > 7)
         return NULL;
     return this->mixdownEffects[index];
-}
+}
diff --git a/extensions/src/ACRE2Core/SoundMonoChannel.h b/extensions/src/ACRE2Core/SoundMonoChannel.h
@@ -27,7 +27,7 @@ class CSoundChannelMono : public CLockable {
     CSoundChannelMono( int length, bool singleShot );
 
     ~CSoundChannelMono();
-    int In(short *samples, int sampleCount);
+    int In(short *samples, int sampleCount, const int channels);
     int Out(short *samples, int sampleCount);
     int GetCurrentBufferSize() { return this->bufferLength-this->bufferPos; };
     bool IsOneShot() { return this->oneShot; };

diff --git a/extensions/src/ACRE2Core/SoundPlayback.cpp b/extensions/src/ACRE2Core/SoundPlayback.cpp
@@ -78,7 +78,7 @@ acre::Result CSoundPlayback::playSound(std::string id, acre::vec3_fp32_t positio
             tempChannel->getMixdownEffectInsert(0)->setParam("isWorld", 0x00000000);
         }
 
-        tempChannel->In((short *)waveFile.GetData(), waveFile.GetSize()/sizeof(short));
+        tempChannel->In((short *)waveFile.GetData(), waveFile.GetSize()/sizeof(short), 1);
         CEngine::getInstance()->getSoundEngine()->getSoundMixer()->unlock();
         return acre::Result::ok;
     }