Update video2.py

video2.py

@@ -228,20 +228,18 @@ def audio_func(id, lines, lang):
     return asyncio.run(generate_tts(id, lines, lang))
 #-----------------------------
 #---------------------------------
-def video_func(id, lines, lang):
-    if "&&&" in lang:
-        listf = lang.split("&&&")
-        TEXT = listf[0].strip()
-    else:
-        TEXT = lines[id]
-    duration, audio_path = audio_func(id, lines, lang)
+def video_func(id, lines,lang):
+    duration, audio_path = audio_func(id,lines,lang)
     if not duration or not audio_path:
         print("Failed to generate audio.")
         return None
+    #listf = lines.split("&&&")
+    #TEXT = listf[0].strip()
+    TEXT=lines[id]
     print("-----------------------------------------------------------------------------")
     print(TEXT)
     SKIP_SPACES = False
-  
+   
     FPS = 30 # Increased for smoother animation
     ANIMATION_FRAMES_PER_CHAR = 3 # Number of sub-frames for pen movement per character
     WIDTH, HEIGHT = 1280, 720 # Keep as is
@@ -264,7 +262,7 @@ def video_func(id, lines, lang):
     PEN_BASE_ANGLE = 45 # Base angle of pen (degrees)
     PEN_MOVEMENT_AMPLITUDE = 10 # How much the pen moves up/down (pixels)
     # ===================================
-  
+   
     # Helper: wrap text by pixel width using cv2.getTextSize
     def wrap_text_cv(text, font, font_scale, thickness, max_width):
         wrapped_lines = []
@@ -312,8 +310,8 @@ def video_func(id, lines, lang):
     if SKIP_SPACES:
         visible_indices = [i for i, ch in enumerate(full_text) if (ch != ' ' and ch != '\n' and ch != '\t')]
     else:
-        visible_indices = [i for i, ch in enumerate(full_text) if ch != '\n']
-  
+        visible_indices = list(range(len(full_text)))
+   
     total_glyphs = len(visible_indices)
     print(f"Wrapped lines: {len(wrapped_lines)} lines, total glyphs (counted): {total_glyphs}")
     if total_glyphs == 0:
@@ -329,7 +327,7 @@ def video_func(id, lines, lang):
             (w, h), baseline = cv2.getTextSize("Ay", FONT, FONT_SCALE, THICKNESS)
         else:
             (w, h), baseline = cv2.getTextSize(line, FONT, FONT_SCALE, THICKNESS)
-        line_heights.append(h + LINE_SPACING)
+        line_heights.append(h + baseline + LINE_SPACING)
     y_positions = []
     y = MARGIN_Y
     for lh in line_heights:
@@ -344,7 +342,7 @@ def video_func(id, lines, lang):
         f'{silent_video_path}'
     )
     print("FFMPEG CMD:", ffmpeg_cmd)
-  
+   
     proc = subprocess.Popen(shlex.split(ffmpeg_cmd), stdin=subprocess.PIPE, bufsize=10**8)
     # Render function, modified: if pen_x <= 0, no pen
     def render_frame(visible_text, pen_x, pen_y, anim_offset):
@@ -354,9 +352,9 @@ def video_func(id, lines, lang):
             x = MARGIN_X
             y = y_positions[idx]
             (w, h), baseline = cv2.getTextSize(line, FONT, FONT_SCALE, THICKNESS)
-            y_draw = y + h - baseline
+            y_draw = y + h
             if line != "":
-                cv2.putText(img, line, (x, int(y_draw)), FONT, FONT_SCALE, TEXT_COLOR, THICKNESS, lineType=cv2.LINE_AA)
+                cv2.putText(img, line, (x, y_draw), FONT, FONT_SCALE, TEXT_COLOR, THICKNESS, lineType=cv2.LINE_AA)
         if pen_x > 0: # Only draw pen if pen_x > 0
             offset_y = int(PEN_MOVEMENT_AMPLITUDE * math.sin(anim_offset * math.pi))
             pen_tip_y = pen_y + offset_y
@@ -366,7 +364,7 @@ def video_func(id, lines, lang):
             cv2.line(img, (pen_x, pen_tip_y), (pen_end_x, pen_end_y), PEN_COLOR, PEN_THICKNESS)
             cv2.circle(img, (pen_x, pen_tip_y), PEN_TIP_RADIUS, PEN_COLOR, -1)
         return img
-  
+   
     t0 = time.time()
     frames_sent = 0
     prev_visible_sub = ""
@@ -416,4 +414,6 @@ def video_func(id, lines, lang):
     # display(Video(final_video_path, embed=True, width=WIDTH, height=HEIGHT))
     # Clean up silent video if not needed
     os.remove(silent_video_path)
-    return final_video_path
+    return final_video_path
+
+    #video