aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Wang2024-05-14 11:22:33 -0400
committerAnthony Wang2024-05-14 11:22:33 -0400
commit170c85404be222056f5c5077600a16add00b5e28 (patch)
tree0a7f71ff121c4e29104be91fec5dece477d1d919
parentb5a725174ad85271b239a9b97c71c470bb949f5a (diff)
Thicker edges for mixing video
-rw-r--r--decoder.py2
-rw-r--r--encoder.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/decoder.py b/decoder.py
index b5d198e..5b3178c 100644
--- a/decoder.py
+++ b/decoder.py
@@ -43,7 +43,7 @@ def find_corner(A, f):
return np.average(np.where(mask), axis=1), np.average(A[mask], axis=0).astype(np.float64)
-if args.input.isdecimal():
+if isinstance(args.input, str) and args.input.isdecimal():
args.input = int(args.input)
cap = cv2.VideoCapture(args.input)
data = None
diff --git a/encoder.py b/encoder.py
index ab0ab1e..dd3b53c 100644
--- a/encoder.py
+++ b/encoder.py
@@ -90,7 +90,7 @@ if args.mix:
vidframe[hscale * (args.height - cheight) :, wscale * (args.width - cwidth) :] = 0
frame = np.repeat(np.repeat(mkframe(packets[i]), hscale, 0), wscale, 1)
# Set edges in original video to black
- frame[(32 <= vidframe) & (vidframe < 224)] = 0
+ frame[vidframe % 255 != 0] = 0
out.write(cv2.cvtColor(frame, cv2.COLOR_RGB2BGR))
i = (i + 1) % len(packets)
else: