refactor the common directory by moving src/com to src/

Author: rainliu

src/api/frame.rs

@@ -1,8 +1,7 @@
-use crate::com::plane::*;
-use crate::com::region::*;
-use crate::com::*;
-
 use super::*;
+use crate::def::*;
+use crate::plane::*;
+use crate::region::*;
 
 use std::fmt;
 

src/api/mod.rs

@@ -8,8 +8,8 @@ use num_traits::FromPrimitive;
 
 pub mod frame;
 
-use crate::com::*;
 use crate::dec::*;
+use crate::def::*;
 use frame::*;
 
 /*****************************************************************************

src/dec/bsr.rs

@@ -1,7 +1,7 @@
 use log::*;
 
 use crate::api::EvcError;
-use crate::com::tracer::*;
+use crate::tracer::*;
 
 /*
  * bitstream structure for decoder.

src/dec/eco.rs

@@ -1,12 +1,11 @@
 use super::bsr::*;
 use super::sbac::EvcdSbac;
 use super::{EvcdCore, EvcdCtx};
-
 use crate::api::{EvcError, NaluType, SliceType};
-use crate::com::tbl::*;
-use crate::com::tracer::*;
-use crate::com::util::*;
-use crate::com::*;
+use crate::def::*;
+use crate::tbl::*;
+use crate::tracer::*;
+use crate::util::*;
 
 use log::*;
 
@@ -291,7 +290,7 @@ pub(crate) fn evcd_eco_pred_mode(
     tree_cons: &TREE_CONS,
 ) -> Result<PredMode, EvcError> {
     let mut pred_mode_flag = false;
-    let pred_mode_constraint = tree_cons.mode_cons; //TODO: Tim changed place
+    let pred_mode_constraint = tree_cons.mode_cons;
 
     if pred_mode_constraint == MODE_CONS::eAll {
         let ctx_flag = ctx_flags[CtxNevIdx::CNID_PRED_MODE as usize] as usize;

src/dec/mod.rs

@@ -1,15 +1,15 @@
 use super::api::frame::*;
 use super::api::*;
-use super::com::df::*;
-use super::com::ipred::*;
-use super::com::itdq::*;
-use super::com::mc::*;
-use super::com::picman::*;
-use super::com::recon::*;
-use super::com::tbl::*;
-use super::com::tracer::*;
-use super::com::util::*;
-use super::com::*;
+use super::def::*;
+use super::df::*;
+use super::ipred::*;
+use super::itdq::*;
+use super::mc::*;
+use super::picman::*;
+use super::recon::*;
+use super::tbl::*;
+use super::tracer::*;
+use super::util::*;
 
 use std::cell::RefCell;
 use std::rc::Rc;
@@ -25,47 +25,6 @@ use sbac::*;
 /* evc decoder magic code */
 pub(crate) const EVCD_MAGIC_CODE: u32 = 0x45565944; /* EVYD */
 
