hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated WAV output to use Util::ResizeablePointer

Browse source
This commit is contained in:
Thulinma 2017-07-08 14:41:08 +02:00
parent dc8bae8dd3
commit 7da1bf241e
1 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/output/output_wav.cpp
View file

@ -1,5 +1,6 @@
#include "output_wav.h"
#include <mist/riff.h>
#include <mist/util.h>
namespace Mist{
OutWAV::OutWAV(Socket::Connection &conn) : HTTPOutput(conn){
@ -62,35 +63,25 @@ namespace Mist{
thisPacket.getString("data", dataPointer, len);
//PCM must be converted to little-endian if > 8 bits per sample
static char * swappyPointer = 0;
static uint32_t swappySize = 0;
static Util::ResizeablePointer swappy;
DTSC::Track & trk = myMeta.tracks[thisPacket.getTrackId()];
if (trk.codec == "PCM"){
if (trk.size > 8){
if (swappySize < len){
char * tmp = (char*)realloc(swappyPointer, len);
if (!tmp){
FAIL_MSG("Could not allocate data for PCM endianness swap!");
return;
if (trk.size > 8 && swappy.allocate(len)){
if (trk.size == 16){
for (uint32_t i = 0; i < len; i+=2){
swappy[i] = dataPointer[i+1];
swappy[i+1] = dataPointer[i];
}
swappyPointer = tmp;
swappySize = len;
}
}
if (trk.size == 16){
for (uint32_t i = 0; i < len; i+=2){
swappyPointer[i] = dataPointer[i+1];
swappyPointer[i+1] = dataPointer[i];
if (trk.size == 24){
for (uint32_t i = 0; i < len; i+=3){
swappy[i] = dataPointer[i+2];
swappy[i+1] = dataPointer[i+1];
swappy[i+2] = dataPointer[i];
}
}
dataPointer = swappy;
}
if (trk.size == 24){
for (uint32_t i = 0; i < len; i+=3){
swappyPointer[i] = dataPointer[i+2];
swappyPointer[i+1] = dataPointer[i+1];
swappyPointer[i+2] = dataPointer[i];
}
}
dataPointer = swappyPointer;
}
myConn.SendNow(dataPointer, len);