handle RAW stereo audio files by using stereo.raw extension

examples/acScripts/ambiance.js

@@ -14,11 +14,10 @@ var position = { x: 700, y: 25, z: 725 };
 var audioOptions = {
     position: position,
     volume: 0.4,
-    loop: true,
+    loop: true
-    stereo: false
 };
 
-var sound = SoundCache.getSound(soundURL, audioOptions.isStereo);
+var sound = SoundCache.getSound(soundURL);
 var injector = null;
 var count = 100;
 

examples/radio.js

@@ -12,13 +12,12 @@
 Script.include("libraries/globals.js");
 
 var modelURL = HIFI_PUBLIC_BUCKET + "models/entities/radio/Speakers.fbx";
-var soundURL = HIFI_PUBLIC_BUCKET + "sounds/FamilyStereo.raw";
+var soundURL = HIFI_PUBLIC_BUCKET + "sounds/family.stereo.raw";
 
 var AudioRotationOffset = Quat.fromPitchYawRollDegrees(0, -90, 0);
 var audioOptions = {
   volume: 0.5,
-  loop: true,
+  loop: true
-  stereo: true
 }
 
 var injector = null;

libraries/audio/src/AudioInjector.cpp

@@ -89,10 +89,12 @@ void AudioInjector::injectLocally() {
     bool success = false;
     if (_localAudioInterface) {
         if (_audioData.size() > 0) {
+            
             _localBuffer = new AudioInjectorLocalBuffer(_audioData, this);
             _localBuffer->open(QIODevice::ReadOnly);
             _localBuffer->setShouldLoop(_options.loop);
             
+            
             QMetaObject::invokeMethod(_localAudioInterface, "outputLocalInjector",
                                       Qt::BlockingQueuedConnection,
                                       Q_RETURN_ARG(bool, success),

libraries/audio/src/AudioInjectorLocalBuffer.h

@@ -26,6 +26,7 @@ public:
     
     void setShouldLoop(bool shouldLoop) { _shouldLoop = shouldLoop; }
     
+    void setCurrentOffset(int currentOffset) { _currentOffset = currentOffset; }
 private:
     
     qint64 recursiveReadFromFront(char* data, qint64 maxSize);

libraries/audio/src/AudioInjectorOptions.cpp

@@ -20,7 +20,8 @@ AudioInjectorOptions::AudioInjectorOptions() :
     orientation(glm::vec3(0.0f, 0.0f, 0.0f)),
     stereo(false),
     ignorePenumbra(false),
-    localOnly(false)
+    localOnly(false),
+    secondOffset(0.0)
 {
 
 }
@@ -31,9 +32,9 @@ QScriptValue injectorOptionsToScriptValue(QScriptEngine* engine, const AudioInje
     obj.setProperty("volume", injectorOptions.volume);
     obj.setProperty("loop", injectorOptions.loop);
     obj.setProperty("orientation", quatToScriptValue(engine, injectorOptions.orientation));
-    obj.setProperty("stereo", injectorOptions.stereo);
     obj.setProperty("ignorePenumbra", injectorOptions.ignorePenumbra);
     obj.setProperty("localOnly", injectorOptions.localOnly);
+    obj.setProperty("secondOffset", injectorOptions.secondOffset);
     return obj;
 }
 
@@ -54,10 +55,6 @@ void injectorOptionsFromScriptValue(const QScriptValue& object, AudioInjectorOpt
         quatFromScriptValue(object.property("orientation"), injectorOptions.orientation);
     }
     
-    if (object.property("stereo").isValid()) {
-        injectorOptions.stereo = object.property("stereo").toBool();
-    }
-    
     if (object.property("ignorePenumbra").isValid()) {
         injectorOptions.ignorePenumbra = object.property("ignorePenumbra").toBool();
     }
@@ -65,4 +62,8 @@ void injectorOptionsFromScriptValue(const QScriptValue& object, AudioInjectorOpt
     if (object.property("localOnly").isValid()) {
         injectorOptions.localOnly = object.property("localOnly").toBool();
     }
+    
+    if (object.property("secondOffset").isValid()) {
+        injectorOptions.secondOffset = object.property("secondOffset").toNumber();
+    }
  }

libraries/audio/src/AudioInjectorOptions.h

@@ -27,6 +27,7 @@ public:
     bool stereo;
     bool ignorePenumbra;
     bool localOnly;
+    float secondOffset;
 };
 
 Q_DECLARE_METATYPE(AudioInjectorOptions);

libraries/audio/src/AudioScriptingInterface.cpp

@@ -44,7 +44,11 @@ void AudioScriptingInterface::stopAllInjectors() {
 
 AudioInjector* AudioScriptingInterface::playSound(Sound* sound, const AudioInjectorOptions& injectorOptions) {
     if (sound) {
-        AudioInjector* injector = new AudioInjector(sound, injectorOptions);
+        // stereo option isn't set from script, this comes from sound metadata or filename
+        AudioInjectorOptions optionsCopy = injectorOptions;
+        optionsCopy.stereo = sound->isStereo();
+        
+        AudioInjector* injector = new AudioInjector(sound, optionsCopy);
         injector->setLocalAudioInterface(_localAudioInterface);
         
         QThread* injectorThread = new QThread();

libraries/audio/src/Sound.cpp

@@ -64,7 +64,14 @@ void Sound::downloadFinished(QNetworkReply* reply) {
             interpretAsWav(rawAudioByteArray, outputAudioByteArray);
             downSample(outputAudioByteArray);
         } else {
-            //  Process as RAW file
+            // check if this was a stereo raw file
+            // since it's raw the only way for us to know that is if the file was called .stereo.raw
+            if (reply->url().fileName().toLower().endsWith("stereo.raw")) {
+                _isStereo = true;
+                qDebug() << "Processing sound from" << reply->url() << "as stereo audio file.";
+            }
+            
+            // Process as RAW file
             downSample(rawAudioByteArray);
         }
         trimFrames();
@@ -206,10 +213,12 @@ void Sound::interpretAsWav(const QByteArray& inputAudioByteArray, QByteArray& ou
             qDebug() << "Currently not supporting non PCM audio files.";
             return;
         }
-        if (qFromLittleEndian<quint16>(fileHeader.wave.numChannels) != 1) {
+        if (qFromLittleEndian<quint16>(fileHeader.wave.numChannels) == 2) {
-            qDebug() << "Currently not supporting stereo audio files.";
+            _isStereo = true;
-            return;
+        } else if (qFromLittleEndian<quint16>(fileHeader.wave.numChannels) > 2) {
+            qDebug() << "Currently not support audio files with more than 2 channels.";
         }
+        
         if (qFromLittleEndian<quint16>(fileHeader.wave.bitsPerSample) != 16) {
             qDebug() << "Currently not supporting non 16bit audio files.";
             return;

libraries/audio/src/Sound.h

@@ -25,7 +25,7 @@ class Sound : public Resource {
 public:
     Sound(const QUrl& url, bool isStereo = false);
     
-    bool isStereo() const { return _isStereo; }
+    bool isStereo() const { return _isStereo; }    
     bool isReady() const { return _isReady; }
      
     const QByteArray& getByteArray() { return _byteArray; }