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

formatting fix, AudioRingBuffer no longer NodeData,

Browse source
This commit is contained in:
wangyix 2014-07-28 09:40:44 -07:00
parent 438606d567
commit c129db16cb
4 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
assignment-client/src/audio/AudioMixerClientData.cpp
View file

@ -27,7 +27,8 @@ AudioMixerClientData::AudioMixerClientData() :
}
AudioMixerClientData::~AudioMixerClientData() {
QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i, end = _ringBuffers.constEnd();
QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i;
QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator end = _ringBuffers.constEnd();
for (i = _ringBuffers.constBegin(); i != end; i++) {
// delete this attached InboundAudioStream
delete i.value();
@ -99,7 +100,8 @@ int AudioMixerClientData::parseData(const QByteArray& packet) {
}
void AudioMixerClientData::audioStreamsPopFrameForMixing() {
QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i, end = _ringBuffers.constEnd();
QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i;
QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator end = _ringBuffers.constEnd();
for (i = _ringBuffers.constBegin(); i != end; i++) {
i.value()->popFrames(1);
}
@ -224,7 +226,8 @@ QString AudioMixerClientData::getAudioStreamStatsString() const {
result = "mic unknown";
}
QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i, end = _ringBuffers.constEnd();
QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i;
QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator end = _ringBuffers.constEnd();
for (i = _ringBuffers.constBegin(); i != end; i++) {
if (i.value()->getType() == PositionalAudioRingBuffer::Injector) {
AudioStreamStats streamStats = i.value()->getAudioStreamStats();

7
libraries/audio/src/AudioRingBuffer.cpp
View file

@ -20,7 +20,6 @@
AudioRingBuffer::AudioRingBuffer(int numFrameSamples, bool randomAccessMode, int numFramesCapacity) :
NodeData(),
_frameCapacity(numFramesCapacity),
_sampleCapacity(numFrameSamples * numFramesCapacity),
_isFull(false),
@ -68,12 +67,6 @@ void AudioRingBuffer::clear() {
_nextOutput = _buffer;
}
int AudioRingBuffer::parseData(const QByteArray& packet) {
// skip packet header and sequence number
int numBytesBeforeAudioData = numBytesForPacketHeader(packet) + sizeof(quint16);
return writeData(packet.data() + numBytesBeforeAudioData, packet.size() - numBytesBeforeAudioData);
}
int AudioRingBuffer::readSamples(int16_t* destination, int maxSamples) {
return readData((char*) destination, maxSamples * sizeof(int16_t));
}

5
libraries/audio/src/AudioRingBuffer.h
View file

@ -37,8 +37,7 @@ const int MIN_SAMPLE_VALUE = std::numeric_limits<int16_t>::min();
const int DEFAULT_RING_BUFFER_FRAME_CAPACITY = 10;
class AudioRingBuffer : public NodeData {
Q_OBJECT
class AudioRingBuffer {
public:
AudioRingBuffer(int numFrameSamples, bool randomAccessMode = false, int numFramesCapacity = DEFAULT_RING_BUFFER_FRAME_CAPACITY);
~AudioRingBuffer();
@ -51,8 +50,6 @@ public:
int getSampleCapacity() const { return _sampleCapacity; }
int getFrameCapacity() const { return _frameCapacity; }
int parseData(const QByteArray& packet);
// assume callers using this will never wrap around the end
const int16_t* getNextOutput() const { return _nextOutput; }
const int16_t* getBuffer() const { return _buffer; }

2
libraries/audio/src/InboundAudioStream.h
View file

@ -32,7 +32,7 @@ const int TIME_GAPS_FOR_STATS_PACKET_WINDOW_INTERVALS = 30;
// the stats for calculating the average frames available will recalculate every ~1 second
// and will include data for the past ~2 seconds
const int FRAMES_AVAILABLE_STATS_INTERVAL_SAMPLES = USECS_PER_SECOND / BUFFER_SEND_INTERVAL_USECS;
const int FRAMES_AVAILABLE_STATS_WINDOW_INTERVALS = 2;
const int FRAMES_AVAILABLE_STATS_WINDOW_INTERVALS = 10;
// the internal history buffer of the incoming seq stats will cover 30s to calculate
// packet loss % over last 30s