Merge branch 'development' into LTS_development
This commit is contained in:
commit
b4741abbc2
4 changed files with 6 additions and 4 deletions
|
@ -93,6 +93,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.
|
||||
|
||||
#ifndef STATS_DELAY
|
||||
#define STATS_DELAY 15
|
||||
|
@ -120,6 +121,9 @@ static inline void show_stackframe(){}
|
|||
/// Does not affect live streams.
|
||||
#define FLIP_MIN_DURATION 20000
|
||||
|
||||
/// Interval where the input refreshes the user data for stats etc.
|
||||
#define INPUT_USER_INTERVAL 1000
|
||||
|
||||
#define SHM_STREAM_INDEX "MstSTRM%s" //%s stream name
|
||||
#define SHM_STREAM_STATE "MstSTATE%s" //%s stream name
|
||||
#define STRMSTAT_OFF 0
|
||||
|
|
|
@ -6,8 +6,6 @@
|
|||
#include <iomanip>
|
||||
#include <fstream>
|
||||
|
||||
#define AUDIO_KEY_INTERVAL 5000 ///< This define controls the keyframe interval for non-video tracks, such as audio and metadata tracks.
|
||||
|
||||
namespace DTSC {
|
||||
/// Default constructor for packets - sets a null pointer and invalid packet.
|
||||
Packet::Packet() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue