y4m: if no colourspace is specified it should be YUV 4:2:0

[nihav.git] / nihav-core / src / options.rs

diff --git a/nihav-core/src/options.rs b/nihav-core/src/options.rs
index 96e093e4f95976a564d979d42b3fe6d06c5ea3e4..d065892dddd4d81f233935ba25e36d38875df6c4 100644 (file)
--- a/nihav-core/src/options.rs
+++ b/nihav-core/src/options.rs
@@ -8,6 +8,8 @@
 use std::sync::Arc;
 use std::fmt;
 
+pub use crate::compr::deflate::{DEFLATE_MODE_DESCRIPTION, DEFLATE_OPTION_VALUES, DEFLATE_MODE_NONE, DEFLATE_MODE_FAST, DEFLATE_MODE_BETTER, DEFLATE_MODE_BEST};
+
 /// Common name for keyframe interval option.
 pub const KEYFRAME_OPTION: &str = "key_int";
 /// Common description for keyframe interval option.
@@ -87,8 +89,8 @@ impl NAOptionDefinition {
             NAOptionDefinitionType::None => Ok((NAOption { name: self.name, value: NAValue::None }, 1)),
             NAOptionDefinitionType::Bool => Ok((NAOption { name: self.name, value: NAValue::Bool(true) }, 1)),
             NAOptionDefinitionType::Int(_, _) => {
-                if let Some(str) = value {
-                    let ret = str.parse::<i64>();
+                if let Some(strval) = value {
+                    let ret = strval.parse::<i64>();
                     if let Ok(val) = ret {
                         let opt = NAOption { name: self.name, value: NAValue::Int(val) };
                         self.check(&opt)?;
@@ -101,8 +103,8 @@ impl NAOptionDefinition {
                 }
             },
             NAOptionDefinitionType::Float(_, _) => {
-                if let Some(str) = value {
-                    let ret = str.parse::<f64>();
+                if let Some(strval) = value {
+                    let ret = strval.parse::<f64>();
                     if let Ok(val) = ret {
                         let opt = NAOption { name: self.name, value: NAValue::Float(val) };
                         self.check(&opt)?;
@@ -115,8 +117,8 @@ impl NAOptionDefinition {
                 }
             },
             NAOptionDefinitionType::String(_) => {
-                if let Some(str) = value {
-                    let opt = NAOption { name: self.name, value: NAValue::String(str.to_string()) };
+                if let Some(strval) = value {
+                    let opt = NAOption { name: self.name, value: NAValue::String(strval.to_string()) };
                     self.check(&opt)?;
                     Ok((opt, 2))
                 } else {
@@ -181,9 +183,9 @@ impl NAOptionDefinition {
                 Ok(())
             },
             NAValue::String(ref cur_str) => {
-                if let NAOptionDefinitionType::String(Some(ref strings)) = self.opt_type {
-                    for str in strings.iter() {
-                        if cur_str == str {
+                if let NAOptionDefinitionType::String(Some(strings)) = self.opt_type {
+                    for string in strings.iter() {
+                        if cur_str == string {
                             return Ok(());
                         }
                     }
@@ -203,7 +205,7 @@ impl fmt::Display for NAOptionDefinition {
             NAOptionDefinitionType::None => write!(f, "{}: {}", self.name, self.description),
             NAOptionDefinitionType::Bool => write!(f, "[no]{}: {}", self.name, self.description),
             NAOptionDefinitionType::String(ref str_list) => {
-                if let Some(ref opts) = str_list {
+                if let Some(opts) = str_list {
                     write!(f, "{} {}: {}", self.name, opts.join("|"), self.description)
                 } else {
                     write!(f, "{} <string>: {}", self.name, self.description)