Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 23:33:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

added networkSamples buffer to MixedProcessedAudioStream

Browse source
This commit is contained in:
wangyix 2014-08-08 17:17:30 -07:00
parent 7aa5a1f830
commit fea97f8fe8
3 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Audio.cpp
View file

@ -905,7 +905,7 @@ void Audio::addSpatialAudioToBuffer(unsigned int sampleTime, const QByteArray& s
unsigned int delayCount = delay * _desiredOutputFormat.channelCount();
unsigned int silentCount = (remaining < delayCount) ? remaining : delayCount;
if (silentCount) {
_spatialAudioRingBuffer.addSilentFrame(silentCount);
_spatialAudioRingBuffer.addSilentSamples(silentCount);
}
// Recalculate the number of remaining samples

23
libraries/audio/src/MixedProcessedAudioStream.cpp
View file

@ -12,7 +12,8 @@
#include "MixedProcessedAudioStream.h"
MixedProcessedAudioStream::MixedProcessedAudioStream(int numFrameSamples, int numFramesCapacity, const InboundAudioStream::Settings& settings)
: InboundAudioStream(numFrameSamples, numFramesCapacity, settings)
: InboundAudioStream(numFrameSamples, numFramesCapacity, settings),
_networkSamplesWritten(0)
{
}
@ -24,6 +25,9 @@ void MixedProcessedAudioStream::outputFormatChanged(int outputFormatChannelCount
int MixedProcessedAudioStream::parseAudioData(PacketType type, const QByteArray& packetAfterStreamProperties, int networkSamples) {
memcpy(&_networkSamples[_networkSamplesWritten], packetAfterStreamProperties.data(), packetAfterStreamProperties.size());
_networkSamplesWritten += packetAfterStreamProperties.size() / sizeof(int16_t);
QByteArray outputBuffer;
emit processSamples(packetAfterStreamProperties, outputBuffer);
@ -33,10 +37,21 @@ int MixedProcessedAudioStream::parseAudioData(PacketType type, const QByteArray&
}
int MixedProcessedAudioStream::writeDroppableSilentSamples(int silentSamples) {
return InboundAudioStream::writeDroppableSilentSamples(networkToDeviceSamples(silentSamples));
int deviceSilentSamplesWritten = InboundAudioStream::writeDroppableSilentSamples(networkToDeviceSamples(silentSamples));
int networkSilentSamplesWritten = deviceToNetworkSamples(deviceSilentSamplesWritten);
memset(&_networkSamples[_networkSamplesWritten], 0, networkSilentSamplesWritten * sizeof(int16_t));
_networkSamplesWritten += networkSilentSamplesWritten;
return deviceSilentSamplesWritten;
}
static const int STEREO_FACTOR = 2;
int MixedProcessedAudioStream::networkToDeviceSamples(int networkSamples) {
const int STEREO_DIVIDER = 2;
return networkSamples * _outputFormatChannelsTimesSampleRate / (STEREO_DIVIDER * SAMPLE_RATE);
return networkSamples * _outputFormatChannelsTimesSampleRate / (STEREO_FACTOR * SAMPLE_RATE);
}
int MixedProcessedAudioStream::deviceToNetworkSamples(int deviceSamples) {
return deviceSamples * (STEREO_FACTOR * SAMPLE_RATE) / _outputFormatChannelsTimesSampleRate;
}

4
libraries/audio/src/MixedProcessedAudioStream.h
View file

@ -32,8 +32,12 @@ protected:
private:
int networkToDeviceSamples(int networkSamples);
int deviceToNetworkSamples(int deviceSamples);
private:
int _outputFormatChannelsTimesSampleRate;
int16_t _networkSamples[10 * NETWORK_BUFFER_LENGTH_SAMPLES_STEREO];
int _networkSamplesWritten;
};
#endif // hifi_MixedProcessedAudioStream_h