Update app.py

app.py

@@ -37,7 +37,11 @@ def load_video(vid):
     minutes = int(vid_t/60)-(hours*360)
     seconds = vid_t-(minutes*60)-(hours*360)
     vid_len = f'{hours}:{minutes}:{seconds}'
-    return frame_count, fps, vid_len, vid
+    if ".gif" in new_video_in:
+        idx_vid = gr.update(value="GIF")
+    else:
+        idx_vid = gr.update(value="Video")
+    return frame_count, fps, vid_len, vid,idx_vid
 def im_2_vid(images,fps):
     this_im=cv2.imread(images[0])
     height=this_im.shape[0]
@@ -91,6 +95,64 @@ def trim_vid(vid,start_time,end_time):
     capture.release()
     return out,frame_count
 
+
+def video_clip(program,fps,qual,model_name,denoise_strength,face_enhance,outscale):
+    _=None    
+    fps=float(fps)
+    new_video_in = str(f"{uid}-clip.mp4")
+    capture = cv2.VideoCapture(new_video_in)
+    frame_count = int(capture.get(cv2.CAP_PROP_FRAME_COUNT))
+    fbox=[]
+    out_box=[]
+    cnt=0
+    frame_count1= int(frame_count)
+    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+1}.png',frame_f)
+        fbox.append(f'{uid}-frames/{i+1}.png')
+        mes=f'Working on {i+1} of {frame_count1}'
+        yield _,_,mes
+    yield _,_,"Frames Complete"
+    if qual:
+        mes = "Improving Quality"
+        yield _,_,mes
+    if qual:
+        for i,img in enumerate(fbox):
+            #print (img)
+            out = os.path.abspath(img)
+            out_url = f'https://omnibus-Vid-2-GIF-ERSGAN.hf.space/file={out}'
+            mes=f'Improving frame {i+1} of {frame_count}'
+            yield _,_,mes
+            out = esr(out_url, model_name, float(denoise_strength), face_enhance, int(outscale))
+            #yield _,_,mes
+            #cv2.imwrite(f'{img}',out)
+            out_box.append(f'{out}')
+            print (f'https://omnibus-Vid-2-GIF-ERSGAN.hf.space/file={out}')
+            #print (f'out::{out}')
+        print (f'out_box::{out_box}')
+        clip = ImageSequenceClip(out_box, fps = fps) 
+    else:
+        mes="Writing Video"
+        clip = ImageSequenceClip(fbox, fps = fps) 
+    yield _,_,"Writing Video"    
+
+    ###################
+    videoclip = VideoFileClip(new_video_in)
+    audioclip=videoclip.audio
+    #clip = moviepy.video.io.ImageSequenceClip.ImageSequenceClip(images, fps)
+    clip.audio=audioclip
+    clip.write_videofile(f"{uid}/enhanced_vid.mp4")
+    ########################    
+    
+    
+    
+    #clip.speedx(2).to_gif(f"{uid}/clip_gif.gif",program=program)    
+    yield _,_,"Saving Video"    
+    out = f"{uid}/enhanced_vid.mp4"
+    yield out,out,"Video Complete"   
+
 def gif_clip(program,fps,qual,model_name,denoise_strength,face_enhance,outscale):
     _=None    
     fps=float(fps)
@@ -121,15 +183,10 @@ def gif_clip(program,fps,qual,model_name,denoise_strength,face_enhance,outscale)
             out_url = f'https://omnibus-Vid-2-GIF-ERSGAN.hf.space/file={out}'
             mes=f'Improving frame {i+1} of {frame_count}'
             yield _,_,mes
-            
             out = esr(out_url, model_name, float(denoise_strength), face_enhance, int(outscale))
             #yield _,_,mes
-            
-            
-            
             #cv2.imwrite(f'{img}',out)
             out_box.append(f'{out}')
-
             print (f'https://omnibus-Vid-2-GIF-ERSGAN.hf.space/file={out}')
             #print (f'out::{out}')
         print (f'out_box::{out_box}')
@@ -190,8 +247,15 @@ with gr.Blocks(css=css) as app:
     with gr.Row():
         gr.Column()
         with gr.Column():
-            with gr.Box():
+            #with gr.Box():
+            with gr.Tab("Image"):
+                with gr.Group():
+                    inp_img_url=gr.Textbox(label="Image URL")
+                    inp_img=gr.Image(label = "Input Image"):
+                    outp_img=gr.Image(label="Enhanced Image")
+            with gr.Tab("Video/GIF"):
                 with gr.Group():
+                    idx_vid=gr.Radio(choices=["Video","GIF"])
                     inp_url = gr.Textbox(label="Video URL")
                     go_btn = gr.Button("Run")
                     outp_vid=gr.Video(format="mp4")
@@ -276,7 +340,7 @@ with gr.Blocks(css=css) as app:
     speed_btn.click(update_speed,[hid_box,clip_speed,hid_fps],[outp_vid,hid_box,outp_file])
     gif_btn.click(gif_clip,[choose_prog,fps,qual,model_name,denoise_strength,face_enhance,outscale],[gif_show,gif_file,gif_stat])
     trim_btn.click(trim_vid,[hid_box,start_f,end_f],[out_trim,trim_count])
-    outp_vid.change(load_video,outp_vid,[frame_count,fps,end_f,hid_box]).then(trim_vid,[hid_box,start_f,end_f],[out_trim,trim_count])
+    outp_vid.change(load_video,outp_vid,[frame_count,fps,end_f,hid_box,idx_vid]).then(trim_vid,[hid_box,start_f,end_f],[out_trim,trim_count])
     go_btn.click(dl,[inp_url,outp_vid],[outp_vid,outp_file,out_trim,hid_box,hid_fps])
     app.load(fn=predict, inputs=[text_input,url_params], outputs=[text_output,text_input],_js=load_js)
 app.launch(show_api=False)