fixed audio scope; added parseSilentPacketStreamProperties()

interface/src/Audio.cpp

@@ -1481,17 +1481,17 @@ void Audio::renderScope(int width, int height) {
         return;
 
     static const float backgroundColor[4] = { 0.4f, 0.4f, 0.4f, 0.6f };
-    static const float gridColor[4] = { 0.3f, 0.3f, 0.3f, 0.6f };
+    static const float gridColor[4] = { 0.7f, 0.7f, 0.7f, 1.0f };
     static const float inputColor[4] = { 0.3f, 1.0f, 0.3f, 1.0f };
     static const float outputLeftColor[4] = { 1.0f, 0.3f, 0.3f, 1.0f };
     static const float outputRightColor[4] = { 0.3f, 0.3f, 1.0f, 1.0f };
     static const int gridRows = 2;
     int gridCols = _framesPerScope;
 
-    int x = (width - SCOPE_WIDTH) / 2;
+    int x = (width - (int)SCOPE_WIDTH) / 2;
-    int y = (height - SCOPE_HEIGHT) / 2;
+    int y = (height - (int)SCOPE_HEIGHT) / 2;
-    int w = SCOPE_WIDTH;
+    int w = (int)SCOPE_WIDTH;
-    int h = SCOPE_HEIGHT;
+    int h = (int)SCOPE_HEIGHT;
 
     renderBackground(backgroundColor, x, y, w, h);
     renderGrid(gridColor, x, y, w, h, gridRows, gridCols);

libraries/audio/src/InboundAudioStream.cpp

@@ -107,12 +107,7 @@ int InboundAudioStream::parseData(const QByteArray& packet) {
     int numAudioSamples;
 
     if (packetType == PacketTypeSilentAudioFrame) {
-        // this is a general silent packet; parse the number of silent samples
+        readBytes += parseSilentPacketStreamProperties(packet.mid(readBytes), numAudioSamples);
-        quint16 numSilentSamples = *(reinterpret_cast<const quint16*>(dataAt));
-        dataAt += sizeof(quint16);
-        readBytes += sizeof(quint16);
-
-        numAudioSamples = numSilentSamples;
     } else {
         // parse the info after the seq number and before the audio data (the stream properties)
         readBytes += parseStreamProperties(packetType, packet.mid(readBytes), numAudioSamples);
@@ -171,6 +166,12 @@ int InboundAudioStream::parseAudioData(PacketType type, const QByteArray& packet
     return _ringBuffer.writeData(packetAfterStreamProperties.data(), numAudioSamples * sizeof(int16_t));
 }
 
+int InboundAudioStream::parseSilentPacketStreamProperties(const QByteArray& packetAfterSeqNum, int& numAudioSamples) {
+    // this is a general silent packet; parse the number of silent samples
+    quint16 numSilentSamples = *(reinterpret_cast<const quint16*>(packetAfterSeqNum.data()));
+    numAudioSamples = numSilentSamples;
+    return sizeof(quint16);
+}
 
 int InboundAudioStream::popSamples(int maxSamples, bool allOrNothing, bool starveIfNoSamplesPopped) {
     int samplesPopped = 0;

libraries/audio/src/InboundAudioStream.h

@@ -172,6 +172,10 @@ protected:
     /// parses the info between the seq num and the audio data in the network packet and calculates
     /// how many audio samples this packet contains (used when filling in samples for dropped packets).
     virtual int parseStreamProperties(PacketType type, const QByteArray& packetAfterSeqNum, int& numAudioSamples) = 0;
+
+    /// parses a silent packet after the seq. default implementation assumes the number of silent samples 
+    /// is the only thing in packetAfterSeqNum and should work in most cases
+    virtual int parseSilentPacketStreamProperties(const QByteArray& packetAfterSeqNum, int& numAudioSamples);
     
     /// parses the audio data in the network packet.
     /// default implementation assumes packet contains raw audio samples after stream properties

libraries/audio/src/MixedProcessedAudioStream.cpp

@@ -28,12 +28,22 @@ int MixedProcessedAudioStream::parseStreamProperties(PacketType type, const QByt
 
     // since numAudioSamples is used to know how many samples to add for each dropped packet before this one,
     // we want to set it to the number of device audio samples since this stream contains device audio samples, not network samples.
-    const int STEREO_DIVIDER = 2;
+    numAudioSamples = networkToDeviceSamples(numNetworkSamples);
-    numAudioSamples = numNetworkSamples * _outputFormatChannelsTimesSampleRate / (STEREO_DIVIDER * SAMPLE_RATE);
 
     return 0;
 }
 
+int MixedProcessedAudioStream::parseSilentPacketStreamProperties(const QByteArray& packetAfterSeqNum, int& numAudioSamples) {
+    int numNetworkSamples;
+    int bytesRead = InboundAudioStream::parseSilentPacketStreamProperties(packetAfterSeqNum, numNetworkSamples);
+
+    // since numAudioSamples is used to know how many samples to add for each dropped packet before this one,
+    // we want to set it to the number of device audio samples since this stream contains device audio samples, not network samples.
+    numAudioSamples = networkToDeviceSamples(numNetworkSamples);
+
+    return bytesRead;
+}
+
 int MixedProcessedAudioStream::parseAudioData(PacketType type, const QByteArray& packetAfterStreamProperties, int numAudioSamples) {
 
     QByteArray outputBuffer;
@@ -43,3 +53,8 @@ int MixedProcessedAudioStream::parseAudioData(PacketType type, const QByteArray&
 
     return packetAfterStreamProperties.size();
 }
+
+int MixedProcessedAudioStream::networkToDeviceSamples(int networkSamples) {
+    const int STEREO_DIVIDER = 2;
+    return networkSamples * _outputFormatChannelsTimesSampleRate / (STEREO_DIVIDER * SAMPLE_RATE);
+}

libraries/audio/src/MixedProcessedAudioStream.h

@@ -28,8 +28,11 @@ public:
 
 protected:
     int parseStreamProperties(PacketType type, const QByteArray& packetAfterSeqNum, int& numAudioSamples);
+    int parseSilentPacketStreamProperties(const QByteArray& packetAfterSeqNum, int& numAudioSamples);
     int parseAudioData(PacketType type, const QByteArray& packetAfterStreamProperties, int numAudioSamples);
 
+private:
+    int networkToDeviceSamples(int networkSamples);
 private:
     int _outputFormatChannelsTimesSampleRate;
 };