diff --git a/include/crc.h b/include/crc.h
new file mode 100644
index 0000000..bb85571
--- /dev/null
+++ b/include/crc.h
@@ -0,0 +1,48 @@
+#ifndef __CRC_H
+#define __CRC_H
+
+/* CRC16 CCIT 'false' table, similar to what can be found in the Kernel */
+static const uint16_t ccitt_hash[] = {
+	0x0000,0x1021,0x2042,0x3063,0x4084,0x50a5,0x60c6,0x70e7,
+	0x8108,0x9129,0xa14a,0xb16b,0xc18c,0xd1ad,0xe1ce,0xf1ef,
+	0x1231,0x0210,0x3273,0x2252,0x52b5,0x4294,0x72f7,0x62d6,
+	0x9339,0x8318,0xb37b,0xa35a,0xd3bd,0xc39c,0xf3ff,0xe3de,
+	0x2462,0x3443,0x0420,0x1401,0x64e6,0x74c7,0x44a4,0x5485,
+	0xa56a,0xb54b,0x8528,0x9509,0xe5ee,0xf5cf,0xc5ac,0xd58d,
+	0x3653,0x2672,0x1611,0x0630,0x76d7,0x66f6,0x5695,0x46b4,
+	0xb75b,0xa77a,0x9719,0x8738,0xf7df,0xe7fe,0xd79d,0xc7bc,
+	0x48c4,0x58e5,0x6886,0x78a7,0x0840,0x1861,0x2802,0x3823,
+	0xc9cc,0xd9ed,0xe98e,0xf9af,0x8948,0x9969,0xa90a,0xb92b,
+	0x5af5,0x4ad4,0x7ab7,0x6a96,0x1a71,0x0a50,0x3a33,0x2a12,
+	0xdbfd,0xcbdc,0xfbbf,0xeb9e,0x9b79,0x8b58,0xbb3b,0xab1a,
+	0x6ca6,0x7c87,0x4ce4,0x5cc5,0x2c22,0x3c03,0x0c60,0x1c41,
+	0xedae,0xfd8f,0xcdec,0xddcd,0xad2a,0xbd0b,0x8d68,0x9d49,
+	0x7e97,0x6eb6,0x5ed5,0x4ef4,0x3e13,0x2e32,0x1e51,0x0e70,
+	0xff9f,0xefbe,0xdfdd,0xcffc,0xbf1b,0xaf3a,0x9f59,0x8f78,
+	0x9188,0x81a9,0xb1ca,0xa1eb,0xd10c,0xc12d,0xf14e,0xe16f,
+	0x1080,0x00a1,0x30c2,0x20e3,0x5004,0x4025,0x7046,0x6067,
+	0x83b9,0x9398,0xa3fb,0xb3da,0xc33d,0xd31c,0xe37f,0xf35e,
+	0x02b1,0x1290,0x22f3,0x32d2,0x4235,0x5214,0x6277,0x7256,
+	0xb5ea,0xa5cb,0x95a8,0x8589,0xf56e,0xe54f,0xd52c,0xc50d,
+	0x34e2,0x24c3,0x14a0,0x0481,0x7466,0x6447,0x5424,0x4405,
+	0xa7db,0xb7fa,0x8799,0x97b8,0xe75f,0xf77e,0xc71d,0xd73c,
+	0x26d3,0x36f2,0x0691,0x16b0,0x6657,0x7676,0x4615,0x5634,
+	0xd94c,0xc96d,0xf90e,0xe92f,0x99c8,0x89e9,0xb98a,0xa9ab,
+	0x5844,0x4865,0x7806,0x6827,0x18c0,0x08e1,0x3882,0x28a3,
+	0xcb7d,0xdb5c,0xeb3f,0xfb1e,0x8bf9,0x9bd8,0xabbb,0xbb9a,
+	0x4a75,0x5a54,0x6a37,0x7a16,0x0af1,0x1ad0,0x2ab3,0x3a92,
+	0xfd2e,0xed0f,0xdd6c,0xcd4d,0xbdaa,0xad8b,0x9de8,0x8dc9,
+	0x7c26,0x6c07,0x5c64,0x4c45,0x3ca2,0x2c83,0x1ce0,0x0cc1,
+	0xef1f,0xff3e,0xcf5d,0xdf7c,0xaf9b,0xbfba,0x8fd9,0x9ff8,
+	0x6e17,0x7e36,0x4e55,0x5e74,0x2e93,0x3eb2,0x0ed1,0x1ef0,
+};
+
+uint16_t crc16_ccitt(const uint8_t* buffer, size_t size)
+{
+	uint16_t crc = 0xffff;
+	while (size-- > 0)
+		crc = (crc << 8) ^ ccitt_hash[((crc >> 8) ^ *(buffer++)) & 0x00ff];
+
+	return crc;
+}
+#endif
diff --git a/src/libhsdaoh.c b/src/libhsdaoh.c
index 7eccca8..6bc207a 100644
--- a/src/libhsdaoh.c
+++ b/src/libhsdaoh.c
@@ -41,11 +41,13 @@
 #endif
 
 #include <inttypes.h>
+#include <endian.h>
 #include <libusb.h>
 #include <libuvc/libuvc.h>
 //#include <math.h>
 #include <hsdaoh_i2c.h>
 #include <hsdaoh.h>
+#include <crc.h>
 
 /*
  * All libusb callback functions should be marked with the LIBUSB_CALL macro
@@ -85,6 +87,7 @@ struct hsdaoh_dev {
 	int frames_since_error;
 	int discard_start_frames;
 	uint16_t last_frame_cnt;
+	uint16_t last_crc;
 	uint16_t idle_cnt;
 	bool stream_synced;
 
@@ -110,11 +113,19 @@ static hsdaoh_adapter_t known_devices[] = {
 	{ 0x345f, 0x2131, "MS2131" },
 };
 
+enum crc_config {
+	CRC_NONE,
+	CRC16_PREV_LINE,
+};
+
 typedef struct
 {
 	uint32_t magic;
 	uint16_t framecounter;
 	uint8_t  pack_state;
+	uint8_t  crc_config;
+	uint8_t  data_width;
+	uint8_t  data_signedness;
 } __attribute__((packed, aligned(1))) metadata_t;
 
 #define CTRL_TIMEOUT	300
@@ -584,7 +595,7 @@ void hsdaoh_process_frame(hsdaoh_dev_t *dev, uint8_t *data, int size)
 	metadata_t meta;
 	hsdaoh_extract_metadata(data, &meta, dev->width);
 
-	if (meta.magic != 0xda7acab1)
+	if (le32toh(meta.magic) != 0xda7acab1)
 		return;
 
 	/* drop duplicated frames */
@@ -605,7 +616,8 @@ void hsdaoh_process_frame(hsdaoh_dev_t *dev, uint8_t *data, int size)
 		uint8_t *line_dat = data + (dev->width * 2 * i);
 
 		/* extract number of payload words from reserved field at end of line */
-		uint16_t payload_len = (line_dat[dev->width*2-1] << 8) | line_dat[dev->width*2-2];
+		uint16_t payload_len = le16toh(((uint16_t *)line_dat)[dev->width - 1]);
+		uint16_t crc = le16toh(((uint16_t *)line_dat)[dev->width - 2]);
 
 		/* we only use 12 bits, the upper 4 bits are reserved for the metadata */
 		payload_len &= 0x0fff;
@@ -617,8 +629,15 @@ void hsdaoh_process_frame(hsdaoh_dev_t *dev, uint8_t *data, int size)
 			return;
 		}
 
-		uint16_t idle_len = (dev->width-1) - payload_len;
-		frame_errors += hsdaoh_check_idle_cnt(dev, (uint16_t *)line_dat + payload_len, idle_len);
+		if (meta.crc_config == CRC_NONE) {
+			uint16_t idle_len = (dev->width-1) - payload_len;
+			frame_errors += hsdaoh_check_idle_cnt(dev, (uint16_t *)line_dat + payload_len, idle_len);
+		} else if (meta.crc_config == CRC16_PREV_LINE) {
+			if ((crc != dev->last_crc) && dev->stream_synced)
+				frame_errors++;
+
+			dev->last_crc = crc16_ccitt(line_dat, dev->width * 2);
+		}
 
 		if (payload_len > 0)
 			memmove(data + frame_payload_bytes, line_dat, payload_len * sizeof(uint16_t));
@@ -630,7 +649,7 @@ void hsdaoh_process_frame(hsdaoh_dev_t *dev, uint8_t *data, int size)
 		dev->cb(data, frame_payload_bytes, dev->cb_ctx);
 
 	if (frame_errors && dev->stream_synced) {
-		fprintf(stderr,"%d idle counter errors, %d frames since last error\n", frame_errors, dev->frames_since_error);
+		fprintf(stderr,"%d frame errors, %d frames since last error\n", frame_errors, dev->frames_since_error);
 		dev->frames_since_error = 0;
 	} else
 		dev->frames_since_error++;