Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 18:21:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/worklist/hifi into 19483

Browse source
This commit is contained in:
stojce 2014-01-06 11:33:36 +01:00
commit f6927bae10
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,7 +57,7 @@ void AudioInjector::injectAudio() {
currentPacketPosition += rfcSessionUUID.size(); currentPacketPosition += rfcSessionUUID.size();
// pick a random UUID to use for this stream // pick a random UUID to use for this stream
QUuid randomStreamUUID; QUuid randomStreamUUID = QUuid::createUuid();
QByteArray rfcStreamUUID = randomStreamUUID.toRfc4122(); QByteArray rfcStreamUUID = randomStreamUUID.toRfc4122();
memcpy(currentPacketPosition, rfcStreamUUID, rfcStreamUUID.size()); memcpy(currentPacketPosition, rfcStreamUUID, rfcStreamUUID.size());
currentPacketPosition += rfcStreamUUID.size(); currentPacketPosition += rfcStreamUUID.size();

22
libraries/audio/src/Sound.cpp
View file

@ -27,5 +27,25 @@ Sound::Sound(const QUrl& sampleURL, QObject* parent) :
void Sound::replyFinished(QNetworkReply* reply) { void Sound::replyFinished(QNetworkReply* reply) {
// replace our byte array with the downloaded data // replace our byte array with the downloaded data
_byteArray = reply->readAll(); QByteArray rawAudioByteArray = reply->readAll();
// assume that this was a RAW file and is now an array of samples that are
// signed, 16-bit, 48Khz, mono
// we want to convert it to the format that the audio-mixer wants
// which is signed, 16-bit, 24Khz, mono
_byteArray.resize(rawAudioByteArray.size() / 2);
int numSourceSamples = rawAudioByteArray.size() / sizeof(int16_t);
int16_t* sourceSamples = (int16_t*) rawAudioByteArray.data();
int16_t* destinationSamples = (int16_t*) _byteArray.data();
for (int i = 1; i < numSourceSamples; i += 2) {
if (i + 1 >= numSourceSamples) {
destinationSamples[(i - 1) / 2] = (sourceSamples[i - 1] / 2) + (sourceSamples[i] / 2);
} else {
destinationSamples[(i - 1) / 2] = (sourceSamples[i - 1] / 4) + (sourceSamples[i] / 2) + (sourceSamples[i + 1] / 4);
}
}
} }