X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fcodecs%2Fcinepakenc.rs;h=c05b86d3f5c2ddfd126d9108044aa683a53345fa;hb=8ec8fe90dd159a4361442a66be6f627ad751d387;hp=645bd834d1496e2ea26e0f066a49a5d6fd01a545;hpb=3c406629cabc3b77f9198646b0f93fc7e486e277;p=nihav.git diff --git a/nihav-commonfmt/src/codecs/cinepakenc.rs b/nihav-commonfmt/src/codecs/cinepakenc.rs index 645bd83..c05b86d 100644 --- a/nihav-commonfmt/src/codecs/cinepakenc.rs +++ b/nihav-commonfmt/src/codecs/cinepakenc.rs @@ -929,7 +929,9 @@ impl NAEncoder for CinepakEncoder { let out_info = NAVideoInfo::new(vinfo.width, vinfo.height, false, vinfo.format); let info = NACodecInfo::new("cinepak", NACodecTypeInfo::Video(out_info.clone()), None); - let stream = NAStream::new(StreamType::Video, stream_id, info, encinfo.tb_num, encinfo.tb_den).into_ref(); + let mut stream = NAStream::new(StreamType::Video, stream_id, info, encinfo.tb_num, encinfo.tb_den); + stream.set_num(stream_id as usize); + let stream = stream.into_ref(); self.stream = Some(stream.clone()); self.quality = encinfo.quality; @@ -982,7 +984,7 @@ impl NAEncoder for CinepakEncoder { const ENCODER_OPTS: &[NAOptionDefinition] = &[ NAOptionDefinition { - name: "key_int", description: "Keyframe interval (0 - automatic)", + name: KEYFRAME_OPTION, description: KEYFRAME_OPTION_DESC, opt_type: NAOptionDefinitionType::Int(Some(0), Some(128)) }, NAOptionDefinition { name: "nstrips", description: "Number of strips per frame (0 - automatic)", @@ -996,11 +998,10 @@ impl NAOptionHandler for CinepakEncoder { fn get_supported_options(&self) -> &[NAOptionDefinition] { ENCODER_OPTS } fn set_options(&mut self, options: &[NAOption]) { for option in options.iter() { -println!("option {}", option.name); for opt_def in ENCODER_OPTS.iter() { if opt_def.check(option).is_ok() { match option.name { - "key_int" => { + KEYFRAME_OPTION => { if let NAValue::Int(intval) = option.value { self.key_int = intval as u8; }