From 4a20967b99c01f1179fd156710ecf77f3f3fce98 Mon Sep 17 00:00:00 2001 From: Chunk Date: Wed, 1 Apr 2015 18:08:50 +0800 Subject: [PATCH] staged. --- common.pyc | Bin 2989 -> 0 bytes mjpeg/__init__.py | 10 ++++------ mjpeg/__init__.pyc | Bin 15407 -> 0 bytes mjpeg/base.pyc | Bin 1786 -> 0 bytes mjpeg/dct.pyc | Bin 2471 -> 0 bytes msteg/steganalysis/MPB.py | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/common.pyc b/common.pyc index 080bc31..27f6487 100644 Binary files a/common.pyc and b/common.pyc differ diff --git a/mjpeg/__init__.py b/mjpeg/__init__.py index 85c0bf9..f56ee4f 100644 --- a/mjpeg/__init__.py +++ b/mjpeg/__init__.py @@ -303,21 +303,19 @@ class Jpeg(Jsteg): Ref - http://stackoverflow.com/questions/2024947/is-it-possible-to-tell-the-quality-level-of-a-jpeg,http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=20235 """ - table0 = self.quant_tables[0].ravel() - table1 = self.quant_tables[1].ravel() - sum0 = np.sum(table0) - sum1 = np.sum(table1) + sum0 = np.sum(self.quant_tables[0]) + sum1 = np.sum(self.quant_tables[1]) quality = None if sum0 != None: if sum1 != None: sum = sum0 + sum1 - qvalue = table0[2] + table0[53] + table1[0] + table1[-1] + qvalue = self.quant_tables[0].ravel()[2] + self.quant_tables[0].ravel()[53] + self.quant_tables[1].ravel()[0] + self.quant_tables[1].ravel()[-1] hashtable = bi_hash sumtable = bi_sum else: sum = sum0 - qvalue = table0[2] + table0[53] + qvalue = self.quant_tables[0].ravel()[2] + self.quant_tables[0].ravel()[53] hashtable = single_hash sumtable = single_sum else: diff --git a/mjpeg/__init__.pyc b/mjpeg/__init__.pyc index f1c0083..9f7e0ca 100644 Binary files a/mjpeg/__init__.pyc and b/mjpeg/__init__.pyc differ diff --git a/mjpeg/base.pyc b/mjpeg/base.pyc index 14d629c..6303c0e 100644 Binary files a/mjpeg/base.pyc and b/mjpeg/base.pyc differ diff --git a/mjpeg/dct.pyc b/mjpeg/dct.pyc index e29441f..889ad69 100644 Binary files a/mjpeg/dct.pyc and b/mjpeg/dct.pyc differ diff --git a/msteg/steganalysis/MPB.py b/msteg/steganalysis/MPB.py index 2592cd6..15cc8fc 100644 --- a/msteg/steganalysis/MPB.py +++ b/msteg/steganalysis/MPB.py @@ -87,7 +87,7 @@ class MPB(StegBase): # 1.422729s return TPM - @jit + # @jit def get_trans_prob_mat(self, ciq, T=4): """ Calculate Transition Probability Matrix. -- libgit2 0.21.2