From 8bb03a1136d06088c0cacca3bead58a33b100633 Mon Sep 17 00:00:00 2001 From: jpark37 Date: Sun, 26 Jun 2022 03:17:58 -0700 Subject: [PATCH] obs-ffmpeg: Fix warning about useless llabs call --- plugins/obs-ffmpeg/obs-ffmpeg-video-encoders.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-video-encoders.c b/plugins/obs-ffmpeg/obs-ffmpeg-video-encoders.c index 80887cbc6..61635847a 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-video-encoders.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-video-encoders.c @@ -216,7 +216,7 @@ bool ffmpeg_video_encode(struct ffmpeg_video_encoder *enc, { AVPacket av_pkt = {0}; bool timeout = false; - int64_t cur_ts = (int64_t)os_gettime_ns(); + const int64_t cur_ts = (int64_t)os_gettime_ns(); int got_packet; int ret; @@ -256,17 +256,17 @@ bool ffmpeg_video_encode(struct ffmpeg_video_encoder *enc, packet->keyframe = !!(av_pkt.flags & AV_PKT_FLAG_KEY); *received_packet = true; - uint64_t recv_ts_nsec = - util_mul_div64((uint64_t)av_pkt.pts, - (uint64_t)SEC_TO_NSEC, - (uint64_t)enc->context->time_base.den) + + const int64_t recv_ts_nsec = + (int64_t)util_mul_div64( + (uint64_t)av_pkt.pts, (uint64_t)SEC_TO_NSEC, + (uint64_t)enc->context->time_base.den) + enc->start_ts; #if 0 debug("cur: %lld, packet: %lld, diff: %lld", cur_ts, recv_ts_nsec, cur_ts - recv_ts_nsec); #endif - if (llabs(cur_ts - recv_ts_nsec) > TIMEOUT_MAX_NSEC) { + if ((cur_ts - recv_ts_nsec) > TIMEOUT_MAX_NSEC) { char timeout_str[16]; snprintf(timeout_str, sizeof(timeout_str), "%d", TIMEOUT_MAX_SEC);