why?

Chunk
2 parents f4b5291c 04cd1acf
Showing 17 changed files with 36 additions and 56 deletions Show diff stats
common.pyc
mjpeg/base.pyc
mjpeg/dct.pyc
msteg/__init__.pyc
msteg/steganalysis/MPB.py
msteg/steganography/F3.pyc
msteg/steganography/LSB.pyc
res/extracted
res/extracted.jpg
res/lena128.png
res/lena64.png
res/lena64gray.jpg
res/steged.jpg
res/thulib.jpg
res/thulib2.jpg
test_steg.py
test_steganal.py
@@ -6,9 +6,10 @@ Yun Q. Shi, et al - A Markov Process Based Approach to Effective Attacking JPEG 
 import time
 import math
 import numpy as np
-from msteg import *
-import mjpeg
-from common import *
+
+from .. import *
+from ...mjpeg import Jpeg,colorMap
+from ...common import *
  
 import csv
 import json
@@ -96,7 +97,7 @@ class MPB(StegBase):
         :return: TPM - 3-D tensor, numpy array of size (2*T+1, 2*T+1, 4)
         """
  
-        # return self._get_trans_prob_mat_orig(ciq, T)
+        return self._get_trans_prob_mat_orig(ciq, T)
  
  
         # timer = Timer()
@@ -109,17 +110,17 @@ class MPB(StegBase):
         Fd = ciq[:-1, :-1] - ciq[1:, 1:]
         Fm = ciq[:-1, 1:] - ciq[1:, :-1]
  
-        Fh1 = Fh[:-1, :-1]
-        Fh2 = Fh[:-1, 1:]
+        Fh1 = Fh[:-1, :-1].ravel()
+        Fh2 = Fh[:-1, 1:].ravel()
  
-        Fv1 = Fv[:-1, :-1]
-        Fv2 = Fv[1:, :-1]
+        Fv1 = Fv[:-1, :-1].ravel()
+        Fv2 = Fv[1:, :-1].ravel()
  
-        Fd1 = Fd[:-1, :-1]
-        Fd2 = Fd[1:, 1:]
+        Fd1 = Fd[:-1, :-1].ravel()
+        Fd2 = Fd[1:, 1:].ravel()
  
-        Fm1 = Fm[:-1, 1:]
-        Fm2 = Fm[1:, :-1]
+        Fm1 = Fm[:-1, 1:].ravel()
+        Fm2 = Fm[1:, :-1].ravel()
  
  
  
@@ -131,7 +132,19 @@ class MPB(StegBase):
         # TPM[Fm1.ravel(), Fm2.ravel(), 3] += 1
         # timer.report()
  
-        # 1.936746s
+        # 1.459668s
+        # timer.mark()
+        # for i in range(len(Fh1)):
+        #     TPM[Fh1[i], Fh2[i], 0] += 1
+        # for i in range(len(Fv1)):
+        #     TPM[Fv1[i], Fv2[i], 1] += 1
+        # for i in range(len(Fd1)):
+        #     TPM[Fd1[i], Fd2[i], 2] += 1
+        # for i in range(len(Fm1)):
+        #     TPM[Fm1[i], Fm2[i], 3] += 1
+        # timer.report()
+
+        # 1.463982s
         # timer.mark()
         for m, n in zip(Fh1.ravel(), Fh2.ravel()):
             TPM[m, n, 0] += 1
@@ -1,34 +0,0 @@
-this is to be embeded.
-//0216
-vim of clang - https://github.com/JBakamovic/yavide
-# Usage overview
-Category                          | Shortcut                          | Description
---------------------------------- | --------------------------------- | ---------------------------------
-**Project management**            |                                   |
-                                  | `<Ctrl-s>n`	                      | Create new project
-                                  | `<Ctrl-s>i`                       | Import project with already existing code base
-                                  | `<Ctrl-s>o`                       | Open project
-                                  | `<Ctrl-s>c`                       | Close project
-                                  | `<Ctrl-s>s`                       | Save project
-                                  | `<Ctrl-s>d`                       | Delete project
-**Buffer management**             |                                   |
-                                  | `<Ctrl-c>`			              | Close current buffer
-                                  | `<Ctrl-s>`                        | Save current buffer
-                                  | `<Ctrl-Tab>`			          | Go to next buffer
-                                  | `<Ctrl-Shift-Tab>`	              | Go to previous buffer
-                                  | `<Ctrl-Down>`			          | Scroll buffer by one line (down)
-                                  | `<Ctrl-Up>`			              | Scroll buffer by one line (up)
-**Buffer modes**                  |                                   | 
-                                  | `<ESC>`                           | Enter the `normal` mode
-                                  | `<a>`					          | Enter the `insert` mode (append after cursor)
-                                  | `<i>`					          | Enter the `insert` mode (insert before cursor)
-                                  | `<Shift-v>`	                      |	Enter the `visual` mode (line mode)
-                                  | `<v>`					          | Enter the `visual` mode (character mode)
-**Buffer editing**                |                                   | 
-                                  | `<Ctrl-a>`                        | Select all
-                                  | `<Ctrl-x>`                        | Cut
-                                  | `<Ctrl-c>`                        | Copy
-                                  | `<Ctrl-v>`                        | Paste
-                                  | `<Ctrl-z>`                        | Undo
-                                  | `<Ctrl-r>`                        | Redo
-                                  | `<Shift-s>`				          | Delete the whole line
@@ -27,11 +27,12 @@ txtsample = [116, 104, 105, 115, 32, 105, 115, 32, 116, 111, 32, 98, 101, 32, 10
  
 if __name__ == '__main__':
     # f3test = F4.F4(sample_key)
-    f3test = F5.F5(sample_key, 3)
-    f3test.embed_raw_data("res/test3.jpg", "res/embeded", "res/steged.jpg")
+    f3test = F5.F5(sample_key, 1)
+    # f3test.embed_raw_data("res/test3.jpg", "res/embeded", "res/steged.jpg")
+    f3test.embed_raw_data("res/thulib2.jpg", "res/lena64gray.jpg", "res/steged.jpg")
  
     # f3test2 = F4.F4(sample_key)
-    f3test.extract_raw_data("res/steged.jpg", "res/extracted")
+    f3test.extract_raw_data("res/steged.jpg", "res/extracted.jpg")
     print f3test.get_key()
     pass
  
@@ -2,8 +2,8 @@ __author__ = &#39;chunk&#39;
  
 import numpy as np
 from mjpeg import *
-from  msteg.steganography import LSB, F3, F4, F5
-from  msteg.steganalysis import MPB
+from msteg.steganography import LSB, F3, F4, F5
+from msteg.steganalysis import MPB
  
 from common import *
  
@@ -29,14 +29,14 @@ if __name__ == &#39;__main__&#39;:
  
     timer.mark()
     ima = Jpeg("res/test3.jpg", key=sample_key)
-    timer.report() # 0.006490s
+    timer.report()  # 0.006490s
  
     ciq = ima.coef_arrays[colorMap['Y']]
-    timer.report() # 0.000019s
+    timer.report()  # 0.000019s
  
     mpbSteg = MPB.MPB()
-    tpm = mpbSteg.get_trans_prob_mat(ciq)
-    timer.report() # 1.365718s
+    tpm = mpbSteg._get_trans_prob_mat_orig(ciq)
+    timer.report()  # 1.365718s
  
     print tpm, tpm.shape
     pass
...	...	@@ -6,9 +6,10 @@ Yun Q. Shi, et al - A Markov Process Based Approach to Effective Attacking JPEG
6	6	import time
7	7	import math
8	8	import numpy as np
9		-from msteg import *
10		-import mjpeg
11		-from common import *
	9	+
	10	+from .. import *
	11	+from ...mjpeg import Jpeg,colorMap
	12	+from ...common import *
12	13
13	14	import csv
14	15	import json
...	...	@@ -96,7 +97,7 @@ class MPB(StegBase):
96	97	:return: TPM - 3-D tensor, numpy array of size (2T+1, 2T+1, 4)
97	98	"""
98	99
99		- # return self._get_trans_prob_mat_orig(ciq, T)
	100	+ return self._get_trans_prob_mat_orig(ciq, T)
