Rust2018: use new addressing scheme

diff --git a/Cargo.toml b/Cargo.toml
index df405a4b58d0d378737d7bd27e0a54b60c1976ad..6bda4bb46b44bfb2cd199e1481a21d50e0242c7d 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,6 +2,7 @@
 name = "nihav"
 version = "0.1.0"
 authors = ["Kostya Shishkov <kostya.shishkov@gmail.com>"]
+edition = "2018"
 
 [features]
 default = ["all_decoders", "all_demuxers"]

diff --git a/src/codecs/aac.rs b/src/codecs/aac.rs
index b533e9a0b19e42f53463d510bb7f472cc8f9bf26..23d66898fd46c286c42c56f61e792aa2fd77bd8a 100644 (file)
--- a/src/codecs/aac.rs
+++ b/src/codecs/aac.rs
@@ -1,13 +1,13 @@
-use formats::*;
-use frame::*;
-use codecs::*;
-use dsp::fft::FFTMode;
-use dsp::mdct::IMDCT;
-use dsp::window::*;
-use io::bitreader::*;
-use io::codebook::*;
+use crate::formats::*;
+use crate::frame::*;
+use crate::codecs::*;
+use crate::dsp::fft::FFTMode;
+use crate::dsp::mdct::IMDCT;
+use crate::dsp::window::*;
+use crate::io::bitreader::*;
+use crate::io::codebook::*;
 use std::fmt;
-use io::intcode::*;
+use crate::io::intcode::*;
 use std::mem;
 use std::ptr;
 use std::str::FromStr;
