From a25fa0596ea54bd2ae80f4dc8f0d7e225fdcdda5 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Mon, 9 Sep 2019 15:53:46 +0200 Subject: [PATCH] Lowered default segment duration to 1900ms, lowered audio virtual "keyframe" interval to 2000ms. --- lib/defines.h | 2 +- lib/dtsc.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/defines.h b/lib/defines.h index 7a6abfdc..f13f27a3 100644 --- a/lib/defines.h +++ b/lib/defines.h @@ -99,7 +99,7 @@ static inline void show_stackframe(){} #define SHM_DATASIZE 20 #endif -#define AUDIO_KEY_INTERVAL 5000 ///< This define controls the keyframe interval for non-video tracks, such as audio and metadata tracks. +#define AUDIO_KEY_INTERVAL 2000 ///< This define controls the keyframe interval for non-video tracks, such as audio and metadata tracks. #ifndef STATS_DELAY #define STATS_DELAY 15 diff --git a/lib/dtsc.h b/lib/dtsc.h index b3f8afea..4d9b2955 100644 --- a/lib/dtsc.h +++ b/lib/dtsc.h @@ -289,7 +289,7 @@ namespace DTSC { inline operator bool() const { return (parts.size() && keySizes.size() && (keySizes.size() == keys.size())); } - void update(long long packTime, long long packOffset, long long packDataSize, uint64_t packBytePos, bool isKeyframe, long long packSendSize, unsigned long segment_size = 5000); + void update(long long packTime, long long packOffset, long long packDataSize, uint64_t packBytePos, bool isKeyframe, long long packSendSize, unsigned long segment_size = 1900); int getSendLen(bool skipDynamic = false); void send(Socket::Connection & conn, bool skipDynamic = false); void writeTo(char *& p); @@ -347,10 +347,10 @@ namespace DTSC { return vod || live; } void reinit(const DTSC::Packet & source); - void update(const DTSC::Packet & pack, unsigned long segment_size = 5000); + void update(const DTSC::Packet & pack, unsigned long segment_size = 1900); void updatePosOverride(DTSC::Packet & pack, uint64_t bpos); - void update(JSON::Value & pack, unsigned long segment_size = 5000); - void update(long long packTime, long long packOffset, long long packTrack, long long packDataSize, uint64_t packBytePos, bool isKeyframe, long long packSendSize = 0, unsigned long segment_size = 5000); + void update(JSON::Value & pack, unsigned long segment_size = 1900); + void update(long long packTime, long long packOffset, long long packTrack, long long packDataSize, uint64_t packBytePos, bool isKeyframe, long long packSendSize = 0, unsigned long segment_size = 1900); unsigned int getSendLen(bool skipDynamic = false, std::set selectedTracks = std::set()); void send(Socket::Connection & conn, bool skipDynamic = false, std::set selectedTracks = std::set()); void writeTo(char * p);