Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 06:38:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

another parseData change

Browse source
This commit is contained in:
wangyix 2014-07-23 12:06:31 -07:00
parent 849c489b4c
commit 4a4d065f00
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -90,12 +90,12 @@ int AudioMixerClientData::parseData(const QByteArray& packet) {
switch (packetArrivalInfo._status) { switch (packetArrivalInfo._status) {
case SequenceNumberStats::Early: { case SequenceNumberStats::Early: {
int packetsLost = packetArrivalInfo._seqDiffFromExpected; int packetsLost = packetArrivalInfo._seqDiffFromExpected;
avatarRingBuffer->parseData(packet, packetsLost); avatarRingBuffer->parseDataAndHandleDroppedPackets(packet, packetsLost);
break; break;
} }
case SequenceNumberStats::OnTime: { case SequenceNumberStats::OnTime: {
// ask the AvatarAudioRingBuffer instance to parse the data // ask the AvatarAudioRingBuffer instance to parse the data
avatarRingBuffer->parseData(packet, 0); avatarRingBuffer->parseDataAndHandleDroppedPackets(packet, 0);
break; break;
} }
default: { default: {
@ -134,12 +134,12 @@ int AudioMixerClientData::parseData(const QByteArray& packet) {
switch (packetArrivalInfo._status) { switch (packetArrivalInfo._status) {
case SequenceNumberStats::Early: { case SequenceNumberStats::Early: {
int packetsLost = packetArrivalInfo._seqDiffFromExpected; int packetsLost = packetArrivalInfo._seqDiffFromExpected;
matchingInjectedRingBuffer->parseData(packet, packetsLost); matchingInjectedRingBuffer->parseDataAndHandleDroppedPackets(packet, packetsLost);
break; break;
} }
case SequenceNumberStats::OnTime: { case SequenceNumberStats::OnTime: {
// ask the AvatarAudioRingBuffer instance to parse the data // ask the AvatarAudioRingBuffer instance to parse the data
matchingInjectedRingBuffer->parseData(packet, 0); matchingInjectedRingBuffer->parseDataAndHandleDroppedPackets(packet, 0);
break; break;
} }
default: { default: {

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

@ -18,7 +18,7 @@ AvatarAudioRingBuffer::AvatarAudioRingBuffer(bool isStereo, bool dynamicJitterBu
} }
int AvatarAudioRingBuffer::parseData(const QByteArray& packet, int packetsSkipped) { int AvatarAudioRingBuffer::parseDataAndHandleDroppedPackets(const QByteArray& packet, int packetsSkipped) {
frameReceivedUpdateTimingStats(); frameReceivedUpdateTimingStats();
_shouldLoopbackForNode = (packetTypeForPacket(packet) == PacketTypeMicrophoneAudioWithEcho); _shouldLoopbackForNode = (packetTypeForPacket(packet) == PacketTypeMicrophoneAudioWithEcho);

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

@ -20,7 +20,7 @@ class AvatarAudioRingBuffer : public PositionalAudioRingBuffer {
public: public:
AvatarAudioRingBuffer(bool isStereo = false, bool dynamicJitterBuffer = false); AvatarAudioRingBuffer(bool isStereo = false, bool dynamicJitterBuffer = false);
int parseData(const QByteArray& packet, int packetsSkipped); int parseDataAndHandleDroppedPackets(const QByteArray& packet, int packetsSkipped);
private: private:
// disallow copying of AvatarAudioRingBuffer objects // disallow copying of AvatarAudioRingBuffer objects
AvatarAudioRingBuffer(const AvatarAudioRingBuffer&); AvatarAudioRingBuffer(const AvatarAudioRingBuffer&);

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

@ -30,7 +30,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 packetsSkipped) { int InjectedAudioRingBuffer::parseDataAndHandleDroppedPackets(const QByteArray& packet, int packetsSkipped) {
frameReceivedUpdateTimingStats(); frameReceivedUpdateTimingStats();
// setup a data stream to read from this packet // setup a data stream to read from this packet

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

@ -20,7 +20,7 @@ class InjectedAudioRingBuffer : public PositionalAudioRingBuffer {
public: public:
InjectedAudioRingBuffer(const QUuid& streamIdentifier = QUuid(), bool dynamicJitterBuffer = false); InjectedAudioRingBuffer(const QUuid& streamIdentifier = QUuid(), bool dynamicJitterBuffer = false);
int parseData(const QByteArray& packet, int packetsSkipped); int parseDataAndHandleDroppedPackets(const QByteArray& packet, int packetsSkipped);
const QUuid& getStreamIdentifier() const { return _streamIdentifier; } const QUuid& getStreamIdentifier() const { return _streamIdentifier; }
float getRadius() const { return _radius; } float getRadius() const { return _radius; }

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

@ -45,7 +45,7 @@ public:
PositionalAudioRingBuffer(PositionalAudioRingBuffer::Type type, bool isStereo = false, bool dynamicJitterBuffers = false); PositionalAudioRingBuffer(PositionalAudioRingBuffer::Type type, bool isStereo = false, bool dynamicJitterBuffers = false);
virtual int parseData(const QByteArray& packet, int packetsSkipped) = 0; virtual int parseDataAndHandleDroppedPackets(const QByteArray& packet, int packetsSkipped) = 0;
int parsePositionalData(const QByteArray& positionalByteArray); int parsePositionalData(const QByteArray& positionalByteArray);
int parseListenModeData(const QByteArray& listenModeByteArray); int parseListenModeData(const QByteArray& listenModeByteArray);