100	101
101	102
102	103	# timer = Timer()
...	...	@@ -109,17 +110,17 @@ class MPB(StegBase):
109	110	Fd = ciq[:-1, :-1] - ciq[1:, 1:]
110	111	Fm = ciq[:-1, 1:] - ciq[1:, :-1]
111	112
112		- Fh1 = Fh[:-1, :-1]
113		- Fh2 = Fh[:-1, 1:]
	113	+ Fh1 = Fh[:-1, :-1].ravel()
	114	+ Fh2 = Fh[:-1, 1:].ravel()
114	115
115		- Fv1 = Fv[:-1, :-1]
116		- Fv2 = Fv[1:, :-1]
	116	+ Fv1 = Fv[:-1, :-1].ravel()
	117	+ Fv2 = Fv[1:, :-1].ravel()
117	118
118		- Fd1 = Fd[:-1, :-1]
119		- Fd2 = Fd[1:, 1:]
	119	+ Fd1 = Fd[:-1, :-1].ravel()
	120	+ Fd2 = Fd[1:, 1:].ravel()
120	121
121		- Fm1 = Fm[:-1, 1:]
122		- Fm2 = Fm[1:, :-1]
	122	+ Fm1 = Fm[:-1, 1:].ravel()
	123	+ Fm2 = Fm[1:, :-1].ravel()
