Merge pull request #48 from LebedevRI/develop

Source tree reorg

Author: LebedevRI

Cargo.toml

@@ -2,22 +2,22 @@
 resolver = "3"
 members = [
     "src",
+    "src/bitstream/bitstream/decoder",
+    "src/bitstream/bitstream/encoder",
+    "src/bitstream/bitstreamcache",
+    "src/bitstream/bitstreams",
+    "src/bitstream/bytestream/decoder",
+    "src/bitstream/bytestream/encoder",
+    "src/codecs/packed/decoder",
+    "src/codecs/packed/encoder",
     "src/common",
     "src/memory",
     "src/memory/endianness",
-    "src/memory/bitstream",
-    "src/memory/bitvacuumer",
-    "src/memory/bitstreamcache",
-    "src/memory/bitstreamer",
-    "src/memory/variable_length_load",
     "src/memory/fixed_length_load",
-    "src/memory/bytevacuumer",
-    "src/memory/bytestreamer",
+    "src/memory/variable_length_load",
     "src/misc/md5",
     "src/std",
     "src/std/ndslice",
-    "src/codecs/packed/encoder",
-    "src/codecs/packed/decoder",
 ]
 
 [workspace.package]

src/bitstream/bitstream/decoder/Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+name = "rawspeed-bitstream-bitstream-decoder"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+documentation.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+
+[lints]
+workspace = true
+
+[dependencies]
+rawspeed-bitstream-bitstreamcache = { path = "../../bitstreamcache" }
+rawspeed-bitstream-bitstreams = { path = "../../bitstreams" }
+rawspeed-common = { path = "../../../common" }
+rawspeed-memory-endianness = { path = "../../../memory/endianness" }
+rawspeed-memory-fixed_length_load = { path = "../../../memory/fixed_length_load" }
+rawspeed-memory-variable_length_load = { path = "../../../memory/variable_length_load" }
+
+[lib]
+path = "mod.rs"

src/memory/bitstreamer/bitstreamer/jpeg/mod.rs renamed to src/bitstream/bitstream/decoder/bitstreamer/jpeg/mod.rs

@@ -5,12 +5,12 @@ use super::CopyFromSlice;
 use super::FromNeBytes;
 use super::LoadFromSlice;
 
+use rawspeed_bitstream_bitstreamcache::bitstreamcache::BitStreamCache;
+use rawspeed_bitstream_bitstreams::bitstreams::BitOrder;
+use rawspeed_bitstream_bitstreams::bitstreams::BitOrderJPEG;
+use rawspeed_bitstream_bitstreams::bitstreams::BitOrderTrait;
+use rawspeed_bitstream_bitstreams::bitstreams::BitStreamTraits;
 use rawspeed_common::common::Bitwidth;
-use rawspeed_memory_bitstream::bitstream::BitOrder;
-use rawspeed_memory_bitstream::bitstream::BitOrderJPEG;
-use rawspeed_memory_bitstream::bitstream::BitOrderTrait;
-use rawspeed_memory_bitstream::bitstream::BitStreamTraits;
-use rawspeed_memory_bitstreamcache::bitstreamcache::BitStreamCache;
 use rawspeed_memory_endianness::endianness::SwapBytes;
 use rawspeed_memory_endianness::endianness::get_host_endianness;
 use rawspeed_memory_variable_length_load::variable_length_load::VariableLengthLoad;

src/memory/bitstreamer/bitstreamer/jpeg/tests.rs renamed to src/bitstream/bitstream/decoder/bitstreamer/jpeg/tests.rs

@@ -2,8 +2,8 @@ use super::BitStreamerBase;
 use super::BitStreamerTraits;
 use super::BitStreamerUseDefaultCacheFillImpl;
 
-use rawspeed_memory_bitstream::bitstream::BitOrder;
-use rawspeed_memory_bitstream::bitstream::BitOrderLSB;
+use rawspeed_bitstream_bitstreams::bitstreams::BitOrder;
+use rawspeed_bitstream_bitstreams::bitstreams::BitOrderLSB;
 
 impl BitStreamerTraits for BitOrderLSB {
     const TAG: BitOrder = BitOrder::LSB;

src/memory/bitstreamer/bitstreamer/lsb/mod.rs renamed to src/bitstream/bitstream/decoder/bitstreamer/lsb/mod.rs

@@ -1,11 +1,11 @@
 use core::marker::PhantomData;
 use core::ops::RangeFull;
+use rawspeed_bitstream_bitstreamcache::bitstreamcache::BitStreamCache;
+use rawspeed_bitstream_bitstreams::bitstreams::BitOrder;
+use rawspeed_bitstream_bitstreams::bitstreams::BitOrderTrait;
+use rawspeed_bitstream_bitstreams::bitstreams::BitStreamTraits;
 use rawspeed_common::bit_transmutation::FromNeBytes;
 use rawspeed_common::common::Bitwidth;
-use rawspeed_memory_bitstream::bitstream::BitOrder;
-use rawspeed_memory_bitstream::bitstream::BitOrderTrait;
-use rawspeed_memory_bitstream::bitstream::BitStreamTraits;
-use rawspeed_memory_bitstreamcache::bitstreamcache::BitStreamCache;
 use rawspeed_memory_endianness::endianness::SwapBytes;
 use rawspeed_memory_endianness::endianness::get_host_endianness;
 use rawspeed_memory_fixed_length_load::fixed_length_load::CopyFromSlice;

src/memory/bitstreamer/bitstreamer/lsb/tests.rs renamed to src/bitstream/bitstream/decoder/bitstreamer/lsb/tests.rs

@@ -2,8 +2,8 @@ use super::BitStreamerBase;
 use super::BitStreamerTraits;
 use super::BitStreamerUseDefaultCacheFillImpl;
 
-use rawspeed_memory_bitstream::bitstream::BitOrder;
-use rawspeed_memory_bitstream::bitstream::BitOrderMSB;
+use rawspeed_bitstream_bitstreams::bitstreams::BitOrder;
+use rawspeed_bitstream_bitstreams::bitstreams::BitOrderMSB;
 
 impl BitStreamerTraits for BitOrderMSB {
     const TAG: BitOrder = BitOrder::MSB;

src/memory/bitstreamer/bitstreamer/mod.rs renamed to src/bitstream/bitstream/decoder/bitstreamer/mod.rs

@@ -2,8 +2,8 @@ use super::BitStreamerBase;
 use super::BitStreamerTraits;
 use super::BitStreamerUseDefaultCacheFillImpl;
 
-use rawspeed_memory_bitstream::bitstream::BitOrder;
-use rawspeed_memory_bitstream::bitstream::BitOrderMSB16;
+use rawspeed_bitstream_bitstreams::bitstreams::BitOrder;
+use rawspeed_bitstream_bitstreams::bitstreams::BitOrderMSB16;
 
 impl BitStreamerTraits for BitOrderMSB16 {
     const TAG: BitOrder = BitOrder::MSB16;