-#[derive(Clone)]
-pub(crate) struct LcuSplitMode {
-    pub(crate) data:
-        [[[SplitMode; MAX_CU_CNT_IN_LCU]; BlockShape::NUM_BLOCK_SHAPE as usize]; NUM_CU_DEPTH],
-}
-
-impl Default for LcuSplitMode {
-    fn default() -> Self {
-        LcuSplitMode {
-            data: [[[SplitMode::NO_SPLIT; MAX_CU_CNT_IN_LCU]; BlockShape::NUM_BLOCK_SHAPE as usize];
-                NUM_CU_DEPTH],
-        }
-    }
-}
-
-#[derive(Clone)]
-pub(crate) struct CUBuffer<T: Default + Copy> {
-    pub(crate) data: [[T; MAX_CU_DIM]; N_C],
-}
-
-impl<T: Default + Copy> Default for CUBuffer<T> {
-    fn default() -> Self {
-        CUBuffer {
-            data: [[T::default(); MAX_CU_DIM]; N_C],
-        }
-    }
-}
-
-#[derive(Clone)]
-pub(crate) struct NBBuffer<T: Default + Copy> {
-    pub(crate) data: [[[T; MAX_CU_SIZE * 3]; N_REF]; N_C],
-}
-
-impl<T: Default + Copy> Default for NBBuffer<T> {
-    fn default() -> Self {
-        NBBuffer {
-            data: [[[T::default(); MAX_CU_SIZE * 3]; N_REF]; N_C],
-        }
-    }
-}
-
 /*****************************************************************************
  * CORE information used for decoding process.
  *

src/dec/sbac.rs

@@ -1,9 +1,8 @@
 use super::bsr::*;
-
+use super::EvcdCtx;
 use crate::api::*;
-use crate::com::tracer::*;
-use crate::com::*;
-use crate::dec::EvcdCtx;
+use crate::def::*;
+use crate::tracer::*;
 
 /*****************************************************************************
  * SBAC structure

src/com/mod.rs src/def.rssrc/com/mod.rs renamed to src/def.rs

@@ -1,15 +1,3 @@
-pub(crate) mod df;
-pub(crate) mod ipred;
-pub(crate) mod itdq;
-pub(crate) mod mc;
-pub(crate) mod picman;
-pub(crate) mod plane;
-pub(crate) mod recon;
-pub(crate) mod region;
-pub(crate) mod tbl;
-pub(crate) mod tracer;
-pub(crate) mod util;
-
 use crate::api::*;
 
 /*****************************************************************************
@@ -844,3 +832,44 @@ pub(crate) struct TREE_CONS_NEW {
     pub(crate) tree_type: TREE_TYPE,
     pub(crate) mode_cons: MODE_CONS,
 }
+
+#[derive(Clone)]
+pub(crate) struct LcuSplitMode {
+    pub(crate) data:
+        [[[SplitMode; MAX_CU_CNT_IN_LCU]; BlockShape::NUM_BLOCK_SHAPE as usize]; NUM_CU_DEPTH],
+}
+
+impl Default for LcuSplitMode {
+    fn default() -> Self {
+        LcuSplitMode {
+            data: [[[SplitMode::NO_SPLIT; MAX_CU_CNT_IN_LCU]; BlockShape::NUM_BLOCK_SHAPE as usize];
+                NUM_CU_DEPTH],
+        }
+    }
+}
+
+#[derive(Clone)]
+pub(crate) struct CUBuffer<T: Default + Copy> {
+    pub(crate) data: [[T; MAX_CU_DIM]; N_C],
+}
+
+impl<T: Default + Copy> Default for CUBuffer<T> {
+    fn default() -> Self {
+        CUBuffer {
+            data: [[T::default(); MAX_CU_DIM]; N_C],
+        }
+    }
+}
+
+#[derive(Clone)]
+pub(crate) struct NBBuffer<T: Default + Copy> {
+    pub(crate) data: [[[T; MAX_CU_SIZE * 3]; N_REF]; N_C],
+}
+
+impl<T: Default + Copy> Default for NBBuffer<T> {
+    fn default() -> Self {
+        NBBuffer {
+            data: [[[T::default(); MAX_CU_SIZE * 3]; N_REF]; N_C],
+        }
+    }
+}

src/com/df.rs src/df.rssrc/com/df.rs renamed to src/df.rs

@@ -1,9 +1,9 @@
+use super::def::*;
 use super::picman::*;
+use super::region::PlaneRegionMut;
 use super::tbl::*;
 use super::tracer::*;
 use super::util::*;
-use super::*;
-use crate::com::region::PlaneRegionMut;
 
 use std::cmp::*;
 

src/com/ipred.rs src/ipred.rssrc/com/ipred.rs renamed to src/ipred.rs

@@ -1,6 +1,6 @@
+use super::def::*;
 use super::region::*;
 use super::tbl::*;
-use super::*;
 
 pub(crate) fn evc_get_mpm_b(
     x_scu: u16,

src/com/itdq.rs src/itdq.rssrc/com/itdq.rs renamed to src/itdq.rs

@@ -1,7 +1,7 @@
+use super::def::*;
 use super::tbl::*;
 use super::tracer::*;
 use super::util::*;
-use super::*;
 
 use std::ops::{Add, Sub};