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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2018-10-03 23:55:58 +02:00
commit 28db254d7b
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/output/output_rtmp.cpp
View file

@ -404,10 +404,10 @@ namespace Mist{
rtmpheader[1] = 0xff;
rtmpheader[2] = 0xff;
rtmpheader[3] = 0xff;
rtmpheader[header_len++] = timestamp & 0xff;
rtmpheader[header_len++] = (timestamp >> 8) & 0xff;
rtmpheader[header_len++] = (timestamp >> 16) & 0xff;
rtmpheader[header_len++] = (timestamp >> 24) & 0xff;
rtmpheader[header_len++] = (timestamp >> 16) & 0xff;
rtmpheader[header_len++] = (timestamp >> 8) & 0xff;
rtmpheader[header_len++] = timestamp & 0xff;
}else{
//regular timestamp
rtmpheader[1] = (timestamp >> 16) & 0xff;
@ -422,10 +422,10 @@ namespace Mist{
//set the header's first byte to the "continue" type chunk, for later use
rtmpheader[0] = 0xC4;
if (timestamp >= 0x00ffffff){
rtmpheader[1] = timestamp & 0xff;
rtmpheader[2] = (timestamp >> 8) & 0xff;
rtmpheader[3] = (timestamp >> 16) & 0xff;
rtmpheader[4] = (timestamp >> 24) & 0xff;
rtmpheader[1] = (timestamp >> 24) & 0xff;
rtmpheader[2] = (timestamp >> 16) & 0xff;
rtmpheader[3] = (timestamp >> 8) & 0xff;
rtmpheader[4] = timestamp & 0xff;
}
//sent actual data - never send more than chunk_snd_max at a time