Enforce a frame limit of 1 in still picture mode

xiph · Sep 8, 2020 · 414e6d8 · 414e6d8
1 parent 3d935e2
commit 414e6d8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/api/internal.rs b/src/api/internal.rs
@@ -267,7 +267,7 @@ impl<T: Pixel> ContextInner<T> {
     let seq = Sequence::new(enc);
     ContextInner {
       frame_count: 0,
-      limit: None,
+      limit: if enc.still_picture { Some(1) } else { None },
       inter_cfg: InterConfig::new(enc),
       output_frameno: 0,
       frames_processed: 0,

diff --git a/src/bin/common.rs b/src/bin/common.rs
@@ -472,10 +472,15 @@ pub fn parse_cli() -> Result<CliOptions, CliError> {
     MetricsEnabled::None
   };
 
+  let limit = matches.value_of("LIMIT").unwrap().parse().unwrap();
+  if enc.still_picture && limit > 1 {
+    panic!("A limit cannot be set above 1 in still picture mode");
+  }
+
   Ok(CliOptions {
     io,
     enc,
-    limit: matches.value_of("LIMIT").unwrap().parse().unwrap(),
+    limit,
     // Use `occurrences_of()` because `is_present()` is always true
     // if a parameter has a default value.
     color_range_specified: matches.occurrences_of("PIXEL_RANGE") > 0,