123	124
124	125
125	126
...	...	@@ -131,7 +132,19 @@ class MPB(StegBase):
131	132	# TPM[Fm1.ravel(), Fm2.ravel(), 3] += 1
132	133	# timer.report()
133	134
134		- # 1.936746s
	135	+ # 1.459668s
	136	+ # timer.mark()
	137	+ # for i in range(len(Fh1)):
	138	+ # TPM[Fh1[i], Fh2[i], 0] += 1
	139	+ # for i in range(len(Fv1)):
	140	+ # TPM[Fv1[i], Fv2[i], 1] += 1
	141	+ # for i in range(len(Fd1)):
	142	+ # TPM[Fd1[i], Fd2[i], 2] += 1
	143	+ # for i in range(len(Fm1)):
	144	+ # TPM[Fm1[i], Fm2[i], 3] += 1
	145	+ # timer.report()
	146	+
	147	+ # 1.463982s
135	148	# timer.mark()
136	149	for m, n in zip(Fh1.ravel(), Fh2.ravel()):
137	150	TPM[m, n, 0] += 1
...	...
...	...	@@ -1,34 +0,0 @@
1		-this is to be embeded.
2		-//0216
3		-vim of clang - https://github.com/JBakamovic/yavide
4		-# Usage overview
5		-Category \| Shortcut \| Description
6		---------------------------------- \| --------------------------------- \| ---------------------------------
7		-Project management \| \|
8		- \| `<Ctrl-s>n` \| Create new project
9		- \| `<Ctrl-s>i` \| Import project with already existing code base
10		- \| `<Ctrl-s>o` \| Open project
11		- \| `<Ctrl-s>c` \| Close project
12		- \| `<Ctrl-s>s` \| Save project
13		- \| `<Ctrl-s>d` \| Delete project
14		-Buffer management \| \|
15		- \| `<Ctrl-c>` \| Close current buffer
16		- \| `<Ctrl-s>` \| Save current buffer
17		- \| `<Ctrl-Tab>` \| Go to next buffer
18		- \| `<Ctrl-Shift-Tab>` \| Go to previous buffer
19		- \| `<Ctrl-Down>` \| Scroll buffer by one line (down)
20		- \| `<Ctrl-Up>` \| Scroll buffer by one line (up)
21		-Buffer modes \| \|
22		- \| `<ESC>` \| Enter the `normal` mode
23		- \| `<a>` \| Enter the `insert` mode (append after cursor)
24		- \| `<i>` \| Enter the `insert` mode (insert before cursor)
25		- \| `<Shift-v>` \| Enter the `visual` mode (line mode)
26		- \| `<v>` \| Enter the `visual` mode (character mode)
27		-Buffer editing \| \|
28		- \| `<Ctrl-a>` \| Select all
29		- \| `<Ctrl-x>` \| Cut
30		- \| `<Ctrl-c>` \| Copy
31		- \| `<Ctrl-v>` \| Paste
32		- \| `<Ctrl-z>` \| Undo
33		- \| `<Ctrl-r>` \| Redo
34		- \| `<Shift-s>` \| Delete the whole line
...	...	@@ -27,11 +27,12 @@ txtsample = [116, 104, 105, 115, 32, 105, 115, 32, 116, 111, 32, 98, 101, 32, 10
27	27
28	28	if __name__ == '__main__':
29	29	# f3test = F4.F4(sample_key)
30		- f3test = F5.F5(sample_key, 3)
31		- f3test.embed_raw_data("res/test3.jpg", "res/embeded", "res/steged.jpg")
	30	+ f3test = F5.F5(sample_key, 1)
	31	+ # f3test.embed_raw_data("res/test3.jpg", "res/embeded", "res/steged.jpg")
	32	+ f3test.embed_raw_data("res/thulib2.jpg", "res/lena64gray.jpg", "res/steged.jpg")
32	33
33	34	# f3test2 = F4.F4(sample_key)
34		- f3test.extract_raw_data("res/steged.jpg", "res/extracted")
	35	+ f3test.extract_raw_data("res/steged.jpg", "res/extracted.jpg")
35	36	print f3test.get_key()
36	37	pass
37	38
...	...
...	...	@@ -2,8 +2,8 @@ __author__ = 'chunk'
2	2
3	3	import numpy as np
4	4	from mjpeg import *
5		-from msteg.steganography import LSB, F3, F4, F5
6		-from msteg.steganalysis import MPB
	5	+from msteg.steganography import LSB, F3, F4, F5
	6	+from msteg.steganalysis import MPB
7	7
8	8	from common import *
9	9
...	...	@@ -29,14 +29,14 @@ if __name__ == '__main__':
29	29
30	30	timer.mark()
31	31	ima = Jpeg("res/test3.jpg", key=sample_key)
32		- timer.report() # 0.006490s
	32	+ timer.report() # 0.006490s
33	33
34	34	ciq = ima.coef_arrays[colorMap['Y']]
35		- timer.report() # 0.000019s
	35	+ timer.report() # 0.000019s
36	36
37	37	mpbSteg = MPB.MPB()
38		- tpm = mpbSteg.get_trans_prob_mat(ciq)
39		- timer.report() # 1.365718s
	38	+ tpm = mpbSteg._get_trans_prob_mat_orig(ciq)
	39	+ timer.report() # 1.365718s
40	40
41	41	print tpm, tpm.shape
42	42	pass
...	...