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

Probably bugfix for the live audio problem

Browse source
This commit is contained in:
Erik Zandvliet 2014-04-17 16:21:19 +02:00 • committed by Thulinma
parent f00ae42c32
commit 3051173f3c
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/output/output_rtmp.cpp
View file

@ -435,6 +435,13 @@ namespace Mist {
//declined track; //declined track;
return; return;
} }
if (myMeta.tracks[pack["trackid"].asInt()].type != "video"){
if (pack["time"].asInt() - bookKeeping[trackMap[pack["trackid"].asInt()]].lastKeyTime >= 5000){
pack["keyframe"] = 1LL;
DEBUG_MSG(DLVL_DEVEL, "Fake keyframe added for track %d", pack["trackid"].asInt());
}
bookKeeping[trackMap[pack["trackid"].asInt()]].lastKeyTime = pack["time"].asInt();
}
pack["trackid"] = trackMap[pack["trackid"].asInt()]; pack["trackid"] = trackMap[pack["trackid"].asInt()];
long long unsigned int tNum = pack["trackid"].asInt(); long long unsigned int tNum = pack["trackid"].asInt();
if (!bookKeeping.count(tNum)){ if (!bookKeeping.count(tNum)){

3
src/output/output_rtmp.h
View file

@ -6,13 +6,14 @@
namespace Mist { namespace Mist {
struct DTSCPageData { struct DTSCPageData {
DTSCPageData() : pageNum(0), keyNum(0), partNum(0), dataSize(0), curOffset(0), firstTime(0){} DTSCPageData() : pageNum(0), keyNum(0), partNum(0), dataSize(0), curOffset(0), firstTime(0), lastKeyTime(-5000){}
int pageNum;///<The current page number int pageNum;///<The current page number
int keyNum;///<The number of keyframes in this page. int keyNum;///<The number of keyframes in this page.
int partNum;///<The number of parts in this page. int partNum;///<The number of parts in this page.
unsigned long long int dataSize;///<The full size this page should be. unsigned long long int dataSize;///<The full size this page should be.
unsigned long long int curOffset;///<The current write offset in the page. unsigned long long int curOffset;///<The current write offset in the page.
unsigned long long int firstTime;///<The first timestamp of the page. unsigned long long int firstTime;///<The first timestamp of the page.
long long int lastKeyTime;///<The time of the last keyframe of the page.
}; };
class OutRTMP : public Output { class OutRTMP : public Output {