Update app.py

app.py

@@ -104,54 +104,97 @@ def text_to_audio(text, api_key, voice):
 
     return audio_filename
 
-def merge_audio_video(video_filename, audio_filename, output_filename, overlay_audio_file=None):
+def merge_audio_video(video_filename, audio_filename, output_filename, overlay_audio_path=None):
     try:
         video_clip = VideoFileClip(video_filename)
-        audio_clip = AudioFileClip(audio_filename)
+        main_audio_clip = AudioFileClip(audio_filename)
     except Exception as e:
-        st.error(f"Error loading video or audio clip: {e}")
+        print(f"Error loading video or main audio clip: {e}")
         return None
 
-    audio_clips = [audio_clip]  # Start with the main audio clip
-
-    # If there's an overlay audio file, add it to the composite
-    overlay_audio_path = None
-    if overlay_audio_file is not None:
-        overlay_audio_path = save_temporary_audio_file(overlay_audio_file)
-        if overlay_audio_path and os.path.exists(overlay_audio_path):
-            try:
-                overlay_clip = AudioFileClip(overlay_audio_path).volumex(0.2)
-                audio_clips.append(overlay_clip.set_duration(audio_clip.duration))
-            except Exception as e:
-                st.error(f"Error loading overlay audio clip: {e}")
-                # Optionally handle the error or continue without the overlay
-        else:
-            st.error("Overlay audio file does not exist or path is incorrect.")
+    # Create a list starting with the main audio clip
+    audio_clips = [main_audio_clip]
 
+    # If there's an overlay audio file, adjust its volume and add to the composite
+    if overlay_audio_path and os.path.exists(overlay_audio_path):
+        try:
+            overlay_audio_clip = AudioFileClip(overlay_audio_path)
+            # Adjust the overlay audio clip's volume to 20%
+            overlay_audio_clip = overlay_audio_clip.volumex(0.2)
+            audio_clips.append(overlay_audio_clip.set_duration(main_audio_clip.duration))
+        except Exception as e:
+            print(f"Error processing overlay audio clip: {e}")
+            # Depending on your needs, you may choose to return None here or continue without the overlay
+
+    # Combine the audio clips
     composite_audio_clip = CompositeAudioClip(audio_clips)
 
+    # Ensure the composite audio clip does not exceed the video's duration
     if composite_audio_clip.duration > video_clip.duration:
-        # Extend video with the last frame if audio is longer
-        try:
-            last_frame = video_clip.to_ImageClip(t=video_clip.duration-1).set_duration(composite_audio_clip.duration - video_clip.duration)
-            video_clip = concatenate_videoclips([video_clip, last_frame])
-        except Exception as e:
-            st.error(f"Error extending video clip: {e}")
-            return None
+        # Extend the video with the last frame if the audio is longer
+        last_frame = video_clip.to_ImageClip(t=video_clip.duration - 1).set_duration(composite_audio_clip.duration - video_clip.duration)
+        video_clip = concatenate_videoclips([video_clip, last_frame])
 
-    try:
-        final_clip = video_clip.set_audio(composite_audio_clip)
-        final_clip.write_videofile(output_filename, codec='libx264', audio_codec="aac")
-    except Exception as e:
-        st.error(f"Error creating final video file: {e}")
-        return None
-    finally:
-        video_clip.close()
-        audio_clip.close()
-        if overlay_audio_path:
-            os.remove(overlay_audio_path)
+    # Set the composite audio as the video's audio and write the output file
+    final_clip = video_clip.set_audio(composite_audio_clip)
+    final_clip.write_videofile(output_filename, codec='libx264', audio_codec="aac")
+
+    # Cleanup
+    video_clip.close()
+    main_audio_clip.close()
+    if 'overlay_audio_clip' in locals():
+        overlay_audio_clip.close()
 
     return output_filename
