set default grid loop to 1 (#102)

dfaker · May 18, 2023 · 07f99a0 · 07f99a0
1 parent 5e62122
commit 07f99a0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/cutselectionController.py b/src/cutselectionController.py
@@ -392,7 +392,7 @@ def jumpClips(self,offset):
         self.randomlyPlayedFiles.add(nextFile)
       except ValueError as e:
         logging.error('Exception jumpClips',exc_info=e)
-    clipsleft = len(set(self.files).difference(self.randomlyPlayedFiles))
+
     self.updateProgressStatistics()
 
   def playVideoFile(self,filename,startTimestamp):

diff --git a/src/ffmpegService.py b/src/ffmpegService.py
@@ -360,6 +360,8 @@ def encodeGrid(tempPathname,outputPathName,runNumber,requestId,mode,seqClips,opt
       if 'Loop shorter' in gridLoopMergeOption:
         minLength = maxLength
 
+      print('### minLength #######', minLength, '######')
+
       totalExpectedEncodedSeconds = cutLengths+(minLength*(1/speedAdjustment))
       totalEncodedSeconds = 0
 
@@ -649,13 +651,13 @@ def encodeGrid(tempPathname,outputPathName,runNumber,requestId,mode,seqClips,opt
         vi,(vrid,vclipfilename,vs,ve,vfilterexp,vfilteraudioexp,vfilterexpEnc) = brickClips[k]
 
         vetime = ve-vs
-        loopCount=0
+        loopCount=1
         if 'Loop shorter' in gridLoopMergeOption:
           print('loop',vclipfilename,maxLength,vetime,maxLength/vetime,math.ceil(maxLength/vetime))
           loopCount =  math.ceil(maxLength/vetime)
 
-
         inputsList.extend(['-stream_loop', str(loopCount),'-i',brickTofileLookup[k]])
+
         inputScales.append('[{k}:v]setpts=PTS-STARTPTS+{st},trim=duration={maxlen},scale={w}:{h}:flags=bicubic[vid{k}]'.format(k=snum,w=int(w),h=int(h),st=0,maxlen=maxLength))
 
         srcLayer='[tmp{k}]'.format(k=snum)

diff --git a/src/webmGeneratorController.py b/src/webmGeneratorController.py
@@ -87,7 +87,6 @@ def __init__(self,initialFiles):
       "perClipSpeedAdjustment":False,
       "defaultPSNRWidthReductionFactor":0.05,
 
-
       "loadRelativeCopyOnFileNotExists":False,
       "clampSeeksToFPS":False,
 

diff --git a/src/webmGeneratorUi.py b/src/webmGeneratorUi.py
@@ -346,8 +346,6 @@ def __init__(self,controller,master=None):
     self.commandmenu.add_command(label="Show audio slice planner",command=self.showSlicePlanner,state='disabled')
 
     self.commandmenu.add_separator()
-    self.autoconvertVar=StringVar(self.master,False)
-    self.commandmenu.add_checkbutton(label="Auto encode on video switch", command=self.toggleAutoconvert, variable=self.autoconvertVar)
     self.commandmenu.add_checkbutton(label="Toggled completed frame", command=self.toggleCompletedFrame)
 
 
@@ -374,8 +372,6 @@ def checkFreeSpaceWorker():
     self.master.config(menu=self.menubar)
 
     self.notebook = ttk.Notebook(self.master)
-
-    """BLERG"""
 
     self.frameConverted = ttk.Frame(self.master)
     self.frameConverted.config(height="200", width="0" )
@@ -392,7 +388,10 @@ def checkFreeSpaceWorker():
     self.completedLabel = ttk.Label(self.scrolledConvertedInner,text='Completed Encodes')
     self.completedLabel.pack(expand="false", fill='x', side="top")
 
-    """BLERG"""
+    self.autoconvertVar=StringVar(self.master,False)
+
+    self.autoConvertCheck = ttk.Checkbutton(self.scrolledConvertedInner,text='Auto convert',command=self.toggleAutoconvert, variable=self.autoconvertVar)
+    self.autoConvertCheck.pack(expand="false", fill='x', side="top")
 
     self.statusFrame = ttk.Frame(self.master,height='20')
 
@@ -495,7 +494,7 @@ def registerComplete(self,label,filename,img=None):
     try:
         print(label,filename)
         completed =  ttk.Label(self.scrolledConvertedInner,text=label, relief='groove', width=25, cursor="fleur", compound="top")
-        completed.pack(expand="false", fill='x', side="top", padx=25)
+        completed.pack(expand="false", fill='x', side="top", padx=10)
 
         try:
             if img is not None: