From 753360e479b4d918c6fbbb673f13a4cf55d6291c Mon Sep 17 00:00:00 2001
From: Moinak Ghosh <moinakg@gmail.com>
Date: Wed, 19 Nov 2014 20:19:16 +0530
Subject: [PATCH] Tweak some data type settings.

---
 adaptive_compress.c        | 5 +++--
 utils/phash/extensions.h   | 6 +++---
 utils/phash/extensions.txt | 6 +++---
 utils/utils.h              | 5 +++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/adaptive_compress.c b/adaptive_compress.c
index 65a0475..ccbee77 100644
--- a/adaptive_compress.c
+++ b/adaptive_compress.c
@@ -247,7 +247,8 @@ is_bsc_type(int btype)
 {
 	int stype = PC_SUBTYPE(btype);
 	return ((stype == TYPE_MARKUP) | (stype == TYPE_BMP) | (stype == TYPE_DNA_SEQ) |
-	    (stype == TYPE_MP4) | (stype == TYPE_FLAC) | (stype == TYPE_AVI) | (stype == TYPE_DICOM));
+	    (stype == TYPE_MP4) | (stype == TYPE_FLAC) | (stype == TYPE_AVI) |
+	    (stype == TYPE_DICOM) | (stype == TYPE_MEDIA_BSC));
 }
 
 int
@@ -286,7 +287,7 @@ adapt_compress(void *src, uint64_t srclen, void *dst,
 #ifdef ENABLE_PC_LIBBSC
 	bsc_type = is_bsc_type(btype);
 #endif
-	if (is_incompressible(btype)) {
+	if (is_incompressible(btype) && !bsc_type) {
 		rv = lz4_compress(src, srclen, dst, dstlen, level, chdr, btype, adat->lz4_data);
 		if (rv < 0)
 			return (rv);
diff --git a/utils/phash/extensions.h b/utils/phash/extensions.h
index 9c33ddf..cea6b4e 100644
--- a/utils/phash/extensions.h
+++ b/utils/phash/extensions.h
@@ -115,11 +115,11 @@ struct ext_entry {
 	{"jpeg"	, TYPE_BINARY|TYPE_COMPRESSED|TYPE_JPEG,        4},
 	{"mjpeg"	, TYPE_BINARY|TYPE_COMPRESSED|TYPE_MJPEG,        5},
 	{"png"	, TYPE_BINARY|TYPE_COMPRESSED|TYPE_COMPRESSED_GZ,        3},
-	{"mp3"	, TYPE_BINARY|TYPE_COMPRESSED,        3},
-	{"wma"	, TYPE_BINARY|TYPE_COMPRESSED,        3},
+	{"mp3"	, TYPE_BINARY,        3},
+	{"wma"	, TYPE_BINARY,        3},
 	{"divx"	, TYPE_BINARY|TYPE_COMPRESSED,        4},
 	{"mp4"	, TYPE_BINARY|TYPE_COMPRESSED|TYPE_MP4,        3},
-	{"aac"	, TYPE_BINARY|TYPE_COMPRESSED,        3},
+	{"aac"	, TYPE_BINARY,        3},
 	{"m4a"	, TYPE_BINARY|TYPE_COMPRESSED,        3},
 	{"m4p"	, TYPE_BINARY|TYPE_COMPRESSED,        3},
 	{"ofs"	, TYPE_BINARY|TYPE_COMPRESSED,        3},
diff --git a/utils/phash/extensions.txt b/utils/phash/extensions.txt
index 03a8057..3c5bb8a 100644
--- a/utils/phash/extensions.txt
+++ b/utils/phash/extensions.txt
@@ -105,11 +105,11 @@ jpg,TYPE_BINARY|TYPE_COMPRESSED|TYPE_JPEG
 jpeg,TYPE_BINARY|TYPE_COMPRESSED|TYPE_JPEG
 mjpeg,TYPE_BINARY|TYPE_COMPRESSED|TYPE_MJPEG
 png,TYPE_BINARY|TYPE_COMPRESSED|TYPE_COMPRESSED_GZ
-mp3,TYPE_BINARY|TYPE_COMPRESSED
-wma,TYPE_BINARY|TYPE_COMPRESSED
+mp3,TYPE_BINARY
+wma,TYPE_BINARY
 divx,TYPE_BINARY|TYPE_COMPRESSED
 mp4,TYPE_BINARY|TYPE_COMPRESSED|TYPE_MP4
-aac,TYPE_BINARY|TYPE_COMPRESSED
+aac,TYPE_BINARY
 m4a,TYPE_BINARY|TYPE_COMPRESSED
 m4p,TYPE_BINARY|TYPE_COMPRESSED
 ofs,TYPE_BINARY|TYPE_COMPRESSED
diff --git a/utils/utils.h b/utils/utils.h
index 52b0647..44b22d5 100644
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -277,7 +277,7 @@ typedef enum {
 	/*
 	 * Sub-types.
 	 */
-#define	NUM_SUB_TYPES	33
+#define	NUM_SUB_TYPES	34
 	TYPE_EXE32 = 8,
 	TYPE_JPEG = 16,
 	TYPE_MARKUP = 24,
@@ -310,7 +310,8 @@ typedef enum {
 	TYPE_PNM = 240,
 	TYPE_PACKPNM = 248,
 	TYPE_WAV = 256,
-	TYPE_ENGLISH = 264
+	TYPE_ENGLISH = 264,
+	TYPE_MEDIA_BSC = 272
 } data_type_t;
 
 /*