rename "str" variable to avoid confusion with the primitive type

[nihav.git] / nihav-codec-support / src / test / enc_video.rs

diff --git a/nihav-codec-support/src/test/enc_video.rs b/nihav-codec-support/src/test/enc_video.rs
index e9fcf1f0cf84ae4b03e353a90d0f19656be7e0d9..900a0407a6a0f7c4526b98352032f552f374e67a 100644 (file)
--- a/nihav-codec-support/src/test/enc_video.rs
+++ b/nihav-codec-support/src/test/enc_video.rs
@@ -210,14 +210,14 @@ pub fn test_remuxing_md5(dec_config: &DecoderTestParams, muxer: &str, mux_reg: &
 }
 
 /// Tests an encoder by decoding a stream from input file, feeding it to the encoder and muxing the result into output file.
-pub fn test_encoding_to_file(dec_config: &DecoderTestParams, enc_config: &EncoderTestParams, mut enc_params: EncodeParameters) {
+pub fn test_encoding_to_file(dec_config: &DecoderTestParams, enc_config: &EncoderTestParams, mut enc_params: EncodeParameters, enc_options: &[NAOption]) {
     let dmx_f = dec_config.dmx_reg.find_demuxer(dec_config.demuxer).unwrap();
     let mut file = File::open(dec_config.in_name).unwrap();
     let mut fr = FileReader::new_read(&mut file);
     let mut br = ByteReader::new(&mut fr);
     let mut dmx = create_demuxer(dmx_f, &mut br).unwrap();
 
-    let in_stream = dmx.get_streams().find(|str| str.get_media_type() == dec_config.stream_type).unwrap();
+    let in_stream = dmx.get_streams().find(|strm| strm.get_media_type() == dec_config.stream_type).unwrap();
     let in_stream_id = in_stream.id;
     let decfunc = dec_config.dec_reg.find_decoder(in_stream.get_info().get_name()).unwrap();
     let mut dec = (decfunc)();
@@ -256,6 +256,7 @@ pub fn test_encoding_to_file(dec_config: &DecoderTestParams, enc_config: &Encode
 
     let encfunc = enc_config.enc_reg.find_encoder(enc_config.enc_name).unwrap();
     let mut encoder = (encfunc)();
+    encoder.set_options(enc_options);
     let out_str = encoder.init(0, enc_params).unwrap();
     out_sm.add_stream(NAStream::clone(&out_str));
 
@@ -318,14 +319,14 @@ pub fn test_encoding_to_file(dec_config: &DecoderTestParams, enc_config: &Encode
 }
 
 /// Tests an encoder by decoding a stream from input file, feeding it to the encoder and calculating the hash of codec information and packet data.
-pub fn test_encoding_md5(dec_config: &DecoderTestParams, enc_config: &EncoderTestParams, mut enc_params: EncodeParameters, ref_hash: &[u32; 4]) {
+pub fn test_encoding_md5(dec_config: &DecoderTestParams, enc_config: &EncoderTestParams, mut enc_params: EncodeParameters, enc_options: &[NAOption], ref_hash: &[u32; 4]) {
     let dmx_f = dec_config.dmx_reg.find_demuxer(dec_config.demuxer).unwrap();
     let mut file = File::open(dec_config.in_name).unwrap();
     let mut fr = FileReader::new_read(&mut file);
     let mut br = ByteReader::new(&mut fr);
     let mut dmx = create_demuxer(dmx_f, &mut br).unwrap();
 
-    let in_stream = dmx.get_streams().find(|str| str.get_media_type() == dec_config.stream_type).unwrap();
+    let in_stream = dmx.get_streams().find(|strm| strm.get_media_type() == dec_config.stream_type).unwrap();
     let in_stream_id = in_stream.id;
     let decfunc = dec_config.dec_reg.find_decoder(in_stream.get_info().get_name()).unwrap();
     let mut dec = (decfunc)();
@@ -363,6 +364,7 @@ pub fn test_encoding_md5(dec_config: &DecoderTestParams, enc_config: &EncoderTes
 
     let encfunc = enc_config.enc_reg.find_encoder(enc_config.enc_name).unwrap();
     let mut encoder = (encfunc)();
+    encoder.set_options(enc_options);
     let out_str = encoder.init(0, enc_params).unwrap();
 
     let mut md5 = MD5::new();