2 files changed, 82 insertions, 2 deletions

diff --git a/src/bitstream/bitstream.cpp b/src/bitstream/bitstream.cpp
index d916f52..e8f1857 100644
--- a/src/bitstream/bitstream.cpp
+++ b/src/bitstream/bitstream.cpp
@@ -11,7 +11,6 @@ TBitStream::TBitStream(const char* buf, int size)
 {}
 TBitStream::TBitStream()
 {}
-
 void TBitStream::Write(unsigned long long val, int n) {
 	if (n > 23 || n < 0)
 		abort();
@@ -29,10 +28,30 @@ void TBitStream::Write(unsigned long long val, int n) {
 
 	for (int i = 0; i < n/8 + (overlap ? 2 : 1); ++i) {
 		Buf[bytesPos+i] |= t.bytes[7-i];
+
+  //      std::cout << "bufPos: "<< bytesPos+i << " buf: " << (int)Buf[bytesPos+i] << std::endl;
 	}
 
     BitsUsed += n;
 }
+/*
+void TBitStream::Write(unsigned long long val, int n) {
+    if (n > 23 || n < 0)
+        abort();
+    const int bitsLeft = Buf.size() * 8 - BitsUsed;
+    const int bitsReq = n - bitsLeft;
+    const int bytesPos = BitsUsed / 8;
+    const int overlap = BitsUsed % 8;
+
+    if (overlap || bitsReq >= 0) {
+        Buf.resize(Buf.size() + (bitsReq / 8 + (overlap ? 2 : 1 )), 0);
+    }
+    TMix t;
+    t.ull   = (val << (64 - n)) >> overlap;
+    *(unsigned long long*)&Buf[bytesPos-8] |= t.ull;
+    BitsUsed += n;
+}
+*/
 unsigned long long TBitStream::Read(int n) {
 	if (n >23 || n < 0)
 		abort();
diff --git a/src/bitstream/bitstream_ut.cpp b/src/bitstream/bitstream_ut.cpp
index 109570b..7e246ca 100644
--- a/src/bitstream/bitstream_ut.cpp
+++ b/src/bitstream/bitstream_ut.cpp
@@ -11,8 +11,10 @@ TEST(TBitStream, DefaultConstructor) {
 TEST(TBitStream, SimpleWriteRead) {
     TBitStream bs;
     bs.Write(5, 3);
-    EXPECT_EQ(3, bs.GetSizeInBits());
+    bs.Write(true, 1);
+    EXPECT_EQ(4, bs.GetSizeInBits());
     EXPECT_EQ(5, bs.Read(3));
+    EXPECT_EQ(true, bs.Read(1));
 }
 
 TEST(TBisStream, OverlapWriteRead) {
@@ -30,6 +32,7 @@ TEST(TBisStream, OverlapWriteRead) {
     EXPECT_EQ(212, bs.Read(22));
     EXPECT_EQ(323, bs.Read(22));
 }
+
 TEST(TBisStream, OverlapWriteRead2) {
     TBitStream bs;
     bs.Write(2, 2);
@@ -41,6 +44,64 @@ TEST(TBisStream, OverlapWriteRead2) {
     EXPECT_EQ(10003, bs.Read(16));
 }
 
+TEST(TBisStream, OverlapWriteRead3) {
+    TBitStream bs;
+    bs.Write(40, 6);
+    bs.Write(3, 2);
+    bs.Write(0, 3);
+    bs.Write(0, 3);
+    bs.Write(0, 3);
+    bs.Write(0, 3);
+
+    bs.Write(3, 5);
+    bs.Write(1, 2);
+    bs.Write(1, 1);
+    bs.Write(1, 1);
+    bs.Write(1, 1);
+    bs.Write(1, 1);
+
+    bs.Write(0, 3);
+    bs.Write(4, 3);
+    bs.Write(35, 6);
+    bs.Write(25, 6);
+    bs.Write(3, 3);
+    bs.Write(32, 6);
+    bs.Write(29, 6);
+    bs.Write(3, 3);
+    bs.Write(36, 6);
+    bs.Write(49, 6);
+
+
+
+
+    EXPECT_EQ(40, bs.Read(6));
+    EXPECT_EQ(3, bs.Read(2));
+    EXPECT_EQ(0, bs.Read(3));
+    EXPECT_EQ(0, bs.Read(3));
+    EXPECT_EQ(0, bs.Read(3));
+    EXPECT_EQ(0, bs.Read(3));
+    EXPECT_EQ(3, bs.Read(5));
+
+    EXPECT_EQ(1, bs.Read(2));
+    EXPECT_EQ(1, bs.Read(1));
+    EXPECT_EQ(1, bs.Read(1));
+    EXPECT_EQ(1, bs.Read(1));
+    EXPECT_EQ(1, bs.Read(1));
+
+    EXPECT_EQ(0, bs.Read(3));
+    EXPECT_EQ(4, bs.Read(3));
+    EXPECT_EQ(35, bs.Read(6));
+    EXPECT_EQ(25, bs.Read(6));
+    EXPECT_EQ(3, bs.Read(3));
+    EXPECT_EQ(32, bs.Read(6));
+    EXPECT_EQ(29, bs.Read(6));
+    EXPECT_EQ(3, bs.Read(3));
+    EXPECT_EQ(36, bs.Read(6));
+    EXPECT_EQ(49, bs.Read(6));
+
+}
+
+
 TEST(TBisStream, SignWriteRead) {
     TBitStream bs;
     bs.Write(MakeSign(-2, 3), 3);