From 355d5dab6e26a404bec146bd7e93fe3206c755da Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sat, 30 Aug 2014 11:51:37 -0700 Subject: [PATCH] Move timestamp smooth threshold to media-io --- libobs/media-io/media-io-defs.h | 4 ++++ libobs/obs-source.c | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libobs/media-io/media-io-defs.h b/libobs/media-io/media-io-defs.h index 28c970f75..f0be367d1 100644 --- a/libobs/media-io/media-io-defs.h +++ b/libobs/media-io/media-io-defs.h @@ -18,3 +18,7 @@ #pragma once #define MAX_AV_PLANES 8 + +/* time threshold in nanoseconds to ensure audio timing is as seamless as + * possible */ +#define TS_SMOOTHING_THRESHOLD 70000000ULL diff --git a/libobs/obs-source.c b/libobs/obs-source.c index a908a729d..861cce381 100644 --- a/libobs/obs-source.c +++ b/libobs/obs-source.c @@ -519,9 +519,6 @@ static inline uint64_t conv_frames_to_time(size_t frames) #define MAX_TS_VAR 5000000000ULL /* maximum time that timestamp can jump in nanoseconds */ #define MAX_TIMESTAMP_JUMP 2000000000ULL -/* time threshold in nanoseconds to ensure audio timing is as seamless as - * possible */ -#define TS_SMOOTHING_THRESHOLD 70000000ULL static inline void reset_audio_timing(obs_source_t source, uint64_t timetamp) {