X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fcodecs%2Fzmbvenc.rs;h=0e053fe66539bc8194b4c00e7756f21480f4e6c6;hb=a715e99fd5a8b724cf31877c74bbd8191d7fd256;hp=8ba976a71c952df92d02c14ee14893e8a088de39;hpb=95b8d59d1acf44b0f3d3d4b4fed0d07af45d702c;p=nihav.git diff --git a/nihav-commonfmt/src/codecs/zmbvenc.rs b/nihav-commonfmt/src/codecs/zmbvenc.rs index 8ba976a..0e053fe 100644 --- a/nihav-commonfmt/src/codecs/zmbvenc.rs +++ b/nihav-commonfmt/src/codecs/zmbvenc.rs @@ -365,7 +365,7 @@ impl ZMBVEncoder { bw.write_buf(&self.zbuf)?; } - + Ok(()) } } @@ -404,7 +404,7 @@ impl NAEncoder for ZMBVEncoder { NACodecTypeInfo::Video(vinfo) => { self.width = vinfo.width; self.height = vinfo.height; - + let out_info = NAVideoInfo::new(vinfo.width, vinfo.height, false, vinfo.format); let info = NACodecInfo::new("zmbv", NACodecTypeInfo::Video(out_info), None); let mut stream = NAStream::new(StreamType::Video, stream_id, info, encinfo.tb_num, encinfo.tb_den, 0); @@ -588,9 +588,12 @@ mod test { tb_den: 0, flags: 0, }; - //test_encoding_to_file(&dec_config, &enc_config, enc_params); - test_encoding_md5(&dec_config, &enc_config, enc_params, - &[0x50df10e2, 0x606f3268, 0xdd4bc2ff, 0x844e7d87]); + let enc_options = &[ + NAOption { name: "range", value: NAValue::Int(16) }, + ]; + //test_encoding_to_file(&dec_config, &enc_config, enc_params, enc_options); + test_encoding_md5(&dec_config, &enc_config, enc_params, enc_options, + &[0x4bcdb816, 0x57d5d1b6, 0xc9412438, 0x9416c407]); } #[test] @@ -632,9 +635,12 @@ mod test { tb_den: 0, flags: 0, }; - //test_encoding_to_file(&dec_config, &enc_config, enc_params); - test_encoding_md5(&dec_config, &enc_config, enc_params, - &[0x0b4cb528, 0x66c91f6c, 0x1c2187a5, 0x2723a08d]); + let enc_options = &[ + NAOption { name: "range", value: NAValue::Int(16) }, + ]; + //test_encoding_to_file(&dec_config, &enc_config, enc_params, enc_options); + test_encoding_md5(&dec_config, &enc_config, enc_params, enc_options, + &[0x1cff4116, 0x5926d91b, 0x60aac53f, 0x8a22bc7b]); } #[test] @@ -676,9 +682,12 @@ mod test { tb_den: 0, flags: 0, }; - //test_encoding_to_file(&dec_config, &enc_config, enc_params); - test_encoding_md5(&dec_config, &enc_config, enc_params, - &[0x1a522743, 0x6c320a6e, 0xd08539e1, 0x03fc17ea]); + let enc_options = &[ + NAOption { name: "range", value: NAValue::Int(16) }, + ]; + //test_encoding_to_file(&dec_config, &enc_config, enc_params, enc_options); + test_encoding_md5(&dec_config, &enc_config, enc_params, enc_options, + &[0xb48aa633, 0x673539fe, 0xa312d45a, 0x76eee134]); } #[test] @@ -720,8 +729,11 @@ mod test { tb_den: 0, flags: 0, }; - //test_encoding_to_file(&dec_config, &enc_config, enc_params); - test_encoding_md5(&dec_config, &enc_config, enc_params, - &[0x3880e045, 0xe6c88dc7, 0x21066058, 0xc789f1e9]); + let enc_options = &[ + NAOption { name: "range", value: NAValue::Int(16) }, + ]; + //test_encoding_to_file(&dec_config, &enc_config, enc_params, enc_options); + test_encoding_md5(&dec_config, &enc_config, enc_params, enc_options, + &[0x0836152c, 0xfcd7e1fc, 0xf1e2f619, 0x874d3dbc]); } }