From 2fd1354d47f0e1872aad9a4018bd5acccdcf2780 Mon Sep 17 00:00:00 2001 From: eumagga0x2a Date: Mon, 29 Jan 2024 02:35:07 +0100 Subject: [PATCH] [stillimage] Remove faulty and pointless sanity check, fix mixup of relative and absolute time values --- .../ADM_videoFilters6/stillimage/stillimage.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp b/avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp index 8b770b2834..4ff0bd0b3d 100644 --- a/avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp +++ b/avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp @@ -317,19 +317,11 @@ bool stillimage::getNextFrame(uint32_t *fn, ADMImage *image) /** \fn updateTimingInfo - \brief perform a sanity check and update info with the new totalDuration + \brief Update total duration and markers. */ bool stillimage::updateTimingInfo(void) { uint64_t old=previousFilter->getInfo()->totalDuration; - if(1000LL*params.start + timeIncrement > old) - { - if(old > timeIncrement) - params.start=(uint32_t)((old-timeIncrement)/1000); - else - params.start=0; - } - begin=1000LL*params.start; end=begin+1000LL*params.duration; if(from < begin) @@ -347,12 +339,12 @@ bool stillimage::updateTimingInfo(void) freezeDuration = end - begin; aprintf("[stillimage::updateTimingInfo] Freeze duration set to %s\n", ADM_us2plain(freezeDuration)); - info.totalDuration=old+end-begin; + info.totalDuration = old + freezeDuration; info.markerA = previousFilter->getInfo()->markerA; info.markerB = previousFilter->getInfo()->markerB; - if (info.markerA > begin) + if (info.markerA > from + begin) info.markerA += freezeDuration; - if (info.markerB > begin) + if (info.markerB > from + begin) info.markerB += freezeDuration; return true;