askill
/
Video-Summary
mirror of https://github.com/Askill/Video-Summary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

multiple contours

This commit is contained in:
Askill 2020-10-11 22:54:12 +02:00
parent 04187cf9ac
commit ec4812bee1
4 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Exporter.py
View File

@ -45,16 +45,16 @@ class Exporter:
continue continue
frame = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB) frame = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
frame2 = underlay
for layer in layers: for layer in layers:
if layer.startFrame <= frameCount and layer.startFrame + len(layer.bounds) > frameCount: if layer.startFrame <= frameCount and layer.startFrame + len(layer.bounds) > frameCount:
(x, y, w, h) = layer.bounds[frameCount - layer.startFrame] for (x, y, w, h) in layer.bounds[frameCount - layer.startFrame]:
factor = videoReader.w / self.resizeWidth factor = videoReader.w / self.resizeWidth
x = int(x * factor) x = int(x * factor)
y = int(y * factor) y = int(y * factor)
w = int(w * factor) w = int(w * factor)
h = int(h * factor) h = int(h * factor)
frame2 = underlay
frame2[y:y+h, x:x+w] = frame[y:y+h, x:x+w] frame2[y:y+h, x:x+w] = frame[y:y+h, x:x+w]
writer.append_data(frame2) writer.append_data(frame2)
@ -84,6 +84,7 @@ class Exporter:
frame = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB) frame = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
for layer in layers: for layer in layers:
if layer.startFrame <= frameCount and layer.startFrame + len(layer.bounds) > frameCount: if layer.startFrame <= frameCount and layer.startFrame + len(layer.bounds) > frameCount:
for (x, y, w, h) in layer.bounds[frameCount - layer.startFrame]:
(x, y, w, h) = layer.bounds[frameCount - layer.startFrame] (x, y, w, h) = layer.bounds[frameCount - layer.startFrame]
factor = videoReader.w / self.resizeWidth factor = videoReader.w / self.resizeWidth
x = int(x * factor) x = int(x * factor)

11
Layer.py
View File

@ -2,7 +2,7 @@ import numpy as np
import cv2 import cv2
import imutils import imutils
class Layer: class Layer:
#data = [(contour, (x,y,w,h)),] #bounds = [(contour, (x,y,w,h)),]
startFrame = None startFrame = None
lastFrame = None lastFrame = None
@ -14,14 +14,17 @@ class Layer:
self.data = [] self.data = []
self.bounds = [] self.bounds = []
self.bounds.append(data) self.bounds.append([data])
#print("Layer constructed") #print("Layer constructed")
def add(self, frameNumber, data): def add(self, frameNumber, data):
if not (self.startFrame + len(self.bounds) - frameNumber < 0): if not self.startFrame + len(self.bounds) < frameNumber:
if len(self.bounds[self.startFrame - frameNumber]) >= 1:
self.bounds[self.startFrame - frameNumber].append(data)
else:
self.lastFrame = frameNumber self.lastFrame = frameNumber
self.bounds.append([data])
self.bounds.append(data)
self.getLength() self.getLength()
def getLength(self): def getLength(self):

12
LayerFactory.py
View File

@ -23,9 +23,9 @@ class LayerFactory:
layers = [] layers = []
for i, layer in enumerate(self.layers): for i, layer in enumerate(self.layers):
checks = 0 checks = 0
if abs(self.layers[i].bounds[0][0] - self.layers[i].bounds[-1][0]) < 5: if abs(self.layers[i].bounds[0][0][0] - self.layers[i].bounds[-1][0][0]) < 5:
checks += 1 checks += 1
if abs(self.layers[i].bounds[0][1] - self.layers[i].bounds[-1][1]) < 5: if abs(self.layers[i].bounds[0][0][1] - self.layers[i].bounds[-1][0][1]) < 5:
checks += 1 checks += 1
if checks <= 2: if checks <= 2:
layers.append(layer) layers.append(layer)
@ -71,11 +71,15 @@ class LayerFactory:
oldLayerIDs.append(i) oldLayerIDs.append(i)
continue continue
(x2,y2,w2,h2) = self.layers[i].bounds[-1] for bounds in self.layers[i].bounds[-1]:
if bounds is None:
break
(x2,y2,w2,h2) = bounds
if self.contoursOverlay((x-tol,y+h+tol), (x+w+tol,y-tol), (x2,y2+h2), (x2+w2,y2)): if self.contoursOverlay((x-tol,y+h+tol), (x+w+tol,y-tol), (x2,y2+h2), (x2+w2,y2)):
self.layers[i].add(frameNumber, (x,y,w,h)) self.layers[i].add(frameNumber, (x,y,w,h))
foundLayer = True foundLayer = True
break #break
if not foundLayer: if not foundLayer:
self.layers.append(Layer(frameNumber, (x,y,w,h))) self.layers.append(Layer(frameNumber, (x,y,w,h)))

2
main.py
View File

@ -15,7 +15,7 @@ def demo():
start = time.time() start = time.time()
config = Config() config = Config()
config["inputPath"] = os.path.join(os.path.dirname(__file__), "./generate test footage/3.mp4") config["inputPath"] = os.path.join(os.path.dirname(__file__), "./generate test footage/out.mp4")
config["outputPath"] = os.path.join(os.path.dirname(__file__), "./output/short.mp4") config["outputPath"] = os.path.join(os.path.dirname(__file__), "./output/short.mp4")
contours = ContourExtractor(config).extractContours() contours = ContourExtractor(config).extractContours()