@matjash/pixi-native-win32-x64 0.2.5 → 0.2.7

package/native/audio/src/audio_impl.rs

@@ -1210,8 +1210,14 @@ fn ffmpeg_command(
         command.args(["-ss", &options.offset_seconds.to_string()]);
     }
     command.args(&options.input_args);
+    if streaming && options.loop_ {
+        command.args(["-stream_loop", "-1"]);
+    }
     command.args(["-i", &options.source, "-vn"]);
-    if let Some(duration) = options.duration_seconds {
+    if let Some(duration) = options
+        .duration_seconds
+        .filter(|_| !(streaming && options.loop_))
+    {
         command.args(["-t", &duration.to_string()]);
     }
     if streaming && (options.playback_rate - 1.0).abs() > f64::EPSILON {
@@ -1342,6 +1348,24 @@ fn redact_credentials(message: &str) -> String {
 mod tests {
     use super::*;
 
+    fn voice_options(looped: bool) -> NativeVoiceOptions {
+        NativeVoiceOptions {
+            owner_id: 1,
+            id: 1,
+            source: "video.mp4".to_string(),
+            ffmpeg_path: "ffmpeg".to_string(),
+            offset_seconds: 0.0,
+            duration_seconds: Some(2.0),
+            volume: 1.0,
+            muted: false,
+            loop_: looped,
+            streaming: true,
+            playback_rate: 1.0,
+            input_args: Vec::new(),
+            output_args: Vec::new(),
+        }
+    }
+
     #[test]
     fn static_voices_share_pcm_with_independent_cursors() {
         let samples = Arc::new(vec![0.1, 0.2, 0.3, 0.4, 0.5, 0.6]);
@@ -1371,6 +1395,20 @@ mod tests {
         assert_eq!(build_atempo_filter(0.25).unwrap(), "atempo=0.5,atempo=0.5");
     }
 
+    #[test]
+    fn streaming_loop_repeats_input_without_a_duration_limit() {
+        let command = ffmpeg_command(&voice_options(true), 48_000, true).unwrap();
+        let args = command
+            .get_args()
+            .map(|arg| arg.to_string_lossy().into_owned())
+            .collect::<Vec<_>>();
+        let loop_index = args.iter().position(|arg| arg == "-stream_loop").unwrap();
+        let input_index = args.iter().position(|arg| arg == "-i").unwrap();
+        assert_eq!(args[loop_index + 1], "-1");
+        assert!(loop_index < input_index);
+        assert!(!args.iter().any(|arg| arg == "-t"));
+    }
+
     #[test]
     fn credentials_are_redacted() {
         assert_eq!(

package/native/video/src/index.d.ts

@@ -10,6 +10,7 @@ export interface DecoderOptions {
   sourcePaced?: boolean;
   inputArgs?: string[];
   outputArgs?: string[];
+  loop?: boolean;
 }
 
 export interface VideoFrame {

package/native/video/src/lib.rs

@@ -33,6 +33,7 @@ pub struct DecoderOptions {
     pub source_paced: Option<bool>,
     pub input_args: Option<Vec<String>>,
     pub output_args: Option<Vec<String>>,
+    pub loop_: Option<bool>,
 }
 
 #[napi(object)]
@@ -206,6 +207,7 @@ struct FfmpegRequest {
     end_time: Option<f64>,
     input_args: Vec<String>,
     output_args: Vec<String>,
+    looped: bool,
 }
 
 #[napi]
@@ -313,6 +315,7 @@ impl NativeVideoDecoder {
             end_time: self.options.end_time,
             input_args: self.options.input_args.clone().unwrap_or_default(),
             output_args: self.options.output_args.clone().unwrap_or_default(),
+            looped: self.options.loop_.unwrap_or(false),
         };
         let (spawned, active_backend) = match spawn_ffmpeg(&request, requested_backend) {
             Ok(spawned) => (spawned, requested_backend),
@@ -696,8 +699,11 @@ fn ffmpeg_args(request: &FfmpegRequest, backend: DecoderBackend) -> Vec<String>
         args.extend(["-ss".to_string(), request.start_time.to_string()]);
     }
     args.extend(request.input_args.iter().cloned());
+    if request.looped {
+        args.extend(["-stream_loop".to_string(), "-1".to_string()]);
+    }
     args.extend(["-i".to_string(), request.source.clone(), "-an".to_string()]);
-    if let Some(end_time) = request.end_time {
+    if let Some(end_time) = request.end_time.filter(|_| !request.looped) {
         args.extend([
             "-t".to_string(),
             (end_time - request.start_time).to_string(),
@@ -1119,6 +1125,19 @@ mod tests {
         assert!(threads_index > input_index && threads_index < pipe_index);
     }
 
+    #[test]
+    fn loops_full_file_input_without_a_duration_limit() {
+        let mut request = request(30.0, 0.0);
+        request.looped = true;
+        request.end_time = Some(2.0);
+        let args = ffmpeg_args(&request, DecoderBackend::Cpu);
+        let loop_index = args.iter().position(|arg| arg == "-stream_loop").unwrap();
+        let input_index = args.iter().position(|arg| arg == "-i").unwrap();
+        assert_eq!(args[loop_index + 1], "-1");
+        assert!(loop_index < input_index);
+        assert!(!args.iter().any(|arg| arg == "-t"));
+    }
+
     #[test]
     fn builds_serial_software_fallback_filter() {
         let args = ffmpeg_args(&request(30.0, 0.0), DecoderBackend::Cpu);
@@ -1154,6 +1173,7 @@ mod tests {
             source_paced: None,
             input_args: None,
             output_args: None,
+            loop_: None,
         });
         assert!(result.is_err());
     }
@@ -1238,6 +1258,7 @@ mod tests {
             source_paced: None,
             input_args: None,
             output_args: None,
+            loop_: None,
         })
         .unwrap();
         let mut target = vec![0; 6];
@@ -1270,6 +1291,7 @@ mod tests {
             source_paced: None,
             input_args: None,
             output_args: None,
+            loop_: None,
         })
         .unwrap();
         let mut target = vec![0; 5];
@@ -1355,6 +1377,7 @@ mod tests {
             source_paced: None,
             input_args: None,
             output_args: None,
+            loop_: None,
         })
         .unwrap()
     }
@@ -1390,6 +1413,7 @@ mod tests {
             end_time: None,
             input_args: Vec::new(),
             output_args: Vec::new(),
+            looped: false,
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matjash/pixi-native-win32-x64",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "type": "commonjs",
   "description": "Windows x64 native binaries for @matjash/pixi-native",
   "license": "MIT",