Update app.py

app.py

@@ -65,13 +65,15 @@ def capture_function(vid=None):
     fbox=[]
     cnt=0
     frame_count1= int(frame_count)
-    for i in range(int(frame_count1)):
+    for i in range(int(frame_count1)-1):
         capture.set(cv2.CAP_PROP_POS_FRAMES, i)
         ret, frame_f = capture.read(i)
         #frame_ff = cv2.cvtColor(frame_f, cv2.COLOR_BGR2RGB)
         cv2.imwrite(f'{uid}-frames/{i}.png',frame_f)
         fbox.append(f'{uid}-frames/{i}.png')
-        yield fbox,fbox
+        frame_num=f'Working on {i+1} of {frame_count1-1}'
+        
+        yield fbox,fbox,frame_num
 
 def im_2_vid(images,fps):
     #width, height = Image.open(images[0]).size
@@ -147,7 +149,10 @@ def trim_vid(vid,start_time,end_time):
     #vid = f"{inp_out}.mp4"
     ffmpeg_extract_subclip(vid, start, end, targetname=f"{uid}-clip.mp4")
     out= f"{uid}-clip.mp4"
-    return out,out 
+    capture = cv2.VideoCapture(out)    
+    frame_count = int(capture.get(cv2.CAP_PROP_FRAME_COUNT))    
+    capture.release()
+    return out,out,frame_count
     
 def other():    
     new_video_in = str(vid)
@@ -184,12 +189,16 @@ with gr.Blocks() as app:
                 with gr.Row():
                     start_f = gr.Textbox(label = "Start", value = "0:00:00", placeholder = "0:00:23",interactive = True)
                     end_f = gr.Textbox(label = "End", value = "0:00:05", placeholder = "0:00:54",interactive = True)
+                    trim_count = gr.Textbox(label="Trimmed Frames")
                 trim_btn=gr.Button("Trim")
                 out_trim=gr.Video(format="mp4")
                 hid_box = gr.Textbox(visible=False)
 
     with gr.Tab("Frames"):
-        frame_btn = gr.Button("Get Frames")
+        with gr.Row():
+            frame_btn = gr.Button("Get Frames")
+            frame_num=gr.Textbox("Status")
+            
         with gr.Row():
             with gr.Column():
                 frame_gal = gr.Gallery(columns=6)
@@ -214,9 +223,9 @@ with gr.Blocks() as app:
     def echo_fn(inp):
         return inp 
     #outp_vid.change(echo_fn,outp_vid,[out_trim])
-    trim_btn.click(trim_vid,[hid_box,start_f,end_f],[out_trim,in_vid])
+    trim_btn.click(trim_vid,[hid_box,start_f,end_f],[out_trim,in_vid,trim_count])
     outp_vid.change(load_video,outp_vid,[frame_count,fps,end_f]).then(echo_fn,outp_vid,[out_trim])
-    frame_btn.click(capture_function,[out_trim],[frame_gal,frame_file])
+    frame_btn.click(capture_function,[out_trim],[frame_gal,frame_file,frame_stat])
     rem_btn.click(rem_bg,[out_trim],[rem_vid,frame_num,rem_bg_vid])
     go_btn.click(dl,inp_url,[outp_vid,outp_file,out_trim,hid_box])
     app.load(fn=predict, inputs=[text_input,url_params], outputs=[text_output,text_input],_js=load_js)