From 182e3698b78a4edf5632ddf1bc907e512be510f6 Mon Sep 17 00:00:00 2001
From: Janis Hutz <development@janishutz.com>
Date: Tue, 28 Mar 2023 15:28:27 +0200
Subject: [PATCH] alternative fps counter

---
 bin/__pycache__/handler.cpython-310.pyc | Bin 7099 -> 7086 bytes
 bin/handler.py                          |  41 ++++++++++++------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/bin/__pycache__/handler.cpython-310.pyc b/bin/__pycache__/handler.cpython-310.pyc
index 49d43d7553b7b91634e9ac930b5d3b02dffdd3bf..991859e675bbbb84554d09ab103bf746d89e2888 100644
GIT binary patch
delta 1597
zcmaJ>&1)M+6rY*>&}yZXELl+`*|9AvR^mkYXcO#yq_ngS^bkrREp1(bP%|r|*xpq}
zYl_?rOIUj9MX;Ab5J-n!3N3`t9@1+sz4s&tJ@nXrAeTVjo0VO=7~3#AZ{F|s-tWD6
zqu<tlUbkG!G70>B`Oh-{^{M3~14AQZ-|)zY`s4u{Q%XJ~PEsYF($7(X|6dS?evKG)
zr2P-0_iINnUV_sQA^^(ZY@3N&T=9}%nIU~bxQcA}YD0+AOgR;>1B2@T{P-9!F$Ee^
zpbmkP7?_)P3CKu;KZR1^JcZ|5kg{okCxgr}l+w(?E<2jxX~fBWZVbh6;5PGUZ;*Q%
zJ_(w$K2gboJh#>fi(Rp#9{^;H3b2A^SZ9w^kdam8LpnOcvtz7nW|+W455GBul{<kI
z{6~w^{=q?Av*;)sgf)xYg7vId8kK>}LOQ0rP$qF*;K3GFMsxg(ta;u$2X;2Z`WN<R
zyhU#b?1hlZ?|ew-2)9B8-YQ&j9WHq}7|{M=e237?A~sX1#Gq%#aGL<GNqUVF8NL=$
zUMi7qS(!+0HJ%S(mm%3auY`)cm^n<%=cg75tMY}Zwdm`7N$!L5qZMAl*6pVb1`OI+
z9UhFL2`Y6E`RUO?^L3C__jT{W=;D}cs{<<Rc#r2GWf{`dAx>?m$dV4T$Vpk1g;*#*
z-@N2qMsP@BAZ|ZO@bl4k>6Mlhw^+_ZV?ZAcd>qO;w@PH2LAqbSvVdVeg87E|Y52)Q
z?2q7Eg~?Ii+wiHcN^TJ>qb;u+;ysRX){P*+SB}fu&p{Jz0utXzJ#K<L(Vh@&5?mWL
zL>aKYdaNPS7dK#{#4)c4{0oP1;`fI4BZmx7mk|}52s`byU4#%-zKT~TgTW(*V4w3#
zcn&GCl_<U8gWyA}K7=O0gU4w+5FmhaCnjB)lCGXeI!(?s>>ej~$?ElwqU~(Q6cm2k
zL>`vt&+JM*(es4e+U-pYz9(8<$91CLGgqRgnSxR_&FE#O_v~f%DvQ3)Z={OI)N!dq
zFY>RcO4sd1*6fY@6TRKu?b=%ttt;HGY>@=aMA@=E(Li(wmQB4aTDx{{q6v4;;S;UB
z<F>rbq&$Vh_9Xd9ziZzX!WElZ$7#F0iRyKB?TOagvF&d3-t1qDsnNTI*Bd5Xqif7$
z2GyBPD{6+NDWgj?Lk*gz%apy!Xc@55)MU?s!gVe62Fj4~Z${6{=k)i{{vdi$u9Vks
z`xY)(*=C~M*|FU{PrMz?RPNEgBd7Ay!aL}`h3@oy*J*dQx-HSOg^*#cMQ_eMrXT(b
D05^k0

delta 1562
zcmaJ>&ube;6rS1Du2$0SDwbtSTFJ8FSazJqjUBgE52cj0A-7UUAyg2A(pf1=tzCJv
zrj=L_?NSOoiB4}uVRf$yC5Ik*YX5@vs!O1^K>mf4zL`~wQ-USfd2inL-uvE<-Cydz
z*A3S&k_diJo^Oype>I%MSXU78P>4OrmjXP)1Q$>!6KRHh)QtJ)aV%7bEHrhY#e^0g
zS>O}dl^G5=Uh@)gqY>mK`59oM=FxXj0SRmBK5~jN<mtmtG2(yEAmey|K`@0Q$l_E3
zTtq|*Abd0RIdbq<9LhthBpJxUF$G$j=nKsNEk(?QmiAS0Mab#!3Q=c}VWfFWVFpmk
zTmvErAd($^JC2w{NdUAGuKo{{8~$_=14NcMWkBUg=1Ym5k!8_`LV!;Z$#QQvSEdS(
zw;W60Rsr|NYq;D3H_k7BDg=fQ7!m6p0vbgCSez@|7x{e$QZ`FqS>vu^1Z9xQ(Xa%e
za=1Q&wi4dA3b%cX9^3)>s*hsmafN7gBt@1y0ZJ20b7O#&!VMnsl-G3iLJcKRS0%vV
zHL^D2)s?4lPU-l?C0^^7dc8{g9sz>QO=njoz^=JTG<a4=saFGlWE)dhLNTi(%qlm*
z!~1MqUq9%0+u`*Y@5UDN<{D7h0`%ro=3Vm6CocN6BNnm5j`bB>W#8-7YANcM=tOOT
zkAL*zJOa`3NOa^kUK;yb&sBd0X$M*(!&&pO9}~z;(DH532JjA;VH}JNvh{lI(Gt}0
zHX!*bY)5s78|4&Ts3|*<hU&%T;<5QsO(bfOWzY)XfBig8v{D6u;`5W}E=P^u2)k^d
zb|6HG+~BW>2o|MmkemD-Qr6())OUR#e6DRz;T43PhRFfVh=2z^ZshdV!s*r<oi3xZ
zC-xrQLp%GQG~xq~+O6JzV)#zYHF82*Ue|RR3Fl$6O<O&Cz*^}ndna9s(+ogHIrepW
zz<w~h?4?<K`Xaq6joa;B-|oznK6M}3)Z&5UzT2k>A$4qz-UO+kM)4X-*J-<hxzavz
zTOQ4GQ$m;^wLMRKHtgGXD0L}a<^BqFPaHCjdEK5pR|ZG6-Jh$2M<-tQsG-sxuxDGD
zI#$`E%szXPxy=ripH(c$luaz*4Bo&x)^G(&|C)-4P0*5(B(rSxwyEPod?@LXhE++$
zPib~fNqqn*MP9nk&I)VlA=m5duYy&0pNk*zhYF8Iyxl#r-4l;~#ANFM{)e@!v+^D{
b-{NNd3)g9PJN*_N*p!Me@3LC)8+`XaML&eo

diff --git a/bin/handler.py b/bin/handler.py
index 4fe228e..05627c2 100644
--- a/bin/handler.py
+++ b/bin/handler.py
@@ -93,26 +93,7 @@ class Handler:
 
     def video_scaling(self, fsrpath, filepath, quality_mode, quality_setting, output_path, threads):
         # DO NOT CALL THIS! Use Handler().handler() instead!
-        self.videometa = ffmpeg.probe(str(filepath))["streams"].pop(0)
-
-        # Retrieving Video metadata
-        self.duration = self.videometa.get( 'duration' )
-        self.frames = self.videometa.get( 'nb_frames' )
-        try:
-            self.infos = str( self.videometa.get( 'r_frame_rate' ) )
-            self.framerate = float( self.infos[:len(self.infos) - 2] )
-        except TypeError:
-            print( '\n\n=> using fallback method to get framerate' )
-            self.framerate = round(float(self.frames) / float(self.duration), 1)
-            
-            
-        print( '==> Video duration is: ', self.duration, 's' )
-        print( '==> Framecount is: ', self.frames, ' frames' )
-        print( '==> Frame rate is: ', self.framerate, ' FPS' )
-        print( '==> Running with: ', threads, ' threads\n\n' )
-
-        time.sleep( 2 );
-
+        
         # Splitting video into frames
         try:
             shutil.rmtree(self.tmppath)
@@ -155,6 +136,26 @@ class Handler:
         	self.maxlength = 31900
         self.pos = 1
 
+
+        # Retrieving Video metadata
+        self.videometa = ffmpeg.probe(str(filepath))["streams"].pop(0)
+
+        self.duration = self.videometa.get( 'duration' )
+        self.frames = len( self.filelist )
+        try:
+            self.framerate = round(float(self.frames) / float(self.duration), 1)
+        except TypeError:
+            print( '\n\n=> using fallback method to get framerate' )
+            self.infos = str( self.videometa.get( 'r_frame_rate' ) )
+            self.framerate = float( self.infos[:len(self.infos) - 2] )
+            
+        print( '\n\n==> Video duration is: ', self.duration, 's' )
+        print( '==> Framecount is: ', self.frames, ' frames' )
+        print( '==> Frame rate is: ', self.framerate, ' FPS' )
+        print( '==> Running with: ', threads, ' threads\n\n' )
+
+        time.sleep( 2 );
+
         try:
             os.mkdir(f"{self.tmppath}sc")
         except FileExistsError: