staged.

Chunk
1 parent 79907f0e
Showing 6 changed files with 5 additions and 7 deletions Show diff stats
common.pyc
mjpeg/__init__.py
mjpeg/__init__.pyc
mjpeg/base.pyc
mjpeg/dct.pyc
msteg/steganalysis/MPB.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:
@@ -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.
...	...	@@ -303,21 +303,19 @@ class Jpeg(Jsteg):
303	303
304	304	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
305	305	"""
306		- table0 = self.quant_tables[0].ravel()
307		- table1 = self.quant_tables[1].ravel()
308		- sum0 = np.sum(table0)
309		- sum1 = np.sum(table1)
	306	+ sum0 = np.sum(self.quant_tables[0])
	307	+ sum1 = np.sum(self.quant_tables[1])
310	308	quality = None
311	309
312	310	if sum0 != None:
313	311	if sum1 != None:
314	312	sum = sum0 + sum1
315		- qvalue = table0[2] + table0[53] + table1[0] + table1[-1]
	313	+ 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]
316	314	hashtable = bi_hash
317	315	sumtable = bi_sum
318	316	else:
319	317	sum = sum0
320		- qvalue = table0[2] + table0[53]
	318	+ qvalue = self.quant_tables[0].ravel()[2] + self.quant_tables[0].ravel()[53]
321	319	hashtable = single_hash
322	320	sumtable = single_sum
323	321	else:
...	...
...	...	@@ -87,7 +87,7 @@ class MPB(StegBase):
87	87	# 1.422729s
88	88	return TPM
89	89
90		- @jit
	90	+ # @jit
91	91	def get_trans_prob_mat(self, ciq, T=4):
92	92	"""
93	93	Calculate Transition Probability Matrix.
...	...