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

some cleanup

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-07-18 22:42:38 -07:00
parent 2e63aba8c9
commit c6ffd81c4b
6 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
assignment-client/src/audio/AudioMixer.cpp
View file

@ -760,10 +760,9 @@ void AudioMixer::broadcastMixes() {
std::unique_ptr<NLPacket> mixPacket; std::unique_ptr<NLPacket> mixPacket;
const int MAX_CODEC_NAME = 30; // way over estimate
if (mixHasAudio) { if (mixHasAudio) {
int mixPacketBytes = sizeof(quint16) + MAX_CODEC_NAME+ AudioConstants::NETWORK_FRAME_BYTES_STEREO; int mixPacketBytes = sizeof(quint16) + AudioConstants::MAX_CODEC_NAME_LENGTH_ON_WIRE
+ AudioConstants::NETWORK_FRAME_BYTES_STEREO;
mixPacket = NLPacket::create(PacketType::MixedAudio, mixPacketBytes); mixPacket = NLPacket::create(PacketType::MixedAudio, mixPacketBytes);
// pack sequence number // pack sequence number
@ -780,9 +779,8 @@ void AudioMixer::broadcastMixes() {
// pack mixed audio samples // pack mixed audio samples
mixPacket->write(encodedBuffer.constData(), encodedBuffer.size()); mixPacket->write(encodedBuffer.constData(), encodedBuffer.size());
} } else {
else { int silentPacketBytes = sizeof(quint16) + sizeof(quint16) + AudioConstants::MAX_CODEC_NAME_LENGTH_ON_WIRE;
int silentPacketBytes = sizeof(quint16) + sizeof(quint16) + MAX_CODEC_NAME;
mixPacket = NLPacket::create(PacketType::SilentAudioFrame, silentPacketBytes); mixPacket = NLPacket::create(PacketType::SilentAudioFrame, silentPacketBytes);
// pack sequence number // pack sequence number

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

@ -168,7 +168,6 @@ int AudioMixerClientData::parseData(ReceivedMessage& message) {
// check the overflow count before we parse data // check the overflow count before we parse data
auto overflowBefore = matchingStream->getOverflowCount(); auto overflowBefore = matchingStream->getOverflowCount();
auto parseResult = matchingStream->parseData(message); auto parseResult = matchingStream->parseData(message);
if (matchingStream->getOverflowCount() > overflowBefore) { if (matchingStream->getOverflowCount() > overflowBefore) {
@ -348,8 +347,6 @@ QJsonObject AudioMixerClientData::getAudioStreamStats() {
void AudioMixerClientData::sendSelectAudioFormat(SharedNodePointer node, const QString& selectedCodecName) { void AudioMixerClientData::sendSelectAudioFormat(SharedNodePointer node, const QString& selectedCodecName) {
auto replyPacket = NLPacket::create(PacketType::SelectedAudioFormat); auto replyPacket = NLPacket::create(PacketType::SelectedAudioFormat);
// write them to our packet
replyPacket->writeString(selectedCodecName); replyPacket->writeString(selectedCodecName);
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
nodeList->sendPacket(std::move(replyPacket), *node); nodeList->sendPacket(std::move(replyPacket), *node);

1
assignment-client/src/audio/AudioMixerClientData.h
View file

@ -80,7 +80,6 @@ public:
QString getCodecName() { return _selectedCodecName; } QString getCodecName() { return _selectedCodecName; }
signals: signals:
void injectorStreamFinished(const QUuid& streamIdentifier); void injectorStreamFinished(const QUuid& streamIdentifier);

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

@ -26,6 +26,8 @@ namespace AudioConstants {
inline const char* getAudioFrameName() { return "com.highfidelity.recording.Audio"; } inline const char* getAudioFrameName() { return "com.highfidelity.recording.Audio"; }
const int MAX_CODEC_NAME_LENGTH = 30;
const int MAX_CODEC_NAME_LENGTH_ON_WIRE = MAX_CODEC_NAME_LENGTH + sizeof(uint32_t);
const int NETWORK_FRAME_BYTES_STEREO = 1024; const int NETWORK_FRAME_BYTES_STEREO = 1024;
const int NETWORK_FRAME_SAMPLES_STEREO = NETWORK_FRAME_BYTES_STEREO / sizeof(AudioSample); const int NETWORK_FRAME_SAMPLES_STEREO = NETWORK_FRAME_BYTES_STEREO / sizeof(AudioSample);
const int NETWORK_FRAME_BYTES_PER_CHANNEL = 512; const int NETWORK_FRAME_BYTES_PER_CHANNEL = 512;

6
libraries/audio/src/AudioInjector.cpp
View file

@ -272,9 +272,9 @@ int64_t AudioInjector::injectNextFrame() {
// pack some placeholder sequence number for now // pack some placeholder sequence number for now
audioPacketStream << (quint16) 0; audioPacketStream << (quint16) 0;
// pack some placeholder sequence number for now // current injectors don't use codecs, so pack in the unknown codec name
//QString noCodecForInjectors(""); QString noCodecForInjectors("");
//writeStringToStream(noCodecForInjectors, audioPacketStream); writeStringToStream(noCodecForInjectors, audioPacketStream);
// pack stream identifier (a generated UUID) // pack stream identifier (a generated UUID)
audioPacketStream << QUuid::createUuid(); audioPacketStream << QUuid::createUuid();

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

@ -59,7 +59,7 @@ void InboundAudioStream::reset() {
_isStarved = true; _isStarved = true;
_hasStarted = false; _hasStarted = false;
resetStats(); resetStats();
//cleanupCodec(); // FIXME??? cleanupCodec();
} }
void InboundAudioStream::resetStats() { void InboundAudioStream::resetStats() {
@ -108,10 +108,7 @@ int InboundAudioStream::parseData(ReceivedMessage& message) {
message.readPrimitive(&sequence); message.readPrimitive(&sequence);
SequenceNumberStats::ArrivalInfo arrivalInfo = _incomingSequenceNumberStats.sequenceNumberReceived(sequence, SequenceNumberStats::ArrivalInfo arrivalInfo = _incomingSequenceNumberStats.sequenceNumberReceived(sequence,
message.getSourceID()); message.getSourceID());
QString codecInPacket(""); QString codecInPacket = message.readString();
if (packetType != PacketType::InjectAudio) {
codecInPacket = message.readString();
}
packetReceivedUpdateTimingStats(); packetReceivedUpdateTimingStats();