Bump version

CrendKing · Jun 29, 2021 · 3a11b5c · 3a11b5c
1 parent 5a11c98
commit 3a11b5c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/avisynth_filter/src/frame_handler.cpp b/avisynth_filter/src/frame_handler.cpp
@@ -11,8 +11,6 @@ namespace SynthFilter {
 auto FrameHandler::AddInputSample(IMediaSample *inputSample) -> HRESULT {
     HRESULT hr;
 
-    UpdateExtraSourceBuffer();
-
     _addInputSampleCv.wait(_filter.m_csReceive, [this]() -> bool {
         if (_isFlushing) {
             return true;
@@ -95,10 +93,11 @@ auto FrameHandler::AddInputSample(IMediaSample *inputSample) -> HRESULT {
     }
     _newSourceFrameCv.notify_all();
 
-    Environment::GetInstance().Log(L"Stored source frame: %6i at %10lli ~ %10lli duration(literal) %10lli",
-                                   _nextSourceFrameNb, inputSampleStartTime, inputSampleStopTime, inputSampleStopTime - inputSampleStartTime);
+    Environment::GetInstance().Log(L"Stored source frame: %6i at %10lli ~ %10lli duration(literal) %10lli max_requested %6i extra_buffer %6i",
+                                   _nextSourceFrameNb, inputSampleStartTime, inputSampleStopTime, inputSampleStopTime - inputSampleStartTime, _maxRequestedFrameNb.load(), _extraSourceBuffer);
 
     _nextSourceFrameNb += 1;
+    UpdateExtraSourceBuffer();
 
     return S_OK;
 }

diff --git a/filter_common/src/constants.h b/filter_common/src/constants.h
@@ -20,8 +20,7 @@ static const GUID MEDIASUBTYPE_YV24                                = FOURCCMap('
 // interface version 7 = AviSynth+ 3.5
 static constexpr const int MINIMUM_AVISYNTH_PLUS_INTERFACE_VERSION = 7;
 
-static constexpr const double EXTRA_SOURCE_BUFFER_INCREASE_THRESHOLD = 0.95;
-static constexpr const double EXTRA_SOURCE_BUFFER_DECREASE_THRESHOLD = 1.05;
+static constexpr const double EXTRA_SOURCE_BUFFER_CHANGE_THRESHOLD = 0.05;
 static constexpr const int MAXIMUM_EXTRA_SOURCE_BUFFER = 14;
 
 /*

diff --git a/filter_common/src/frame_handler_common.cpp b/filter_common/src/frame_handler_common.cpp
@@ -46,9 +46,9 @@ auto FrameHandler::UpdateExtraSourceBuffer() -> void {
     if (const int sourceAvgFps = MainFrameServer::GetInstance().GetSourceAvgFrameRate();
         _currentInputFrameRate > 0 && _nextSourceFrameNb % (sourceAvgFps / FRAME_RATE_SCALE_FACTOR) == 0) {
         if (const double ratio = static_cast<double>(_currentInputFrameRate) / sourceAvgFps;
-            ratio < EXTRA_SOURCE_BUFFER_INCREASE_THRESHOLD) {
+            ratio < 1 - EXTRA_SOURCE_BUFFER_CHANGE_THRESHOLD) {
             _extraSourceBuffer = min(_extraSourceBuffer, MAXIMUM_EXTRA_SOURCE_BUFFER) + 1;
-        } else if (ratio > EXTRA_SOURCE_BUFFER_DECREASE_THRESHOLD) {
+        } else if (ratio > 1 + EXTRA_SOURCE_BUFFER_CHANGE_THRESHOLD) {
             _extraSourceBuffer = max(_extraSourceBuffer, 1) - 1;
         }
     }

diff --git a/filter_common/src/version.h b/filter_common/src/version.h
@@ -29,7 +29,7 @@ namespace SynthFilter {
 #define FILTER_NAME_WIDE                WIDEN(FILTER_NAME_BASE)
 #define FILTER_VERSION_MAJOR            1
 #define FILTER_VERSION_MINOR            1
-#define FILTER_VERSION_PATCH            3
+#define FILTER_VERSION_PATCH            4
 #define FILTER_VERSION_STRING           STRINGIZE(FILTER_VERSION_MAJOR) "." STRINGIZE(FILTER_VERSION_MINOR) "." STRINGIZE(FILTER_VERSION_PATCH) FILTER_VARIANT " # " FILTER_GIT_HASH
 
 }
diff --git a/vapoursynth_filter/src/frame_handler.cpp b/vapoursynth_filter/src/frame_handler.cpp
@@ -10,8 +10,6 @@ namespace SynthFilter {
 auto FrameHandler::AddInputSample(IMediaSample *inputSample) -> HRESULT {
     HRESULT hr;
 
-    UpdateExtraSourceBuffer();
-
     _addInputSampleCv.wait(_filter.m_csReceive, [this]() -> bool {
         if (_isFlushing) {
             return true;
@@ -97,10 +95,11 @@ auto FrameHandler::AddInputSample(IMediaSample *inputSample) -> HRESULT {
                               std::forward_as_tuple(frame, inputSampleStartTime, hdrSideData));
     }
 
-    Environment::GetInstance().Log(L"Stored source frame: %6i at %10lli ~ %10lli duration(literal) %10lli, last used: %6i",
-                                   _nextSourceFrameNb, inputSampleStartTime, inputSampleStopTime, inputSampleStopTime - inputSampleStartTime, _lastUsedSourceFrameNb.load());
+    Environment::GetInstance().Log(L"Stored source frame: %6i at %10lli ~ %10lli duration(literal) %10lli, last_used %6i, extra_buffer %6i",
+                                   _nextSourceFrameNb, inputSampleStartTime, inputSampleStopTime, inputSampleStopTime - inputSampleStartTime, _lastUsedSourceFrameNb.load(), _extraSourceBuffer);
 
     _nextSourceFrameNb += 1;
+    UpdateExtraSourceBuffer();
 
     /*
      * Some video decoders set the correct start time but the wrong stop time (stop time always being start time + average frame time).