Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replaced regex - keep track of position when matching instead #6

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

replaced regex - keep track of position when matching instead #6

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cae423e
replaced regex - keep track of position when matching instead
mueslimak3r Apr 4, 2022
b771f43
Merge branch 'master' into frame-comparison-fix
mueslimak3r Apr 4, 2022
3da7afe
fix
mueslimak3r Apr 4, 2022
8710272
Merge remote-tracking branch 'origin/frame-comparison-fix' into frame…
mueslimak3r Apr 4, 2022
0729291
fix
mueslimak3r Apr 4, 2022
ce36682
start at the first frame so [-k:] is actually back to front
mueslimak3r Apr 8, 2022
9ffe757
guard against index out of bounds when comparing fingerprints
mueslimak3r Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,30 +52,35 @@ def create_video_fingerprint(path):
return video_fingerprint


def get_equal_frames(print1, print2):
def get_equal_frames(print1, print2, start1, start2):
equal_frames = []

for j in range(0, int(len(print1) / 16 / check_frame)):
if print1[j * 16 * check_frame:j * 16 * check_frame + 16] == print2[
j * 16 * check_frame:j * 16 * check_frame + 16]:
equal_frames.append(print1[j * 16 * check_frame:j * 16 * check_frame + 16])
j * 16 * check_frame:j * 16 * check_frame + 16]:
equal_frames.append(((int(start1 + (j * check_frame)), int(start2 + (j * check_frame))), print1[j * 16 * check_frame:j * 16 * check_frame + 16]))
return equal_frames


def get_start_end(print1, print2):
if print1 == '' or print2 == '':
return (0, 0), (0, 0)

search_range = min(len(print1), len(print2))

highest_equal_frames = []
for k in range(0, int(len(print1) / 16)):
equal_frames = get_equal_frames(print1[-k * 16:], print2)
for k in range(1, int(search_range / 16)):
equal_frames = get_equal_frames(print1[-k * 16:], print2, int(search_range / 16) - k, 0)
if len(equal_frames) > len(highest_equal_frames):
highest_equal_frames = equal_frames
equal_frames = get_equal_frames(print1, print2[k * 16:])
equal_frames = get_equal_frames(print1, print2[k * 16:], 0, k)
if len(equal_frames) > len(highest_equal_frames):
highest_equal_frames = equal_frames
regex_string = ".*?".join(highest_equal_frames) + "){1,}"
regex_string = regex_string[:-21] + '(' + regex_string[-21:]
p = re.compile(regex_string)
search = re.search(p, "".join(print1))
search2 = re.search(p, "".join(print2))
return (int(search.start() / 16), int(search.end() / 16)), (int(search2.start() / 16), int(search2.end() / 16))

if highest_equal_frames:
return (highest_equal_frames[0][0][0], highest_equal_frames[-1][0][0]), (highest_equal_frames[0][0][1], highest_equal_frames[-1][0][1])
else:
return (0, 0), (0, 0)


def get_or_create_fingerprint(file):
Expand Down