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

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output_progressive_flv.cpp
#	src/output/output_rtmp.cpp
This commit is contained in:
Thulinma 2017-06-19 12:46:41 +02:00
commit de4fea643a
5 changed files with 134 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/input/input_flv.cpp
View file

@ -132,6 +132,18 @@ namespace Mist {
return getNext();
}
thisPacket.genericFill(tmpTag.tagTime(), tmpTag.offset(), tmpTag.getTrackID(), tmpTag.getData(), tmpTag.getDataLen(), lastBytePos, tmpTag.isKeyframe); //init packet from tmpTags data
DTSC::Track & trk = myMeta.tracks[tmpTag.getTrackID()];
if (trk.codec == "PCM" && trk.size == 16){
char * ptr = 0;
uint32_t ptrSize = 0;
thisPacket.getString("data", ptr, ptrSize);
for (uint32_t i = 0; i < ptrSize; i+=2){
char tmpchar = ptr[i];
ptr[i] = ptr[i+1];
ptr[i+1] = tmpchar;
}
}
}
void inputFLV::seek(int seekTime) {