Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 23:54:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

changed InterframeTimeGapHistory to InterframeTimeGapStats

Browse source
This commit is contained in:
wangyix 2014-06-23 11:22:04 -07:00
parent e5d7d471e3
commit ffc20b8876
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/audio/AvatarAudioRingBuffer.cpp
View file

@ -19,7 +19,7 @@ AvatarAudioRingBuffer::AvatarAudioRingBuffer(bool isStereo) :
} }
int AvatarAudioRingBuffer::parseData(const QByteArray& packet) { int AvatarAudioRingBuffer::parseData(const QByteArray& packet) {
_interframeTimeGapHistory.frameReceived(); _interframeTimeGapStats.frameReceived();
updateDesiredJitterBufferFrames(); updateDesiredJitterBufferFrames();
_shouldLoopbackForNode = (packetTypeForPacket(packet) == PacketTypeMicrophoneAudioWithEcho); _shouldLoopbackForNode = (packetTypeForPacket(packet) == PacketTypeMicrophoneAudioWithEcho);

2
libraries/audio/src/InjectedAudioRingBuffer.cpp
View file

@ -31,7 +31,7 @@ InjectedAudioRingBuffer::InjectedAudioRingBuffer(const QUuid& streamIdentifier)
const uchar MAX_INJECTOR_VOLUME = 255; const uchar MAX_INJECTOR_VOLUME = 255;
int InjectedAudioRingBuffer::parseData(const QByteArray& packet) { int InjectedAudioRingBuffer::parseData(const QByteArray& packet) {
_interframeTimeGapHistory.frameReceived(); _interframeTimeGapStats.frameReceived();
updateDesiredJitterBufferFrames(); updateDesiredJitterBufferFrames();
// setup a data stream to read from this packet // setup a data stream to read from this packet

10
libraries/audio/src/PositionalAudioRingBuffer.cpp
View file

@ -21,7 +21,7 @@
#include "PositionalAudioRingBuffer.h" #include "PositionalAudioRingBuffer.h"
#include "SharedUtil.h" #include "SharedUtil.h"
InterframeTimeGapHistory::InterframeTimeGapHistory() InterframeTimeGapStats::InterframeTimeGapStats()
: _lastFrameReceivedTime(0), : _lastFrameReceivedTime(0),
_numSamplesInCurrentInterval(0), _numSamplesInCurrentInterval(0),
_currentIntervalMaxGap(0), _currentIntervalMaxGap(0),
@ -32,7 +32,7 @@ InterframeTimeGapHistory::InterframeTimeGapHistory()
memset(_intervalMaxGaps, 0, TIME_GAP_NUM_INTERVALS_IN_WINDOW*sizeof(quint64)); memset(_intervalMaxGaps, 0, TIME_GAP_NUM_INTERVALS_IN_WINDOW*sizeof(quint64));
} }
void InterframeTimeGapHistory::frameReceived() { void InterframeTimeGapStats::frameReceived() {
quint64 now = usecTimestampNow(); quint64 now = usecTimestampNow();
// make sure this isn't the first time frameReceived() is called so can actually calculate a gap. // make sure this isn't the first time frameReceived() is called so can actually calculate a gap.
@ -79,7 +79,7 @@ void InterframeTimeGapHistory::frameReceived() {
_lastFrameReceivedTime = now; _lastFrameReceivedTime = now;
} }
quint64 InterframeTimeGapHistory::getWindowMaxGap() { quint64 InterframeTimeGapStats::getWindowMaxGap() {
_newWindowMaxGapAvailable = false; _newWindowMaxGapAvailable = false;
return _windowMaxGap; return _windowMaxGap;
} }
@ -234,8 +234,8 @@ void PositionalAudioRingBuffer::updateDesiredJitterBufferFrames() {
const float USECS_PER_FRAME = NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL * USECS_PER_SECOND / (float)SAMPLE_RATE; const float USECS_PER_FRAME = NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL * USECS_PER_SECOND / (float)SAMPLE_RATE;
if (_interframeTimeGapHistory.hasNewWindowMaxGapAvailable()) { if (_interframeTimeGapStats.hasNewWindowMaxGapAvailable()) {
_desiredJitterBufferFrames = ceilf((float)_interframeTimeGapHistory.getWindowMaxGap() / USECS_PER_FRAME); _desiredJitterBufferFrames = ceilf((float)_interframeTimeGapStats.getWindowMaxGap() / USECS_PER_FRAME);
if (_desiredJitterBufferFrames < 1) { if (_desiredJitterBufferFrames < 1) {
_desiredJitterBufferFrames = 1; _desiredJitterBufferFrames = 1;
} }

6
libraries/audio/src/PositionalAudioRingBuffer.h
View file

@ -23,9 +23,9 @@ const int TIME_GAP_NUM_SAMPLES_IN_INTERVAL = 500;
const int TIME_GAP_NUM_INTERVALS_IN_WINDOW = 10; const int TIME_GAP_NUM_INTERVALS_IN_WINDOW = 10;
// class used to track time between incoming frames for the purpose of varying the jitter buffer length // class used to track time between incoming frames for the purpose of varying the jitter buffer length
class InterframeTimeGapHistory { class InterframeTimeGapStats {
public: public:
InterframeTimeGapHistory(); InterframeTimeGapStats();
void frameReceived(); void frameReceived();
bool hasNewWindowMaxGapAvailable() const { return _newWindowMaxGapAvailable; } bool hasNewWindowMaxGapAvailable() const { return _newWindowMaxGapAvailable; }
@ -95,7 +95,7 @@ protected:
float _nextOutputTrailingLoudness; float _nextOutputTrailingLoudness;
AABox* _listenerUnattenuatedZone; AABox* _listenerUnattenuatedZone;
InterframeTimeGapHistory _interframeTimeGapHistory; InterframeTimeGapStats _interframeTimeGapStats;
int _desiredJitterBufferFrames; int _desiredJitterBufferFrames;
int _currentJitterBufferFrames; int _currentJitterBufferFrames;
}; };