diff --git a/msteg/__init__.pyc b/msteg/__init__.pyc index 6fc0478..a997d19 100644 Binary files a/msteg/__init__.pyc and b/msteg/__init__.pyc differ diff --git a/msteg/steganalysis/MPB.py b/msteg/steganalysis/MPB.py index 15cc8fc..483c14d 100644 --- a/msteg/steganalysis/MPB.py +++ b/msteg/steganalysis/MPB.py @@ -7,9 +7,11 @@ import time import math import numpy as np -from .. import * -from ...mjpeg import Jpeg,colorMap -from ...common import * +# from .. import * +import mjpeg +from msteg import * +from mjpeg import Jpeg, colorMap +from common import * import csv import json @@ -43,14 +45,14 @@ class MPB(StegBase): :param T: signed integer, usually 1~7 :return: TPM - 3-D tensor, numpy array of size (2*T+1, 2*T+1, 4) """ - ciq = np.absolute(ciq).clip(0, T) + ciq = np.absolute(ciq) TPM = np.zeros((2 * T + 1, 2 * T + 1, 4), np.float64) # Fh = np.diff(ciq, axis=-1) # Fv = np.diff(ciq, axis=0) - Fh = ciq[:-1, :-1] - ciq[:-1, 1:] - Fv = ciq[:-1, :-1] - ciq[1:, :-1] - Fd = ciq[:-1, :-1] - ciq[1:, 1:] - Fm = ciq[:-1, 1:] - ciq[1:, :-1] + Fh = (ciq[:-1, :-1] - ciq[:-1, 1:]).clip(-T, T) + Fv = (ciq[:-1, :-1] - ciq[1:, :-1]).clip(-T, T) + Fd = (ciq[:-1, :-1] - ciq[1:, 1:]).clip(-T, T) + Fm = (ciq[:-1, 1:] - ciq[1:, :-1]).clip(-T, T) Fh1 = Fh[:-1, :-1] Fh2 = Fh[:-1, 1:] @@ -101,14 +103,21 @@ class MPB(StegBase): # timer = Timer() - ciq = np.absolute(ciq).clip(0, T) + # ciq = np.absolute(ciq).clip(0, T) # Fool !!! + ciq = np.absolute(ciq) TPM = np.zeros((2 * T + 1, 2 * T + 1, 4), np.float64) # Fh = np.diff(ciq, axis=-1) # Fv = np.diff(ciq, axis=0) - Fh = ciq[:-1, :-1] - ciq[:-1, 1:] - Fv = ciq[:-1, :-1] - ciq[1:, :-1] - Fd = ciq[:-1, :-1] - ciq[1:, 1:] - Fm = ciq[:-1, 1:] - ciq[1:, :-1] + + # Fh = ciq[:-1, :-1] - ciq[:-1, 1:] + # Fv = ciq[:-1, :-1] - ciq[1:, :-1] + # Fd = ciq[:-1, :-1] - ciq[1:, 1:] + # Fm = ciq[:-1, 1:] - ciq[1:, :-1] + + Fh = (ciq[:-1, :-1] - ciq[:-1, 1:]).clip(-T, T) + Fv = (ciq[:-1, :-1] - ciq[1:, :-1]).clip(-T, T) + Fd = (ciq[:-1, :-1] - ciq[1:, 1:]).clip(-T, T) + Fm = (ciq[:-1, 1:] - ciq[1:, :-1]).clip(-T, T) Fh1 = Fh[:-1, :-1].ravel() Fh2 = Fh[:-1, 1:].ravel() @@ -135,7 +144,7 @@ class MPB(StegBase): # 1.459668s # timer.mark() # for i in range(len(Fh1)): - # TPM[Fh1[i], Fh2[i], 0] += 1 + # 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)): diff --git a/msteg/steganalysis/MPB.pyc b/msteg/steganalysis/MPB.pyc index e99c559..90c866a 100644 Binary files a/msteg/steganalysis/MPB.pyc and b/msteg/steganalysis/MPB.pyc differ diff --git a/msteg/steganography/F3.pyc b/msteg/steganography/F3.pyc index cf85a0a..365bb2c 100644 Binary files a/msteg/steganography/F3.pyc and b/msteg/steganography/F3.pyc differ diff --git a/msteg/steganography/LSB.pyc b/msteg/steganography/LSB.pyc index f5ae787..4c17fe3 100644 Binary files a/msteg/steganography/LSB.pyc and b/msteg/steganography/LSB.pyc differ diff --git a/res/lopez5.jpg b/res/lopez5.jpg new file mode 100644 index 0000000..3aa6e1d Binary files /dev/null and b/res/lopez5.jpg differ -- libgit2 0.21.2