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

Changed non-video keyframe interval to a define in dtscmeta.cpp

Browse source
This commit is contained in:
Thulinma 2014-10-04 13:42:49 +02:00
parent bd5ba9a1f3
commit 1610a6b2f3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/dtscmeta.cpp
View file

@ -4,6 +4,8 @@
#include <cstring> #include <cstring>
#include <iomanip> #include <iomanip>
#define AUDIO_KEY_INTERVAL 5000 ///< This define controls the keyframe interval for non-video tracks, such as audio and metadata tracks.
/// Retrieves a short in network order from the pointer p. /// Retrieves a short in network order from the pointer p.
static short btohs(char * p) { static short btohs(char * p) {
return (p[0] << 8) + p[1]; return (p[0] << 8) + p[1];
@ -1133,7 +1135,7 @@ namespace DTSC {
} }
parts.push_back(newPart); parts.push_back(newPart);
lastms = pack.getTime(); lastms = pack.getTime();
if (pack.getFlag("keyframe") || !keys.size() || (type != "video" && pack.getTime() > 5000 && pack.getTime() - 5000 > (unsigned long long)keys[keys.size() - 1].getTime())) { if (pack.getFlag("keyframe") || !keys.size() || (type != "video" && pack.getTime() >= AUDIO_KEY_INTERVAL && pack.getTime() - (unsigned long long)keys[keys.size() - 1].getTime() >= AUDIO_KEY_INTERVAL)){
Key newKey; Key newKey;
newKey.setTime(pack.getTime()); newKey.setTime(pack.getTime());
newKey.setParts(0); newKey.setParts(0);
@ -1194,7 +1196,7 @@ namespace DTSC {
} }
parts.push_back(newPart); parts.push_back(newPart);
lastms = pack["time"].asInt(); lastms = pack["time"].asInt();
if (pack.isMember("keyframe") || !keys.size() || (type != "video" && pack["time"].asInt() - 5000 > keys[keys.size() - 1].getTime())) { if (pack.isMember("keyframe") || !keys.size() || (type != "video" && pack["time"].asInt() >= AUDIO_KEY_INTERVAL && pack["time"].asInt() - keys[keys.size() - 1].getTime() >= AUDIO_KEY_INTERVAL)) {
Key newKey; Key newKey;
newKey.setTime(pack["time"].asInt()); newKey.setTime(pack["time"].asInt());
newKey.setParts(0); newKey.setParts(0);