From 9e13e8c78ed69bb7afcd49abe8bf69340dc06223 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 3 Dec 2014 20:30:46 +0100
Subject: Bug 1106 - Bitstream: Simplify 'msbFirst' case for bulk operations /
Add setting of stream position (optional)
- Add setting position entry, optionally supported,
e.g. ByteBufferStream and ByteArrayStream
- Remove 'msbFirst' parameter on all 'bulk' read/write
operations.
These methods use LSB-first always, allowing proper
stream access of data w/ different bit-sizes.
Data is now read/write as little-endian
and swapped accordingly.
Optimizations are adopted for LSB-first operations.
This change removes API confusion/bugs:
- removes one decision (parameter)
- removes the data reversion case
- removes bugs w/ different bit-sizes
---
.../com/jogamp/common/util/TestBitstream03.java | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
(limited to 'src/junit/com/jogamp/common/util/TestBitstream03.java')
diff --git a/src/junit/com/jogamp/common/util/TestBitstream03.java b/src/junit/com/jogamp/common/util/TestBitstream03.java
index 4dfb3d7..a6129d8 100644
--- a/src/junit/com/jogamp/common/util/TestBitstream03.java
+++ b/src/junit/com/jogamp/common/util/TestBitstream03.java
@@ -47,8 +47,8 @@ import org.junit.runners.MethodSorters;
* Test {@link Bitstream} w/ int16 read/write access w/ semantics
* as well as with aligned and unaligned access.
* <ul>
- * <li>{@link Bitstream#readUInt16(boolean, boolean)}</li>
- * <li>{@link Bitstream#writeInt16(boolean, boolean, short)}</li>
+ * <li>{@link Bitstream#readUInt16(boolean)}</li>
+ * <li>{@link Bitstream#writeInt16(boolean, short)}</li>
* </ul>
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -78,21 +78,23 @@ public class TestBitstream03 extends SingletonJunitCase {
final boolean bigEndian = ByteOrder.BIG_ENDIAN == bb.order();
System.err.println("XXX Test01Int16BitsAligned: byteOrder "+byteOrder+" (bigEndian "+bigEndian+"), value "+val16+", "+toHexBinaryString(val16, 16));
bb.putShort(0, val16);
+ dumpData("TestData.1: ", bb, 0, 2);
final Bitstream.ByteBufferStream bbs = new Bitstream.ByteBufferStream(bb);
final Bitstream<ByteBuffer> bs = new Bitstream<ByteBuffer>(bbs, false /* outputMode */);
{
- final short r16 = (short) bs.readUInt16(true /* msbFirst */, bigEndian);
+ final short r16 = (short) bs.readUInt16(bigEndian);
System.err.println("Read16.1 "+r16+", "+toHexBinaryString(r16, 16));
Assert.assertEquals(val16, r16);
}
// Test with written bitstream value
bs.setStream(bs.getSubStream(), true /* outputMode */);
- bs.writeInt16(true /* msbFirst */, bigEndian, val16);
+ bs.writeInt16(bigEndian, val16);
bs.setStream(bs.getSubStream(), false /* outputMode */); // switch to input-mode, implies flush()
+ dumpData("TestData.2: ", bb, 0, 2);
{
- final short r16 = (short) bs.readUInt16(true /* msbFirst */, bigEndian);
+ final short r16 = (short) bs.readUInt16(bigEndian);
System.err.println("Read16.2 "+r16+", "+toHexBinaryString(r16, 16));
Assert.assertEquals(val16, r16);
}
@@ -135,12 +137,13 @@ public class TestBitstream03 extends SingletonJunitCase {
// Test with written bitstream value
final Bitstream.ByteBufferStream bbs = new Bitstream.ByteBufferStream(bb);
final Bitstream<ByteBuffer> bs = new Bitstream<ByteBuffer>(bbs, true /* outputMode */);
- bs.writeBits31(true /* msbFirst */, preBits, 0);
- bs.writeInt16(true /* msbFirst */, bigEndian, val16);
+ bs.writeBits31(preBits, 0);
+ bs.writeInt16(bigEndian, val16);
bs.setStream(bs.getSubStream(), false /* outputMode */); // switch to input-mode, implies flush()
+ dumpData("TestData.1: ", bb, 0, byteCount);
- final int rPre = (short) bs.readBits31(true /* msbFirst */, preBits);
- final short r16 = (short) bs.readUInt16(true /* msbFirst */, bigEndian);
+ final int rPre = (short) bs.readBits31(preBits);
+ final short r16 = (short) bs.readUInt16(bigEndian);
System.err.println("ReadPre "+rPre+", "+toBinaryString(rPre, preBits));
System.err.println("Read16 "+r16+", "+toHexBinaryString(r16, 16));
Assert.assertEquals(val16, r16);
--
cgit v1.2.3