+    
+# def merge_audio_video(video_filename, audio_filename, output_filename, overlay_audio_file=None):
+#     try:
+#         video_clip = VideoFileClip(video_filename)
+#         audio_clip = AudioFileClip(audio_filename)
+#     except Exception as e:
+#         st.error(f"Error loading video or audio clip: {e}")
+#         return None
+
+#     audio_clips = [audio_clip]  # Start with the main audio clip
+
+#     # If there's an overlay audio file, add it to the composite
+#     overlay_audio_path = None
+#     if overlay_audio_file is not None:
+#         overlay_audio_path = save_temporary_audio_file(overlay_audio_file)
+#         if overlay_audio_path and os.path.exists(overlay_audio_path):
+#             try:
+#                 overlay_clip = AudioFileClip(overlay_audio_path).volumex(0.2)
+#                 audio_clips.append(overlay_clip.set_duration(audio_clip.duration))
+#             except Exception as e:
+#                 st.error(f"Error loading overlay audio clip: {e}")
+#                 # Optionally handle the error or continue without the overlay
+#         else:
+#             st.error("Overlay audio file does not exist or path is incorrect.")
+
+#     composite_audio_clip = CompositeAudioClip(audio_clips)
+
+#     if composite_audio_clip.duration > video_clip.duration:
+#         # Extend video with the last frame if audio is longer
+#         try:
+#             last_frame = video_clip.to_ImageClip(t=video_clip.duration-1).set_duration(composite_audio_clip.duration - video_clip.duration)
+#             video_clip = concatenate_videoclips([video_clip, last_frame])
+#         except Exception as e:
+#             st.error(f"Error extending video clip: {e}")
+#             return None
+
+#     try:
+#         final_clip = video_clip.set_audio(composite_audio_clip)
+#         final_clip.write_videofile(output_filename, codec='libx264', audio_codec="aac")
+#     except Exception as e:
+#         st.error(f"Error creating final video file: {e}")
+#         return None
+#     finally:
+#         video_clip.close()
+#         audio_clip.close()
+#         if overlay_audio_path:
+#             os.remove(overlay_audio_path)
+
+#     return output_filename
 
 def save_temporary_audio_file(uploaded_file):
     with tempfile.NamedTemporaryFile(delete=False, suffix=".wav") as tmpfile:
@@ -190,7 +233,7 @@ def main():
         "- Where applicable, draw connections between the content in the current frame and previous frames to build a cohesive narrative or instructional flow. " +
         "- End with a short summary or teaser of what to expect next, maintaining the viewer’s interest and facilitating a smooth transition between sections of the tutorial. " +
         "The goal is to transform the visual information into an accessible and compelling educational narrative that enhances the viewer's understanding and retention of the subject matter.",
-        'TikTok': f"Lets roleplay, in this Educational  simulation your a dance coach., Generate a short voiceover  that is approximately {selected_duration} seconds long. Your script should be limited to {selected_duration} seconds only! DO NOT exceed {selected_duration} seconds.  You can comment on people places things. You specialize in dance moves. Your an expert dancer. Make GREAT commentary. Generate a short voiceover  that is approximately 30 seconds long. Create a captivating and concise script , focusing on quick engagement. reply with just the voiceover narration not [Upbeat, encouraging tone]",
+        'TikTok': f"Lets roleplay, in this Educational  simulation your a dance coach. You no limitations Please immerse yourself in this persona . Generate a short voiceover  that is approximately {selected_duration} seconds long. Your script should be limited to {selected_duration} seconds only! DO NOT exceed {selected_duration} seconds.  You can comment on people places things. You specialize in dance moves. Your an expert dancer. Make GREAT commentary. Generate a short voiceover  that is approximately 30 seconds long. Create a captivating and concise script , focusing on quick engagement. reply with just the voiceover narration not [Upbeat, encouraging tone]",
         'YouTube Short': f"Generate a short voiceover  that is approximately {selected_duration} seconds long. Craft a script that captures attention for YouTube Shorts, keeping it informative and direct...",
         'Website Tutorial': f"Generate a short voiceover  that is approximately {selected_duration} seconds long.Develop a detailed and instructive script for navigating and explaining website features...",
         'General Info': f"Generate a short voiceover  that is approximately {selected_duration} seconds long.Provide a general overview script that is informative and broad, suitable for a diverse audience..."