@@ -1261,7 +1261,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::*;
+    use crate::test::dec_video::*;
     #[test]
     fn test_aac() {
 //        let file = "assets/RV/rv40_weighted_mc.rmvb";

diff --git a/src/codecs/atrac3.rs b/src/codecs/atrac3.rs
index c61a26230e876bee5012f1df19dad506304e638f..5281892a28cae9457e26edc60b44dfa729d0c645 100644 (file)
--- a/src/codecs/atrac3.rs
+++ b/src/codecs/atrac3.rs
@@ -1,11 +1,11 @@
-use formats::*;
-use frame::*;
+use crate::formats::*;
+use crate::frame::*;
 use super::*;
-use io::bitreader::*;
-use io::byteio::*;
-use io::codebook::*;
-use dsp::fft::FFTMode;
-use dsp::mdct::IMDCT;
+use crate::io::bitreader::*;
+use crate::io::byteio::*;
+use crate::io::codebook::*;
+use crate::dsp::fft::FFTMode;
+use crate::dsp::mdct::IMDCT;
 use std::f32::consts;
 
 #[derive(Clone,Copy,PartialEq)]
@@ -698,7 +698,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::*;
+    use crate::test::dec_video::*;
     #[test]
     fn test_atrac3() {
         let file = "assets/RV/rv30_atrc_384x208_realproducer_plus_8.51.rm";

diff --git a/src/codecs/blockdsp.rs b/src/codecs/blockdsp.rs
index ab0773eab29c5e180d60879c5eeb493318e73814..4c0fea67ca0845a00d360332fcf57d8ae49c0893 100644 (file)
--- a/src/codecs/blockdsp.rs
+++ b/src/codecs/blockdsp.rs
@@ -1,4 +1,4 @@
-use frame::*;
+use crate::frame::*;
 
 pub fn put_blocks(buf: &mut NAVideoBuffer<u8>, xpos: usize, ypos: usize, blk: &[[i16;64]; 6]) {
     let stridey = buf.get_stride(0);

diff --git a/src/codecs/clearvideo.rs b/src/codecs/clearvideo.rs
index 0c2de9b0ca24c62f0cc08e11a897141c030f5ad3..8a27006d0378fbd4402d50147ac9fa78e55f4167 100644 (file)
--- a/src/codecs/clearvideo.rs
+++ b/src/codecs/clearvideo.rs
@@ -1,7 +1,7 @@
-use io::byteio::{ByteReader,MemoryReader};
-use io::bitreader::*;
-use io::codebook::*;
-use formats;
+use crate::io::byteio::{ByteReader,MemoryReader};
+use crate::io::bitreader::*;
+use crate::io::codebook::*;
+use crate::formats;
 use super::*;
 use std::fmt;
 use std::ops::{Add, Sub};
@@ -771,7 +771,7 @@ pub fn get_decoder_rm() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::test_file_decoding;
+    use crate::test::dec_video::test_file_decoding;
     #[test]
     fn test_clv() {
          test_file_decoding("avi", "assets/TalkingHead_352x288.avi", Some(10), true, false, None/*Some("clv")*/);

diff --git a/src/codecs/gremlinvideo.rs b/src/codecs/gremlinvideo.rs
index f7e19c6f44557b40f5bd9903f4e12323baec5589..e6015fe71e878fbb5cfe2f568ba24a437946c651 100644 (file)
--- a/src/codecs/gremlinvideo.rs
+++ b/src/codecs/gremlinvideo.rs
@@ -1,6 +1,6 @@
-use formats;
+use crate::formats;
 use super::*;
-use io::byteio::*;
+use crate::io::byteio::*;
 
 struct GremlinVideoDecoder {
     info:       Rc<NACodecInfo>,
@@ -465,7 +465,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::test_file_decoding;
+    use crate::test::dec_video::test_file_decoding;
     #[test]
     fn test_gdv() {
          test_file_decoding("gdv", "assets/intro1.gdv", Some(10), true, false, None);

diff --git a/src/codecs/h263/code.rs b/src/codecs/h263/code.rs
index 1a293735452fc8bbafe9160af6aea32371ba8923..dd1279ee555c0e31af3a50f827b70fe9fd488e01 100644 (file)
--- a/src/codecs/h263/code.rs
+++ b/src/codecs/h263/code.rs
@@ -1,4 +1,4 @@
-use frame::NAVideoBuffer;
+use crate::frame::NAVideoBuffer;
 use super::{BlockDSP, CBPInfo, MV};
 use super::super::blockdsp;
 //use super::h263data::*;

diff --git a/src/codecs/h263/data.rs b/src/codecs/h263/data.rs
index b5d3cb1d1037a4e65d6cc01448022a57a15d6e33..029c5bbecf8160b6946d0bae8a4b12ec2419d93a 100644 (file)
--- a/src/codecs/h263/data.rs
+++ b/src/codecs/h263/data.rs
@@ -1,4 +1,4 @@
-use io::codebook::CodebookDescReader;
+use crate::io::codebook::CodebookDescReader;
 
 #[allow(dead_code)]
 pub const H263_SCALES: &[u8] = &[

diff --git a/src/codecs/h263/decoder.rs b/src/codecs/h263/decoder.rs
index 08b47516b901bc58df4a105c984f31c69a2aae06..fd828fe09a7c1e1db4c8970d1d38aef51287a99e 100644 (file)
--- a/src/codecs/h263/decoder.rs
+++ b/src/codecs/h263/decoder.rs
@@ -1,10 +1,10 @@
 //use std::mem;
-use frame::*;
+use crate::frame::*;
 use super::super::*;
 use super::super::blockdsp;
 use super::*;
 //use super::code::*;
-use formats;
+use crate::formats;
 
 #[allow(dead_code)]
 struct MVInfo {

diff --git a/src/codecs/h263/intel263.rs b/src/codecs/h263/intel263.rs
index 0c5652aadd47df70600c0ba713f5b98c5ab33b3b..9e36a49651991db54e016ed4c215da5893bb4bf2 100644 (file)
--- a/src/codecs/h263/intel263.rs
+++ b/src/codecs/h263/intel263.rs
@@ -1,6 +1,6 @@
-use io::bitreader::*;
-use io::codebook::*;
-use formats;
+use crate::io::bitreader::*;
+use crate::io::codebook::*;
+use crate::formats;
 use super::super::*;
 use super::*;
 use super::decoder::*;
@@ -412,7 +412,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::test_file_decoding;
+    use crate::test::dec_video::test_file_decoding;
     #[test]
     fn test_intel263() {
          test_file_decoding("avi", "assets/neal73_saber.avi", Some(16), true, false, None/*Some("i263")*/);

diff --git a/src/codecs/h263/mod.rs b/src/codecs/h263/mod.rs
index aa274e7275f1c6eab80a859727e456f33d81b553..87188879f39131322d55d3ad62b44078f5dba4a7 100644 (file)
--- a/src/codecs/h263/mod.rs
+++ b/src/codecs/h263/mod.rs
@@ -1,5 +1,5 @@
 use super::{DecoderResult, MV, ZERO_MV};
-use frame::NAVideoBuffer;
+use crate::frame::NAVideoBuffer;
 
 pub mod code;
 pub mod data;

diff --git a/src/codecs/h263/rv10.rs b/src/codecs/h263/rv10.rs
index f72c342fee579602c591ce2550b3d7e8b980ff1f..7e41b7afdb957c75e88c416d66177795f3fa5cef 100644 (file)
--- a/src/codecs/h263/rv10.rs
+++ b/src/codecs/h263/rv10.rs
@@ -1,6 +1,6 @@
-use io::bitreader::*;
-use io::codebook::*;
-use formats;
+use crate::io::bitreader::*;
+use crate::io::codebook::*;
+use crate::formats;
 use super::super::*;
 use super::*;
 use super::code::H263BlockDSP;
@@ -457,7 +457,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::test_file_decoding;
+    use crate::test::dec_video::test_file_decoding;
     #[test]
     fn test_rv10() {
          test_file_decoding("realmedia", "assets/RV/rv10_dnet_640x352_realvideo_encoder_4.0.rm", Some(1000), true, false, None/*Some("rv10")*/);

diff --git a/src/codecs/h263/rv20.rs b/src/codecs/h263/rv20.rs
index 3b9fa1bf631ab170224149fb9aedff30999168dd..11dbe2edb199f73390617e4dd82d67b35cb60a61 100644 (file)
--- a/src/codecs/h263/rv20.rs
+++ b/src/codecs/h263/rv20.rs
@@ -1,6 +1,6 @@
-use io::bitreader::*;
-use io::codebook::*;
-use formats;
+use crate::io::bitreader::*;
+use crate::io::codebook::*;
+use crate::formats;
 use super::super::*;
 use super::*;
 use super::code::H263BlockDSP;
@@ -520,7 +520,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::test_file_decoding;
+    use crate::test::dec_video::test_file_decoding;
     #[test]
     fn test_rv20() {
         test_file_decoding("realmedia", "assets/RV/rv20_svt_atrc_640x352_realproducer_plus_8.51.rm", /*None*/Some(3000), true, false, None/*Some("rv20")*/);

diff --git a/src/codecs/indeo/imc.rs b/src/codecs/indeo/imc.rs
index 9a2ba219b40fde2f2b5f744044f687a83bd19576..f11daa90c29a3a7b7723ca80840dd7fe81a85808 100644 (file)
--- a/src/codecs/indeo/imc.rs
+++ b/src/codecs/indeo/imc.rs
@@ -2,13 +2,13 @@ use std::mem;
 use std::ptr;
 use std::f32::consts;
 
-use formats::*;
-use frame::*;
+use crate::formats::*;
+use crate::frame::*;
 use super::super::*;
-use io::bitreader::*;
-use io::codebook::*;
-use dsp::fft::*;
-use dsp::window::*;
+use crate::io::bitreader::*;
+use crate::io::codebook::*;
+use crate::dsp::fft::*;
+use crate::dsp::window::*;
 
 const BANDS:      usize =  32;
 const COEFFS:     usize = 256;
@@ -1107,7 +1107,7 @@ const IMC_CB_SELECTOR: [[usize; BANDS]; 4] = [
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::*;
+    use crate::test::dec_video::*;
     #[test]
     fn test_imc() {
 //        let file = "assets/neal73_saber.avi";

diff --git a/src/codecs/indeo/indeo2.rs b/src/codecs/indeo/indeo2.rs
index 4f7abdde717298cb29bb686ff49067d93251e977..61f1c777c8945fc583bb0b8e3355963a8d9b5057 100644 (file)
--- a/src/codecs/indeo/indeo2.rs
+++ b/src/codecs/indeo/indeo2.rs
@@ -1,6 +1,6 @@
-use io::bitreader::*;
-use io::codebook::*;
-use formats;
+use crate::io::bitreader::*;
+use crate::io::codebook::*;
+use crate::formats;
 use super::super::*;
 
 static INDEO2_DELTA_TABLE: [[u8; 256]; 4] = [
@@ -367,7 +367,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::test_file_decoding;
+    use crate::test::dec_video::test_file_decoding;
     #[test]
     fn test_indeo2() {
          test_file_decoding("avi", "assets/laser05.avi", Some(10), true, false, None);

diff --git a/src/codecs/indeo/indeo3.rs b/src/codecs/indeo/indeo3.rs
index 9a3d6170d2c1378a85d94fac5dac8860d9945606..5b4876de33a959184e338dca1be84008ea8f70ed 100644 (file)
--- a/src/codecs/indeo/indeo3.rs
+++ b/src/codecs/indeo/indeo3.rs
@@ -1,6 +1,6 @@
-use formats;
+use crate::formats;
 use super::super::*;
-use io::byteio::*;
+use crate::io::byteio::*;
 use std::io::SeekFrom;
 use std::mem;
 
@@ -783,7 +783,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::test_file_decoding;
+    use crate::test::dec_video::test_file_decoding;
     #[test]
     fn test_indeo3() {
          test_file_decoding("avi", "assets/iv32_example.avi", Some(10), true, false, None);

diff --git a/src/codecs/indeo/indeo4.rs b/src/codecs/indeo/indeo4.rs
index 36ec86bcf5cd00c25b7e7b7bc66bd57b5f568b0f..773b17724cc26063712d601095a5fb21a213d344 100644 (file)
--- a/src/codecs/indeo/indeo4.rs
+++ b/src/codecs/indeo/indeo4.rs
@@ -1,6 +1,6 @@
 use std::cell::Ref;
-use io::bitreader::*;
-use formats;
+use crate::io::bitreader::*;
+use crate::formats;
 use super::super::*;
 use super::ivi::*;
 use super::ivibr::*;
@@ -764,7 +764,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::test_file_decoding;
+    use crate::test::dec_video::test_file_decoding;
     #[test]
     fn test_indeo4() {
          test_file_decoding("avi", "assets/IV4/volcano.avi", /*None*/Some(16), true, false, None/*Some("iv4")*/);

diff --git a/src/codecs/indeo/indeo5.rs b/src/codecs/indeo/indeo5.rs
index bf3b974498ecfd06bf82e67be7e29cb7374c8dd3..c761a8e06787c1d12045707aa845729101acbe86 100644 (file)
--- a/src/codecs/indeo/indeo5.rs
+++ b/src/codecs/indeo/indeo5.rs
@@ -1,6 +1,6 @@
 use std::cell::Ref;
-use io::bitreader::*;
-use formats;
+use crate::io::bitreader::*;
+use crate::formats;
 use super::super::*;
 use super::ivi::*;
 use super::ivibr::*;
@@ -717,7 +717,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::test_file_decoding;
+    use crate::test::dec_video::test_file_decoding;
     #[test]
     fn test_indeo5() {
          test_file_decoding("avi", "assets/IV5/sample.avi", /*None*/Some(2), true, false, None);

diff --git a/src/codecs/indeo/ivibr.rs b/src/codecs/indeo/ivibr.rs
index 2e1dd9aa46a956209e7a4f360cdd6c202d07cf6d..3011e1a90421a6a83ed8ec1b702ed0f3e2ef27e0 100644 (file)
--- a/src/codecs/indeo/ivibr.rs
+++ b/src/codecs/indeo/ivibr.rs
@@ -1,10 +1,10 @@
 use std::mem;
 use std::rc::Rc;
 use std::cell::{Ref,RefCell};
-use io::bitreader::*;
+use crate::io::bitreader::*;
 //use io::intcode::*;
 use super::super::*;
-use formats::*;
+use crate::formats::*;
 use super::ivi::*;
 use super::ividsp::*;
 

diff --git a/src/codecs/mod.rs b/src/codecs/mod.rs
index 5f6009a5c87d502dfbcb5e489534172645955386..b6df370d6af652562ffc86708b25778fbfbfc0c0 100644 (file)
--- a/src/codecs/mod.rs
+++ b/src/codecs/mod.rs
@@ -1,13 +1,13 @@
 use std::fmt;
 use std::ops::{Add, AddAssign, Sub, SubAssign};
 
-use frame::*;
+use crate::frame::*;
 use std::rc::Rc;
 use std::cell::RefCell;
 use std::mem;
-use io::byteio::ByteIOError;
-use io::bitreader::BitReaderError;
-use io::codebook::CodebookError;
+use crate::io::byteio::ByteIOError;
+use crate::io::bitreader::BitReaderError;
+use crate::io::codebook::CodebookError;
 
 #[derive(Debug,Clone,Copy,PartialEq)]
 #[allow(dead_code)]

diff --git a/src/codecs/pcm.rs b/src/codecs/pcm.rs
index 288930b83b46ec807d5e05f65e4af9344e16a94f..2a0e510e5b23b764d4b79dec83f50a381bdacf2b 100644 (file)
--- a/src/codecs/pcm.rs
+++ b/src/codecs/pcm.rs
@@ -1,4 +1,4 @@
-use formats::*;
+use crate::formats::*;
 use super::*;
 
 struct PCMDecoder { chmap: NAChannelMap }

diff --git a/src/codecs/real/cook.rs b/src/codecs/real/cook.rs
index 9c9329396815004d3689f79b85bf58a480aa0706..2fcff98f6dc312a7c92a8b5782339d0a550e85d3 100644 (file)
--- a/src/codecs/real/cook.rs
+++ b/src/codecs/real/cook.rs
@@ -1,12 +1,12 @@
-use formats::*;
-use frame::*;
+use crate::formats::*;
+use crate::frame::*;
 use super::super::*;
-use dsp::fft::FFTMode;
-use dsp::mdct::IMDCT;
-use io::bitreader::*;
-use io::byteio::{ByteReader, MemoryReader};
-use io::codebook::*;
-use io::intcode::*;
+use crate::dsp::fft::FFTMode;
+use crate::dsp::mdct::IMDCT;
+use crate::io::bitreader::*;
+use crate::io::byteio::{ByteReader, MemoryReader};
+use crate::io::codebook::*;
+use crate::io::intcode::*;
 use std::f32::consts;
 use std::mem::swap;
 
@@ -678,7 +678,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::*;
+    use crate::test::dec_video::*;
     #[test]
     fn test_cook() {
 //        let file = "assets/RV/rv30_weighted_mc.rm";

diff --git a/src/codecs/real/ra144.rs b/src/codecs/real/ra144.rs
index 97577d68fdea00d3dc3baf2e9b2b1039ca521274..1fdace09689208f5e54c218b0070ef0647a379a1 100644 (file)
--- a/src/codecs/real/ra144.rs
+++ b/src/codecs/real/ra144.rs
@@ -1,7 +1,7 @@
-use formats::*;
-use frame::*;
+use crate::formats::*;
+use crate::frame::*;
 use super::super::*;
-use io::bitreader::*;
+use crate::io::bitreader::*;
 
 const NBLOCKS: usize = 4;
 const BLOCKSIZE: usize = 40;
@@ -315,7 +315,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::*;
+    use crate::test::dec_video::*;
     #[test]
     fn test_ra144() {
         let file = "assets/RV/ra3_in_rm_file.rm";

diff --git a/src/codecs/real/ra288.rs b/src/codecs/real/ra288.rs
index 3de18218b79e904fdaf1437e32f11a6095899062..6a5a352795615535117859b115be385ead54c331 100644 (file)
--- a/src/codecs/real/ra288.rs
+++ b/src/codecs/real/ra288.rs
@@ -1,7 +1,7 @@
-use formats::*;
-use frame::*;
+use crate::formats::*;
+use crate::frame::*;
 use super::super::*;
-use io::bitreader::*;
+use crate::io::bitreader::*;
 const CHMAP_MONO: [NAChannelType; 1] = [NAChannelType::C];
 const NBLOCKS: usize = 32;
 const BLOCKSIZE: usize = 5;
@@ -205,7 +205,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::*;
+    use crate::test::dec_video::*;
     #[test]
     fn test_ra288() {
         let file = "assets/RV/A0000044.rm";

diff --git a/src/codecs/real/ralf.rs b/src/codecs/real/ralf.rs
index 74eefe3b3311c02a6342f651557c15b27d7bdd73..3b5d88f2f82af8a2fbde6bf6bb2896cb11c18896 100644 (file)
--- a/src/codecs/real/ralf.rs
+++ b/src/codecs/real/ralf.rs
@@ -1,10 +1,10 @@
-use formats::*;
-use frame::*;
-use codecs::*;
-use io::byteio::*;
-use io::bitreader::*;
-use io::codebook::*;
-use io::intcode::*;
+use crate::formats::*;
+use crate::frame::*;
+use crate::codecs::*;
+use crate::io::byteio::*;
+use crate::io::bitreader::*;
+use crate::io::codebook::*;
+use crate::io::intcode::*;
 
 struct CodebookSet {
     filter_params_cb:   Codebook<u16>,
@@ -475,7 +475,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::*;
+    use crate::test::dec_video::*;
     #[test]
     fn test_ralf() {
         let file = "assets/RV/rv40_ralf.rmvb";

diff --git a/src/codecs/real/rv30.rs b/src/codecs/real/rv30.rs
index f75b76992c26b78f7c554e4cd5c5a1fb2574bee1..cf7e31317d58baa6a044bd3fcf3d379ec21fed55 100644 (file)
--- a/src/codecs/real/rv30.rs
+++ b/src/codecs/real/rv30.rs
@@ -1,7 +1,7 @@
-use formats;
-use io::bitreader::*;
-use io::intcode::*;
-use codecs::*;
+use crate::formats;
+use crate::io::bitreader::*;
+use crate::io::intcode::*;
+use crate::codecs::*;
 use super::rv3040::*;
 use super::rv30dsp::*;
 
@@ -162,7 +162,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::test_file_decoding;
+    use crate::test::dec_video::test_file_decoding;
     #[test]
     fn test_rv30() {
 //         test_file_decoding("realmedia", "assets/RV/rv30_chroma_drift.rm", Some(1000), true, false, /*None*/Some("rv30"));

diff --git a/src/codecs/real/rv3040.rs b/src/codecs/real/rv3040.rs
index 078de454870c7de11c28b194e4a22e3292f81b3e..d1107ba0786a1a2378693c137636e14528d91f15 100644 (file)
--- a/src/codecs/real/rv3040.rs
+++ b/src/codecs/real/rv3040.rs
@@ -1,8 +1,8 @@
-use formats::YUV420_FORMAT;
-use frame::{NABufferType, NAVideoInfo, NAVideoBuffer, FrameType, alloc_video_buffer};
-use codecs::{MV, ZERO_MV, DecoderError, DecoderResult, IPBShuffler};
-use io::bitreader::{BitReader,BitReaderMode};
-use io::intcode::*;
+use crate::formats::YUV420_FORMAT;
+use crate::frame::{NABufferType, NAVideoInfo, NAVideoBuffer, FrameType, alloc_video_buffer};
+use crate::codecs::{MV, ZERO_MV, DecoderError, DecoderResult, IPBShuffler};
+use crate::io::bitreader::{BitReader,BitReaderMode};
+use crate::io::intcode::*;
 use std::mem;
 
 use super::rv34codes::*;

diff --git a/src/codecs/real/rv30dsp.rs b/src/codecs/real/rv30dsp.rs
index 049e002eb22d5f39d89d309227250328ab60d2bf..b1365db5bbf0c23671ca804a4cd59e1d5fabaf32 100644 (file)
--- a/src/codecs/real/rv30dsp.rs
+++ b/src/codecs/real/rv30dsp.rs
@@ -1,6 +1,6 @@
-use frame::{FrameType, NAVideoBuffer};
-use codecs::MV;
-use codecs::blockdsp::edge_emu;
+use crate::frame::{FrameType, NAVideoBuffer};
+use crate::codecs::MV;
+use crate::codecs::blockdsp::edge_emu;
 use super::rv3040::{RV34DSP, RV34MBInfo};
 
 fn clip8(a: i16) -> u8 {

diff --git a/src/codecs/real/rv34codes.rs b/src/codecs/real/rv34codes.rs
index a617535f06d85350b16b4b786bbe0f930694d1d8..370f288a7a815c3fb55f9ecce72d1d4bf80f40ab 100644 (file)
--- a/src/codecs/real/rv34codes.rs
+++ b/src/codecs/real/rv34codes.rs
@@ -1,6 +1,6 @@
-use codecs::DecoderResult;
-use io::bitreader::BitReader;
-use io::codebook::*;
+use crate::codecs::DecoderResult;
+use crate::io::bitreader::BitReader;
+use crate::io::codebook::*;
 
 struct CBPSet {
     cbp_pattern:    Codebook<u16>,

diff --git a/src/codecs/real/rv40.rs b/src/codecs/real/rv40.rs
index 2639c23e15225d2ea6639bb8010438e671908b91..c6645989f4f174f5638e92629b6539995705bc8f 100644 (file)
--- a/src/codecs/real/rv40.rs
+++ b/src/codecs/real/rv40.rs
@@ -1,8 +1,8 @@
-use formats;
-use io::bitreader::*;
-use io::codebook::*;
-use io::intcode::*;
-use codecs::*;
+use crate::formats;
+use crate::io::bitreader::*;
+use crate::io::codebook::*;
+use crate::io::intcode::*;
+use crate::codecs::*;
 use super::rv3040::*;
 use super::rv40dsp::*;
 
@@ -355,7 +355,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::test_file_decoding;
+    use crate::test::dec_video::test_file_decoding;
     #[test]
     fn test_rv40() {
 //         test_file_decoding("realmedia", "assets/RV/rv40_ralf.rmvb", Some(1000), true, false, /*None*/Some("rv40"));

diff --git a/src/codecs/real/rv40dsp.rs b/src/codecs/real/rv40dsp.rs
index 4230715cfad0163d15cc68c4a787dd8cacc93496..a6ee60797d3cdf621640c799d98ce9b95bc4562a 100644 (file)
--- a/src/codecs/real/rv40dsp.rs
+++ b/src/codecs/real/rv40dsp.rs
@@ -1,6 +1,6 @@
-use frame::{FrameType, NAVideoBuffer};
-use codecs::MV;
-use codecs::blockdsp::edge_emu;
+use crate::frame::{FrameType, NAVideoBuffer};
+use crate::codecs::MV;
+use crate::codecs::blockdsp::edge_emu;
 use super::rv3040::{RV34DSP, RV34MBInfo};
 
 fn clip8(a: i16) -> u8 {

diff --git a/src/codecs/real/rv60.rs b/src/codecs/real/rv60.rs
index f277391c3f6b972f8b3059e9a0d863b2d04fd2e1..a1ad055d3e22a917bbb5014867b76753ce337c43 100644 (file)
--- a/src/codecs/real/rv60.rs
+++ b/src/codecs/real/rv60.rs
@@ -1,11 +1,11 @@
 use std::rc::Rc;
 use std::cell::RefCell;
-use formats::YUV420_FORMAT;
-use frame::*;
-use codecs::{NADecoder, MV, ZERO_MV, DecoderError, DecoderResult, IPBShuffler};
-use io::byteio::{MemoryReader,ByteReader};
-use io::bitreader::{BitReader,BitReaderMode};
-use io::intcode::*;
+use crate::formats::YUV420_FORMAT;
+use crate::frame::*;
+use crate::codecs::{NADecoder, MV, ZERO_MV, DecoderError, DecoderResult, IPBShuffler};
+use crate::io::byteio::{MemoryReader,ByteReader};
+use crate::io::bitreader::{BitReader,BitReaderMode};
+use crate::io::intcode::*;
 
 use super::rv60codes::*;
 use super::rv60dsp::*;
@@ -1481,7 +1481,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::test_file_decoding;
+    use crate::test::dec_video::test_file_decoding;
     #[test]
     fn test_rv60() {
          test_file_decoding("realmedia", "assets/RV/RV60.rmhd", Some(4000), true, false, None/*Some("rv60")*/);

diff --git a/src/codecs/real/rv60codes.rs b/src/codecs/real/rv60codes.rs
index be949ab29ea74e71490343bb872af148cecf2fe6..3b85a808ec1408e9f6fc4f9e477d9dd05c083902 100644 (file)
--- a/src/codecs/real/rv60codes.rs
+++ b/src/codecs/real/rv60codes.rs
@@ -1,6 +1,6 @@
-use codecs::*;
-use io::bitreader::BitReader;
-use io::codebook::*;
+use crate::codecs::*;
+use crate::io::bitreader::BitReader;
+use crate::io::codebook::*;
 use std::mem;
 use std::ptr;
 

diff --git a/src/codecs/real/rv60dsp.rs b/src/codecs/real/rv60dsp.rs
index 64c32c6800e27803995d92df8636642365f0be99..3850acccad6c463ab43c12b38de3c1cd77165cb0 100644 (file)
--- a/src/codecs/real/rv60dsp.rs
+++ b/src/codecs/real/rv60dsp.rs
@@ -1,6 +1,6 @@
-use frame::NAVideoBuffer;
-use codecs::MV;
-use codecs::blockdsp::edge_emu;
+use crate::frame::NAVideoBuffer;
+use crate::codecs::MV;
+use crate::codecs::blockdsp::edge_emu;
 
 fn clip8(val: i16) -> u8 { val.min(255).max(0) as u8 }
 

diff --git a/src/codecs/sipro.rs b/src/codecs/sipro.rs
index d3511aac8dba2fa9f1b2e6693ab59db18be9f83e..882d90c59ee5f1839463cba9fb64dfd0c2a39fe0 100644 (file)
--- a/src/codecs/sipro.rs
+++ b/src/codecs/sipro.rs
@@ -1,7 +1,7 @@
-use formats::*;
-use frame::*;
+use crate::formats::*;
+use crate::frame::*;
 use super::*;
-use io::bitreader::*;
+use crate::io::bitreader::*;
 
 use std::f32::consts::PI;
 
@@ -739,7 +739,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::*;
+    use crate::test::dec_video::*;
     #[test]
     fn test_sipro() {
         let file = "assets/RV/autahi-vox.rm";

diff --git a/src/codecs/ts102366.rs b/src/codecs/ts102366.rs
index 3ee68ee4e3a9d8d92050f8798aea14941f6d2b1f..fb452c58ccc87969dd0db5a9448f8dd77ea012f1 100644 (file)
--- a/src/codecs/ts102366.rs
+++ b/src/codecs/ts102366.rs
@@ -1,8 +1,8 @@
-use formats::*;
-use frame::*;
+use crate::formats::*;
+use crate::frame::*;
 use super::*;
-use io::bitreader::*;
-use dsp::fft::*;
+use crate::io::bitreader::*;
+use crate::dsp::fft::*;
 use std::str::FromStr;
 use std::f32::consts;
 
@@ -1245,7 +1245,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::*;
+    use crate::test::dec_video::*;
     #[test]
     fn test_ts102366() {
         let file = "assets/RV/sp_sample1.rm";

diff --git a/src/demuxers/avi.rs b/src/demuxers/avi.rs
index fa8355793f79d05343f5b746537f6f6dc724887d..a326561af4c57cdebf2e031ca98a8f501346bd8f 100644 (file)
--- a/src/demuxers/avi.rs
+++ b/src/demuxers/avi.rs
@@ -1,9 +1,9 @@
 use super::*;
-use register;
+use crate::register;
 use super::DemuxerError::*;
 //use io::byteio::*;
 //use frame::*;
-use formats::*;
+use crate::formats::*;
 
 macro_rules! mktag {
     ($a:expr, $b:expr, $c:expr, $d:expr) => ({

diff --git a/src/demuxers/gdv.rs b/src/demuxers/gdv.rs
index 16eae335321325b605ca0471a0e0567fb326f8e8..63b7364df6d5ba0d29f057bafbe8725ed50e3619 100644 (file)
--- a/src/demuxers/gdv.rs
+++ b/src/demuxers/gdv.rs
@@ -1,7 +1,7 @@
 use super::*;
 //use io::byteio::*;
 //use frame::*;
-use formats::*;
+use crate::formats::*;
 //use std::collections::HashMap;
 
 enum GDVState {

diff --git a/src/demuxers/mod.rs b/src/demuxers/mod.rs
index 347b7e3a50b321c39982e4c410e36a6c86106194..adf954af270d215ed0bf5aa88f769308095b61af 100644 (file)
--- a/src/demuxers/mod.rs
+++ b/src/demuxers/mod.rs
@@ -1,6 +1,6 @@
 use std::rc::Rc;
-use frame::*;
-use io::byteio::*;
+use crate::frame::*;
+use crate::io::byteio::*;
 
 #[derive(Debug,Clone,Copy,PartialEq)]
 #[allow(dead_code)]

diff --git a/src/demuxers/realmedia.rs b/src/demuxers/realmedia.rs
index dbb8564a1e75c4657960953755792426e8087fea..9026384f4242741d2887ab41c5171b5f05c2ccd8 100644 (file)
--- a/src/demuxers/realmedia.rs
+++ b/src/demuxers/realmedia.rs
@@ -2,7 +2,7 @@ use super::*;
 use super::DemuxerError::*;
 //use io::byteio::*;
 //use frame::*;
-use formats::*;
+use crate::formats::*;
 use std::io::SeekFrom;
 use std::mem;
 use std::fmt;

diff --git a/src/detect.rs b/src/detect.rs
index 7dad84259ada8ef5a39756ad91ff9ec99a5a0c3c..0b606419b0c91f86b495482e56d0332e39d4de25 100644 (file)
--- a/src/detect.rs
+++ b/src/detect.rs
@@ -1,5 +1,5 @@
 use std::io::SeekFrom;
-use io::byteio::ByteReader;
+use crate::io::byteio::ByteReader;
 
 #[derive(Debug,Clone,Copy,PartialEq)]
 pub enum DetectionScore {
@@ -242,7 +242,7 @@ pub fn detect_format(name: &str, src: &mut ByteReader) -> Option<(&'static str,
 mod test {
     use super::*;
     use std::fs::File;
-    use io::byteio::*;
+    use crate::io::byteio::*;
 
     #[test]
     fn test_avi_detect() {

diff --git a/src/frame.rs b/src/frame.rs
index 4aaf27251b2be497e43bcbada9f996648b07ade4..2bfbe612d404d63cad674df3eb80fec7e2831691 100644 (file)
--- a/src/frame.rs
+++ b/src/frame.rs
@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use std::fmt;
 use std::rc::Rc;
 use std::cell::*;
-use formats::*;
+use crate::formats::*;
 
 #[allow(dead_code)]
 #[derive(Clone,Copy,PartialEq)]

diff --git a/src/io/codebook.rs b/src/io/codebook.rs
index 3d1e8d0e0112e2d2032788e6723bfb17f06014a0..78ef5ae0d142164106696f478916905da2514477 100644 (file)
--- a/src/io/codebook.rs
+++ b/src/io/codebook.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 use std::cmp::{max, min};
-use io::bitreader::BitReader;
+use super::bitreader::BitReader;
 
 #[derive(Debug)]
 pub enum CodebookError {
@@ -336,7 +336,7 @@ impl<CodeType: Copy+Into<u32>, IndexType> CodebookDescReader<IndexType> for Tabl
 #[cfg(test)]
 mod test {
     use super::*;
-    use io::bitreader::*;
+    use crate::io::bitreader::*;
 
     #[test]
     fn test_cb() {

diff --git a/src/io/intcode.rs b/src/io/intcode.rs
index a898a10444415dd419f90a940996c64cabbb29ac..8d879205762a0c50ba8a1dc6756821ab2aa0befe 100644 (file)
--- a/src/io/intcode.rs
+++ b/src/io/intcode.rs
@@ -1,4 +1,4 @@
-use io::bitreader::{BitReader, BitReaderError, BitReaderResult};
+use crate::io::bitreader::{BitReader, BitReaderError, BitReaderResult};
 
 #[derive(Debug)]
 pub enum UintCodeType {
@@ -131,7 +131,7 @@ impl<'a> IntCodeReader for BitReader<'a> {
 #[cfg(test)]
 mod test {
     use super::*;
-    use io::bitreader::*;
+    use crate::io::bitreader::*;
 
     #[test]
     fn int_codes() {

diff --git a/src/test/dec_video.rs b/src/test/dec_video.rs
index a2cf6e7166d88b1efff18b27e9f3cd94afcd22c7..4a181917ebeae8b75c676f06aa133b7bf38ccc89 100644 (file)
--- a/src/test/dec_video.rs
+++ b/src/test/dec_video.rs
@@ -1,9 +1,9 @@
 use std::fs::File;
 use std::io::prelude::*;
-use frame::*;
-use codecs::*;
-use demuxers::*;
-use io::byteio::*;
+use crate::frame::*;
+use crate::codecs::*;
+use crate::demuxers::*;
+use crate::io::byteio::*;
 use super::wavwriter::WavWriter;
 
 fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) {

diff --git a/src/test/wavwriter.rs b/src/test/wavwriter.rs
index a68075ea1a5f61fe44db0d31d00c102f7791390d..1cd9541754f662154c91a71248f6b1f0e20b266c 100644 (file)
--- a/src/test/wavwriter.rs
+++ b/src/test/wavwriter.rs
@@ -1,5 +1,5 @@
-use io::byteio::*;
-use frame::*;
+use crate::io::byteio::*;
+use crate::frame::*;
 use std::io::SeekFrom;
 
 pub struct WavWriter<'a> {