openfree commited on
Commit
bfbed21
Β·
verified Β·
1 Parent(s): 91627d2

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +26 -8
app.py CHANGED
@@ -36,6 +36,7 @@ from transformers import pipeline
36
  from transformers import AutoModelForImageSegmentation
37
  from torchvision import transforms
38
 
 
39
  # ── moviepy import ──────────────────────────────────────────
40
  try:
41
  # editor μ„œλΈŒλͺ¨λ“ˆμ΄ 있으면 μš°μ„  μ‚¬μš©
@@ -43,12 +44,20 @@ try:
43
  except ImportError:
44
  from moviepy import VideoFileClip, concatenate_videoclips
45
 
46
- # resize ν•¨μˆ˜: 있으면 μ‚¬μš©, μ—†μœΌλ©΄ ν†΅κ³Όμš© λžŒλ‹€λ‘œ λŒ€μ²΄
47
  try:
48
- from moviepy.video.fx.resize import resize as vfx_resize
49
  except ImportError:
50
- def vfx_resize(clip, newsize):
51
- return clip # resize 미지원 ν™˜κ²½ β†’ κ·ΈλŒ€λ‘œ λ°˜ν™˜
 
 
 
 
 
 
 
 
52
 
53
  from moviepy import (
54
  ImageSequenceClip,
@@ -58,8 +67,7 @@ from moviepy import (
58
  )
59
  from moviepy.video.compositing.CompositeVideoClip import CompositeVideoClip
60
  from moviepy.video.VideoClip import ColorClip
61
- # ────────────────────────────────────────────────────────────
62
-
63
  import time
64
  from concurrent.futures import ThreadPoolExecutor
65
 
@@ -709,8 +717,18 @@ def merge_videos_with_audio(video_files, audio_file, audio_volume, output_fps):
709
  adjusted_clips = []
710
  for clip, size in zip(video_clips, clip_sizes):
711
  if size != (target_width, target_height):
712
-
713
- adjusted_clip = resize(clip, newsize=(target_width, target_height))
 
 
 
 
 
 
 
 
 
 
714
  adjusted_clips.append(adjusted_clip)
715
  else:
716
  adjusted_clips.append(clip)
 
36
  from transformers import AutoModelForImageSegmentation
37
  from torchvision import transforms
38
 
39
+
40
  # ── moviepy import ──────────────────────────────────────────
41
  try:
42
  # editor μ„œλΈŒλͺ¨λ“ˆμ΄ 있으면 μš°μ„  μ‚¬μš©
 
44
  except ImportError:
45
  from moviepy import VideoFileClip, concatenate_videoclips
46
 
47
+ # resize ν•¨μˆ˜: λ‹€μ–‘ν•œ λ°©λ²•μœΌλ‘œ μ‹œλ„
48
  try:
49
+ from moviepy.video.fx.resize import resize
50
  except ImportError:
51
+ try:
52
+ from moviepy.video.fx.all import resize
53
+ except ImportError:
54
+ try:
55
+ from moviepy.video.fx import resize
56
+ except ImportError:
57
+ # resizeκ°€ μ—†μœΌλ©΄ λŒ€μ²΄ ν•¨μˆ˜ 생성
58
+ def resize(clip, newsize):
59
+ """Fallback resize function when moviepy resize is not available"""
60
+ return clip
61
 
62
  from moviepy import (
63
  ImageSequenceClip,
 
67
  )
68
  from moviepy.video.compositing.CompositeVideoClip import CompositeVideoClip
69
  from moviepy.video.VideoClip import ColorClip
70
+ # ── moviepy import ──────────────────────────────────────────
 
71
  import time
72
  from concurrent.futures import ThreadPoolExecutor
73
 
 
717
  adjusted_clips = []
718
  for clip, size in zip(video_clips, clip_sizes):
719
  if size != (target_width, target_height):
720
+ # resize ν•¨μˆ˜κ°€ 있으면 μ‚¬μš©, μ—†μœΌλ©΄ λŒ€μ²΄ 방법 μ‚¬μš©
721
+ if resize is not None:
722
+ adjusted_clip = resize(clip, newsize=(target_width, target_height))
723
+ else:
724
+ # resizeκ°€ 없을 λ•Œ λŒ€μ²΄ 방법
725
+ # clip.resize() λ©”μ„œλ“œ μ‚¬μš© μ‹œλ„
726
+ if hasattr(clip, 'resize'):
727
+ adjusted_clip = clip.resize((target_width, target_height))
728
+ else:
729
+ # μ΅œν›„μ˜ μˆ˜λ‹¨: κ·ΈλŒ€λ‘œ μ‚¬μš©
730
+ adjusted_clip = clip
731
+ logging.warning(f"Cannot resize video. Using original size.")
732
  adjusted_clips.append(adjusted_clip)
733
  else:
734
  adjusted_clips.append(clip)