repetition-with-fade seems good; continue testing

assignment-client/src/audio/AudioMixer.cpp

@@ -649,7 +649,6 @@ void AudioMixer::run() {
                     }
 
                     // send mixed audio packet
-                    if (nodeData->getOutgoingSequenceNumber() % 100 < 50)
                     nodeList->writeDatagram(clientMixBuffer, dataAt - clientMixBuffer, node);
                     nodeData->incrementOutgoingMixedAudioSequenceNumber();
 

interface/src/Audio.cpp

@@ -740,8 +740,11 @@ void Audio::addStereoSilenceToScope(int silentSamplesPerChannel) {
     if (!_scopeEnabled || _scopeEnabledPause) {
         return;
     }
+    printf("\t Audio::addStereoSilenceToScope  %d per channel\n", silentSamplesPerChannel);
     addSilenceToScope(_scopeOutputLeft, _scopeOutputOffset, silentSamplesPerChannel);
     _scopeOutputOffset = addSilenceToScope(_scopeOutputRight, _scopeOutputOffset, silentSamplesPerChannel);
+
+    printf("\t end\n");
 }
 
 void Audio::addStereoSamplesToScope(const QByteArray& samples) {
@@ -750,29 +753,35 @@ void Audio::addStereoSamplesToScope(const QByteArray& samples) {
     }
     const int16_t* samplesData = reinterpret_cast<const int16_t*>(samples.data());
     int samplesPerChannel = samples.size() / sizeof(int16_t) / STEREO_FACTOR;
+    printf("\t Audio::addStereoSamplesToScope %d samples per channel\n", samplesPerChannel);
 
     addBufferToScope(_scopeOutputLeft, _scopeOutputOffset, samplesData, samplesPerChannel, 0, STEREO_FACTOR);
     _scopeOutputOffset = addBufferToScope(_scopeOutputRight, _scopeOutputOffset, samplesData, samplesPerChannel, 1, STEREO_FACTOR);
 
     _scopeLastFrame = samples.right(NETWORK_BUFFER_LENGTH_BYTES_STEREO);
+
+    printf("\t end\n");
 }
 
 void Audio::addLastFrameRepeatedWithFadeToScope(int samplesPerChannel) {
-    printf("addLastFrameRepeatedWithFadeToScope");
+    printf("addLastFrameRepeatedWithFadeToScope %d per channel\n", samplesPerChannel);
     const int16_t* lastFrameData = reinterpret_cast<const int16_t*>(_scopeLastFrame.data());
 
     int samplesRemaining = samplesPerChannel;
     int indexOfRepeat = 0;
     do {
         int samplesToWriteThisIteration = std::min(samplesRemaining, (int)NETWORK_SAMPLES_PER_FRAME);
-        float fade = calculateRepeatedFrameFadeFactor(indexOfRepeat);
+       float fade = calculateRepeatedFrameFadeFactor(indexOfRepeat);
-        printf("%f ", fade);
+        printf("%f ", fade, samplesToWriteThisIteration);
         addBufferToScope(_scopeOutputLeft, _scopeOutputOffset, lastFrameData, samplesToWriteThisIteration, 0, STEREO_FACTOR, fade);
         _scopeOutputOffset = addBufferToScope(_scopeOutputRight, _scopeOutputOffset, lastFrameData, samplesToWriteThisIteration, 1, STEREO_FACTOR, fade);
 
+        printf("scopeOutputOffset %d\n", _scopeOutputOffset);
+
         samplesRemaining -= samplesToWriteThisIteration;
+        indexOfRepeat++;
     } while (samplesRemaining > 0);
-    printf("\n");
+    printf("\t end\n");
 }
 
 void Audio::processReceivedSamples(const QByteArray& inputBuffer, QByteArray& outputBuffer) {
@@ -1755,7 +1764,7 @@ bool Audio::switchOutputToAudioDevice(const QAudioDeviceInfo& outputDeviceInfo)
             // setup our general output device for audio-mixer audio
             _audioOutput = new QAudioOutput(outputDeviceInfo, _outputFormat, this);
             _audioOutput->setBufferSize(AUDIO_OUTPUT_BUFFER_SIZE_FRAMES * _outputFrameSize * sizeof(int16_t));
-            qDebug() << "Ring Buffer capacity in frames: " << _audioOutput->bufferSize() / sizeof(int16_t) / (float)_outputFrameSize;
+            qDebug() << "Output Buffer capacity in frames: " << _audioOutput->bufferSize() / sizeof(int16_t) / (float)_outputFrameSize;
             
             _audioOutputIODevice.start();
             _audioOutput->start(&_audioOutputIODevice);

libraries/audio/src/InboundAudioStream.cpp

@@ -176,7 +176,6 @@ int InboundAudioStream::parseAudioData(PacketType type, const QByteArray& packet
 }
 
 int InboundAudioStream::writeDroppableSilentSamples(int silentSamples) {
-
     // calculate how many silent frames we should drop.
     int samplesPerFrame = _ringBuffer.getNumFrameSamples();
     int desiredJitterBufferFramesPlusPadding = _desiredJitterBufferFrames + DESIRED_JITTER_BUFFER_FRAMES_PADDING;
@@ -198,7 +197,9 @@ int InboundAudioStream::writeDroppableSilentSamples(int silentSamples) {
         _framesAvailableStat.reset();
     }
 
-    return _ringBuffer.addSilentSamples(silentSamples - numSilentFramesToDrop * samplesPerFrame);
+    int ret = _ringBuffer.addSilentSamples(silentSamples - numSilentFramesToDrop * samplesPerFrame);
+    
+    return ret;
 }
 
 int InboundAudioStream::popSamples(int maxSamples, bool allOrNothing, bool starveIfNoSamplesPopped) {

libraries/audio/src/MixedProcessedAudioStream.cpp

@@ -20,23 +20,25 @@ MixedProcessedAudioStream::MixedProcessedAudioStream(int numFrameSamples, int nu
 
 void MixedProcessedAudioStream::outputFormatChanged(int outputFormatChannelCountTimesSampleRate) {
     _outputFormatChannelsTimesSampleRate = outputFormatChannelCountTimesSampleRate;
-    int deviceOutputFrameSize = NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL * _outputFormatChannelsTimesSampleRate / SAMPLE_RATE;
+    int deviceOutputFrameSize = networkToDeviceSamples(NETWORK_BUFFER_LENGTH_SAMPLES_STEREO);
     _ringBuffer.resizeForFrameSize(deviceOutputFrameSize);
 }
 
 int MixedProcessedAudioStream::writeDroppableSilentSamples(int silentSamples) {
+    
     int deviceSilentSamplesWritten = InboundAudioStream::writeDroppableSilentSamples(networkToDeviceSamples(silentSamples));
-
+    
     emit addedSilence(deviceToNetworkSamples(deviceSilentSamplesWritten) / STEREO_FACTOR);
 
     return deviceSilentSamplesWritten;
 }
 
 int MixedProcessedAudioStream::writeLastFrameRepeatedWithFade(int samples) {
+
     int deviceSamplesWritten = InboundAudioStream::writeLastFrameRepeatedWithFade(networkToDeviceSamples(samples));
 
     emit addedLastFrameRepeatedWithFade(deviceToNetworkSamples(deviceSamplesWritten) / STEREO_FACTOR);
-
+    
     return deviceSamplesWritten;
 }
 
@@ -48,14 +50,14 @@ int MixedProcessedAudioStream::parseAudioData(PacketType type, const QByteArray&
     emit processSamples(packetAfterStreamProperties, outputBuffer);
 
     _ringBuffer.writeData(outputBuffer.data(), outputBuffer.size());
-
+    
     return packetAfterStreamProperties.size();
 }
 
 int MixedProcessedAudioStream::networkToDeviceSamples(int networkSamples) {
-    return networkSamples * _outputFormatChannelsTimesSampleRate / (STEREO_FACTOR * SAMPLE_RATE);
+    return (quint64)networkSamples * (quint64)_outputFormatChannelsTimesSampleRate / (quint64)(STEREO_FACTOR * SAMPLE_RATE);
 }
 
 int MixedProcessedAudioStream::deviceToNetworkSamples(int deviceSamples) {
-    return deviceSamples * (STEREO_FACTOR * SAMPLE_RATE) / _outputFormatChannelsTimesSampleRate;
+    return (quint64)deviceSamples * (quint64)(STEREO_FACTOR * SAMPLE_RATE) / (quint64)_outputFormatChannelsTimesSampleRate;
 }