Make CFR mode actually force CFR even when the reported fps is unchanged

Fix duration calculation for CFR mode
vapoursynth · May 25, 2024 · ddaac8d · ddaac8d
1 parent 76ecdd2
commit ddaac8d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/src/avisynth.cpp b/src/avisynth.cpp
@@ -158,13 +158,8 @@ class AvisynthVideoSource : public IClip {
 
             if (FPSNum > 0) {
                 vsh::reduceRational(&FPSNum, &FPSDen);
-                if (VP.FPS.Den != FPSDen || VP.FPS.Num != FPSNum) {
-                    VI.SetFPS(static_cast<int>(FPSNum), static_cast<int>(FPSDen));
-                    VI.num_frames = std::max(1, static_cast<int>((VP.Duration * VI.fps_numerator) / VI.fps_denominator));
-                } else {
-                    FPSNum = -1;
-                    FPSDen = 1;
-                }
+                VI.SetFPS(static_cast<int>(FPSNum), static_cast<int>(FPSDen));
+                VI.num_frames = std::max(1, static_cast<int>((VP.Duration * VI.fps_numerator) * VP.TimeBase.ToDouble() / VI.fps_denominator + 0.5));
             } else if (RFF) {
                 VI.num_frames = vsh::int64ToIntS(VP.NumRFFFrames);
             }

diff --git a/src/vapoursynth.cpp b/src/vapoursynth.cpp
@@ -215,14 +215,9 @@ static void VS_CC CreateBestVideoSource(const VSMap *In, VSMap *Out, void *, VSC
 
         if (D->FPSNum > 0) {
             vsh::reduceRational(&D->FPSNum, &D->FPSDen);
-            if (VP.FPS.Den != D->FPSDen || VP.FPS.Num != D->FPSNum) {
-                D->VI.fpsDen = D->FPSDen;
-                D->VI.fpsNum = D->FPSNum;
-                D->VI.numFrames = std::max(1, static_cast<int>((VP.Duration * D->VI.fpsNum) / D->VI.fpsDen));
-            } else {
-                D->FPSNum = -1;
-                D->FPSDen = 1;
-            }
+            D->VI.fpsDen = D->FPSDen;
+            D->VI.fpsNum = D->FPSNum;
+            D->VI.numFrames = std::max(1, static_cast<int>((VP.Duration * D->VI.fpsNum) * VP.TimeBase.ToDouble() / D->VI.fpsDen + 0.5));
         } else if (D->RFF) {
             D->VI.numFrames = vsh::int64ToIntS(VP.NumRFFFrames);
         }

diff --git a/src/videosource.cpp b/src/videosource.cpp
@@ -24,6 +24,7 @@
 #include <thread>
 #include <cassert>
 #include <iterator>
+#include <charconv>
 
 #include "../libp2p/p2p_api.h"
 
@@ -1657,8 +1658,11 @@ void BestVideoSource::WriteTimecodes(const std::filesystem::path &TimecodeFile)
         throw BestSourceException("Couldn't open timecode file for writing");
 
     fprintf(F.get(), "# timecode format v2\n");
-    for (const auto &Iter : TrackIndex.Frames)
-        fprintf(F.get(), "%.02f\n", (Iter.PTS * VP.TimeBase.Num) / (double)VP.TimeBase.Den);
+    for (const auto &Iter : TrackIndex.Frames) {
+        char buffer[100];
+        auto res = std::to_chars(buffer, buffer + sizeof(buffer), (Iter.PTS * VP.TimeBase.Num) / (double)VP.TimeBase.Den, std::chars_format::fixed, 2);
+        fprintf(F.get(), "%s\n", std::string(buffer, res.ptr - buffer).c_str());
+    }
 }
 
 const BestVideoSource::FrameInfo &BestVideoSource::GetFrameInfo(int64_t N) const {