Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 19:02:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

change to fix Mac linker error

Browse source
This commit is contained in:
wangyix 2014-08-05 11:00:27 -07:00
parent 779e7631a1
commit 77dad6fe65
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Audio.cpp
View file

@ -1589,8 +1589,9 @@ void Audio::renderLineStrip(const float* color, int x, int y, int n, int offset,
void Audio::outputFormatChanged() { void Audio::outputFormatChanged() {
_outputFrameSize = NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL * _outputFormat.channelCount() * _outputFormat.sampleRate() / _desiredOutputFormat.sampleRate(); int outputFormatChannelCountTimesSampleRate = _outputFormat.channelCount() * _outputFormat.sampleRate();
_receivedAudioStream.outputFormatChanged(_outputFormat); _outputFrameSize = NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL * outputFormatChannelCountTimesSampleRate / _desiredOutputFormat.sampleRate();
_receivedAudioStream.outputFormatChanged(outputFormatChannelCountTimesSampleRate);
} }
bool Audio::switchInputToAudioDevice(const QAudioDeviceInfo& inputDeviceInfo) { bool Audio::switchInputToAudioDevice(const QAudioDeviceInfo& inputDeviceInfo) {

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

@ -16,8 +16,8 @@ MixedProcessedAudioStream ::MixedProcessedAudioStream (int numFrameSamples, int
{ {
} }
void MixedProcessedAudioStream::outputFormatChanged(const QAudioFormat& outputFormat) { void MixedProcessedAudioStream::outputFormatChanged(int outputFormatChannelCountTimesSampleRate) {
_outputFormatChannelsTimesSampleRate = outputFormat.channelCount() * outputFormat.sampleRate(); _outputFormatChannelsTimesSampleRate = outputFormatChannelCountTimesSampleRate;
int deviceOutputFrameSize = NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL * _outputFormatChannelsTimesSampleRate / SAMPLE_RATE; int deviceOutputFrameSize = NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL * _outputFormatChannelsTimesSampleRate / SAMPLE_RATE;
_ringBuffer.resizeForFrameSize(deviceOutputFrameSize); _ringBuffer.resizeForFrameSize(deviceOutputFrameSize);
} }

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

@ -12,7 +12,6 @@
#ifndef hifi_MixedProcessedAudioStream_h #ifndef hifi_MixedProcessedAudioStream_h
#define hifi_MixedProcessedAudioStream_h #define hifi_MixedProcessedAudioStream_h
#include <QtMultimedia/QAudioFormat>
#include "InboundAudioStream.h" #include "InboundAudioStream.h"
class MixedProcessedAudioStream : public InboundAudioStream { class MixedProcessedAudioStream : public InboundAudioStream {
@ -20,12 +19,13 @@ class MixedProcessedAudioStream : public InboundAudioStream {
public: public:
MixedProcessedAudioStream (int numFrameSamples, int numFramesCapacity, bool dynamicJitterBuffers, int staticDesiredJitterBufferFrames, int maxFramesOverDesired, bool useStDevForJitterCalc); MixedProcessedAudioStream (int numFrameSamples, int numFramesCapacity, bool dynamicJitterBuffers, int staticDesiredJitterBufferFrames, int maxFramesOverDesired, bool useStDevForJitterCalc);
void outputFormatChanged(const QAudioFormat& outputFormat);
signals: signals:
void processSamples(const QByteArray& inputBuffer, QByteArray& outputBuffer); void processSamples(const QByteArray& inputBuffer, QByteArray& outputBuffer);
public:
void outputFormatChanged(int outputFormatChannelCountTimesSampleRate);
protected: protected:
int parseStreamProperties(PacketType type, const QByteArray& packetAfterSeqNum, int& numAudioSamples); int parseStreamProperties(PacketType type, const QByteArray& packetAfterSeqNum, int& numAudioSamples);
int parseAudioData(PacketType type, const QByteArray& packetAfterStreamProperties, int numAudioSamples); int parseAudioData(PacketType type, const QByteArray& packetAfterStreamProperties, int numAudioSamples);