Fix streaming pose preview playback order

index.js

@@ -676,7 +676,7 @@ export default class StableSignerPlugin extends ControlWavePlugin {
                         <div class="stable-advanced-grid">
                             <div class="form-group">
                                 <label>FPS</label>
-                                <input id="stable-fps" type="number" min="5" max="60" value="30">
+                                <input id="stable-fps" type="number" min="5" max="60" value="25">
                             </div>
                             <div class="form-group">
                                 <label>Width</label>
@@ -836,6 +836,10 @@ export default class StableSignerPlugin extends ControlWavePlugin {
         this.selectionGenerationInFlight = false;
         this.selectionStreamPollingTimer = null;
         this.selectionStreamCursor = 0;
+        this.selectionStreamFrameQueue = [];
+        this.selectionStreamPlaybackTimer = null;
+        this.selectionStreamPlaybackFps = 25;
+        this.selectionPendingFinalVideoUrl = null;
         this.lastGeneratedSelection = '';
         this.generateBtn = container.querySelector('#stable-generate');
         this.statusChip = container.querySelector('#stable-status');
@@ -910,7 +914,7 @@ export default class StableSignerPlugin extends ControlWavePlugin {
             text: promptText,
             gloss: glossValue,
             existingVideo: this.existingInput.value,
-            fps: toInt(this.fpsInput.value, 30),
+            fps: toInt(this.fpsInput.value, 25),
             width: toInt(this.widthInput.value, 512),
             height: toInt(this.heightInput.value, 512),
             smoothing: this.smoothingSelect.value,
@@ -1104,6 +1108,8 @@ export default class StableSignerPlugin extends ControlWavePlugin {
             clearTimeout(this.selectionGenerationTimer);
             this.selectionGenerationTimer = null;
         }
+        this.stopSelectionStreamPlayback();
+        this.selectionPendingFinalVideoUrl = null;
         if (this.selectionPopover) {
             this.selectionPopover.style.display = 'none';
         }
@@ -1117,6 +1123,10 @@ export default class StableSignerPlugin extends ControlWavePlugin {
         this.lastGeneratedSelection = text;
         this.promptTextInput.value = text;
         this.glossInput.value = '';
+        this.stopSelectionStreamPlayback();
+        this.selectionStreamFrameQueue = [];
+        this.selectionStreamCursor = 0;
+        this.selectionPendingFinalVideoUrl = null;
         this.logsPre.textContent = 'Selected text:\n' + text + '\n\nStreaming pose preview...';
         if (this.selectionStatus) {
             this.selectionStatus.textContent = 'Preparing pose preview...';
@@ -1157,12 +1167,68 @@ export default class StableSignerPlugin extends ControlWavePlugin {
             this.glossInput.value = response.gloss;
         }
         this.selectionStreamCursor = 0;
+        this.selectionStreamFrameQueue = [];
+        this.selectionPendingFinalVideoUrl = null;
+        this.selectionStreamPlaybackFps = toInt(response.fps, toInt(this.fpsInput.value, 25));
+        this.startSelectionStreamPlayback();
         if (this.selectionStreamPollingTimer) {
             clearTimeout(this.selectionStreamPollingTimer);
         }
         this.pollPoseStream(response.job_id);
     }
 
+    startSelectionStreamPlayback() {
+        this.stopSelectionStreamPlayback();
+        const fps = Math.max(5, Math.min(60, this.selectionStreamPlaybackFps || 30));
+        const intervalMs = Math.max(16, Math.round(1000 / fps));
+        this.selectionStreamPlaybackTimer = setInterval(() => {
+            if (this.selectionStreamFrameQueue && this.selectionStreamFrameQueue.length > 0) {
+                const next = this.selectionStreamFrameQueue.shift();
+                if (next && next.image) {
+                    this.drawStreamFrameToCanvas(next.image);
+                }
+                return;
+            }
+            if (this.selectionPendingFinalVideoUrl) {
+                const finalUrl = this.selectionPendingFinalVideoUrl;
+                this.selectionPendingFinalVideoUrl = null;
+                this.showSelectionFinalVideo(finalUrl);
+            }
+        }, intervalMs);
+    }
+
+    stopSelectionStreamPlayback() {
+        if (this.selectionStreamPlaybackTimer) {
+            clearInterval(this.selectionStreamPlaybackTimer);
+            this.selectionStreamPlaybackTimer = null;
+        }
+    }
+
+    async showSelectionFinalVideo(url) {
+        if (!url || !this.selectionVideoEl) return;
+        const absoluteUrl = url.startsWith('http') ? url : `${window.location.origin}${url}`;
+        const hasQuery = absoluteUrl.includes('?');
+        const fetchUrl = `${absoluteUrl}${hasQuery ? '&' : '?'}t=${Date.now()}`;
+        this.stopSelectionStreamPlayback();
+        this.selectionStreamFrameQueue = [];
+        this.selectionPendingFinalVideoUrl = null;
+        this.selectionVideoEl.pause();
+        this.selectionVideoEl.src = fetchUrl;
+        this.selectionVideoEl.style.display = 'block';
+        this.selectionVideoEl.load();
+        try {
+            await this.selectionVideoEl.play();
+        } catch (error) {
+            // Keep controls available even if autoplay is blocked.
+        }
+        if (this.selectionCanvas) {
+            this.selectionCanvas.style.display = 'none';
+        }
+        if (this.selectionPlaceholder) {
+            this.selectionPlaceholder.style.display = 'none';
+        }
+    }
+
     drawStreamFrameToCanvas(dataUrl) {
         const image = new Image();
         image.onload = () => {
@@ -1175,6 +1241,9 @@ export default class StableSignerPlugin extends ControlWavePlugin {
             }
             this.selectionCanvasCtx.drawImage(image, 0, 0, this.selectionCanvas.width, this.selectionCanvas.height);
             this.selectionCanvas.style.display = 'block';
+            if (this.selectionVideoEl) {
+                this.selectionVideoEl.style.display = 'none';
+            }
             this.selectionHasFrame = true;
             if (this.selectionPlaceholder) {
                 this.selectionPlaceholder.style.display = 'none';
@@ -1197,10 +1266,7 @@ export default class StableSignerPlugin extends ControlWavePlugin {
             }
             const frames = response.frames || [];
             if (frames.length > 0) {
-                const latest = frames[frames.length - 1];
-                if (this.selectionCanvas && this.selectionCanvasCtx && latest.image) {
-                    this.drawStreamFrameToCanvas(latest.image);
-                }
+                this.selectionStreamFrameQueue.push(...frames.filter(frame => frame && frame.image));
                 if (this.selectionPlaceholder) {
                     this.selectionPlaceholder.style.display = 'none';
                 }
@@ -1211,7 +1277,7 @@ export default class StableSignerPlugin extends ControlWavePlugin {
                 this.selectionStatus.textContent = `Gloss: ${(response.gloss || this.glossInput.value || '').trim()} · ${response.frame_count || this.selectionStreamCursor}${total} frames`;
             }
             if (response.status === 'running') {
-                this.selectionStreamPollingTimer = setTimeout(() => this.pollPoseStream(jobId), 180);
+                this.selectionStreamPollingTimer = setTimeout(() => this.pollPoseStream(jobId), 120);
                 return;
             }
             this.selectionGenerationInFlight = false;
@@ -1221,6 +1287,11 @@ export default class StableSignerPlugin extends ControlWavePlugin {
             if (response.video_url) {
                 await this.updateVideo(response.video_url, response.video_path);
                 await this.refreshRecentVideos();
+                if (this.selectionStreamFrameQueue.length > 0) {
+                    this.selectionPendingFinalVideoUrl = response.video_url;
+                } else {
+                    await this.showSelectionFinalVideo(response.video_url);
+                }
             }
             if (this.selectionStatus && response.status === 'success') {
                 this.selectionStatus.textContent = `Gloss: ${(response.gloss || this.glossInput.value || '').trim()} · completed`;

pipeline02_gloss2pose.py

@@ -1361,7 +1361,7 @@ class SignLanguageQA:
         
         return None
 
-    def generate_video_from_glosses(self, gloss_list, output_path, fps=30, width=480, height=480,
+    def generate_video_from_glosses(self, gloss_list, output_path, fps=25, width=480, height=480,
                                     smoothing_frames=5, smoothing_method='none', npz_interpolation_frames=0,
                                     scale_x=1.0, scale_y=1.0, hide_torso_lines=False, ref_image_path=None,
                                     draw_style='controlnext', normalize_pose=True, draw_conf_threshold=0.6,
@@ -1391,6 +1391,7 @@ class SignLanguageQA:
         video_info = []
         first_signer_template = None
         streamed_frame_count = 0
+        incremental_stream = frame_callback is not None and smoothing_method == 'none'
 
         def emit_stream_frame(frame, total_frames=None):
             nonlocal streamed_frame_count
@@ -1402,7 +1403,43 @@ class SignLanguageQA:
             except Exception as cb_err:
                 print(f"⚠️  Frame callback failed at {streamed_frame_count}: {cb_err}")
 
-        
+        def build_interpolated_visual_frames(prev_info, curr_info):
+            if npz_interpolation_frames <= 0:
+                return []
+            npz1 = prev_info['npz_data']
+            npz2 = curr_info['npz_data']
+            end_frame1 = prev_info.get('end_frame', self.get_total_frames(npz1))
+            start_frame2 = curr_info.get('start_frame', 1)
+            interpolated_npz_frames = interpolate_pose_npz(
+                npz1, npz2,
+                num_frames=npz_interpolation_frames,
+                method=npz_interpolation_method,
+                frame1_num=end_frame1,
+                frame2_num=start_frame2
+            )
+            interpolated_frames = []
+            for interp_data in interpolated_npz_frames:
+                frame_keys = [k for k in interp_data.keys() if k.endswith('_bodies')]
+                if not frame_keys:
+                    continue
+                frame_key = frame_keys[0]
+                frame_num = int(frame_key.split('_')[1])
+                frame_data = {}
+                for suffix in ['bodies', 'body_scores', 'hands', 'hands_scores', 'faces', 'faces_scores']:
+                    key = f"frame_{frame_num:08d}_{suffix}"
+                    if key in interp_data:
+                        frame_data[suffix] = interp_data[key]
+                if not frame_data:
+                    continue
+                pose_frame = self.create_pose_frame(
+                    frame_data, width, height, scale_x, scale_y,
+                    hide_torso_lines, y_offset, draw_style,
+                    conf_threshold=draw_conf_threshold
+                )
+                if pose_frame is not None:
+                    interpolated_frames.append(pose_frame)
+            return interpolated_frames
+
         for gloss in gloss_list:
             matched_videos = self.find_gloss_videos(gloss)
             total_matches = len(matched_videos)
@@ -1507,7 +1544,6 @@ class SignLanguageQA:
                     )
                     if pose_frame is not None:
                         gloss_frames.append(pose_frame)
-                        emit_stream_frame(pose_frame)
 
             if gloss_frames:
                 all_pose_frames.append(gloss_frames)
@@ -1520,6 +1556,15 @@ class SignLanguageQA:
                     'end_frame': end_frame
                 })
                 print(f"   ✅ Generated {len(gloss_frames)} pose frames")
+
+                if incremental_stream:
+                    if len(video_info) > 1 and npz_interpolation_frames > 0:
+                        prev_info = video_info[-2]
+                        interp_frames = build_interpolated_visual_frames(prev_info, video_info[-1])
+                        for pose_frame in interp_frames:
+                            emit_stream_frame(pose_frame)
+                    for pose_frame in gloss_frames:
+                        emit_stream_frame(pose_frame)
         
         if not all_pose_frames:
             print("❌ No frames generated")
@@ -1529,58 +1574,15 @@ class SignLanguageQA:
         if npz_interpolation_frames > 0 and len(all_pose_frames) > 1:
             print(f"🔄 Applying NPZ interpolation with {npz_interpolation_frames} frames ({npz_interpolation_method})...")
             interpolated_pose_frames = []
-            
+
             for i in range(len(all_pose_frames)):
-                # Add original frames
                 interpolated_pose_frames.extend(all_pose_frames[i])
-                
-                # Add interpolated frames between glosses
+
                 if i < len(all_pose_frames) - 1:
-                    # Get NPZ data for interpolation
-                    npz1 = video_info[i]['npz_data']
-                    npz2 = video_info[i + 1]['npz_data']
-                    
-                    # Get valid frame ranges for interpolation
-                    end_frame1 = video_info[i].get('end_frame', self.get_total_frames(npz1))
-                    start_frame2 = video_info[i + 1].get('start_frame', 1)
-                    
-                    # Interpolate between the two NPZ files
-                    interpolated_npz_frames = interpolate_pose_npz(
-                        npz1, npz2, 
-                        num_frames=npz_interpolation_frames,
-                        method=npz_interpolation_method,
-                        frame1_num=end_frame1,
-                        frame2_num=start_frame2
-                    )
-                    
-                    # Convert interpolated NPZ frames to visual frames
-                    for interp_data in interpolated_npz_frames:
-                        # Extract frame data from interpolated NPZ
-                        frame_keys = [k for k in interp_data.keys() if k.endswith('_bodies')]
-                        if frame_keys:
-                            frame_key = frame_keys[0]
-                            frame_num = int(frame_key.split('_')[1])
-                            
-                            # Build frame data dict
-                            frame_data = {}
-                            for suffix in ['bodies', 'body_scores', 'hands', 'hands_scores', 'faces', 'faces_scores']:
-                                key = f"frame_{frame_num:08d}_{suffix}"
-                                if key in interp_data:
-                                    frame_data[suffix] = interp_data[key]
-                            
-                            # Create visual frame
-                            if frame_data:
-                                pose_frame = self.create_pose_frame(
-                                    frame_data, width, height, scale_x, scale_y,
-                                    hide_torso_lines, y_offset, draw_style,
-                                    conf_threshold=draw_conf_threshold
-                                )
-                                if pose_frame is not None:
-                                    interpolated_pose_frames.append(pose_frame)
-                                    emit_stream_frame(pose_frame)
-                    
-                    print(f"   ✅ Added {npz_interpolation_frames} interpolated frames between '{video_info[i]['gloss']}' and '{video_info[i+1]['gloss']}'")
-            
+                    interp_frames = build_interpolated_visual_frames(video_info[i], video_info[i + 1])
+                    interpolated_pose_frames.extend(interp_frames)
+                    print(f"   ✅ Added {len(interp_frames)} interpolated frames between '{video_info[i]['gloss']}' and '{video_info[i+1]['gloss']}'")
+
             all_pose_frames = [interpolated_pose_frames]  # Treat as single sequence
         
         # Apply smoothing if needed
@@ -1592,8 +1594,8 @@ class SignLanguageQA:
             for group in all_pose_frames:
                 final_frames.extend(group)
         
-        # Push preview frames before final video encoding, so the browser can play immediately.
-        if frame_callback is not None and streamed_frame_count == 0:
+        # For smoothed outputs, stream after final assembly because playback order changes.
+        if frame_callback is not None and not incremental_stream:
             print("📡 Streaming preview frames...")
             total_preview_frames = len(final_frames)
             for stream_idx, stream_frame in enumerate(final_frames):
@@ -1938,8 +1940,8 @@ def main():
     parser = argparse.ArgumentParser(description='Sign Language Gloss Q&A System - Individual NPZ')
     parser.add_argument('--gloss', '-g',
                         help='Directly input gloss to generate video, separated by spaces')
-    parser.add_argument('--fps', type=int, default=30,
-                        help='Video frame rate (default: 30)')
+    parser.add_argument('--fps', type=int, default=25,
+                        help='Video frame rate (default: 25)')
     parser.add_argument('--width', type=int, default=480,
                         help='Video width (default: 480)')
     parser.add_argument('--height', type=int, default=480,

viser_backend.py

@@ -519,7 +519,7 @@ class StableSignerBackend(PluginBackendBase):
                 return {"status": "error", "message": "Gloss string is empty after normalization."}
 
             settings = {
-                "fps": _safe_int(data.get("fps"), 30),
+                "fps": _safe_int(data.get("fps"), 25),
                 "width": _safe_int(data.get("width"), 512),
                 "height": _safe_int(data.get("height"), 512),
                 "smoothing_method": data.get("smoothing", "none") or "none",
@@ -613,7 +613,7 @@ class StableSignerBackend(PluginBackendBase):
             if not gloss_tokens:
                 return {"status": "error", "message": "Gloss string is empty after normalization."}
 
-            fps = _safe_int(data.get("fps"), 30)
+            fps = _safe_int(data.get("fps"), 25)
             width = _safe_int(data.get("width"), 512)
             height = _safe_int(data.get("height"), 512)
             smoothing_method = data.get("smoothing", "none") or "none"