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

Jump to bottom

Add multi-stream saving feature #3864

Merged
merged 4 commits into from
Jul 4, 2021
Merged

Add multi-stream saving feature #3864

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14e2d38
Added the recording feature for multiple streams
ketan-b Jul 2, 2021
ac92ea5
Cleanup list lengths
glenn-jocher Jul 3, 2021
9f50ec3
batch size variable
glenn-jocher Jul 4, 2021
c1c47ec
Update datasets.py
glenn-jocher Jul 4, 2021
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
19 changes: 11 additions & 8 deletions detect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,10 @@ def run(weights='yolov5s.pt', # model.pt path(s)
modelc.load_state_dict(torch.load('resnet50.pt', map_location=device)['model']).to(device).eval()

# Set Dataloader
vid_path, vid_writer = None, None
if source.endswith('.txt'):
with open(source, 'r') as f:
sources_len = len([x.strip() for x in f.read().strip().splitlines() if len(x.strip())])
vid_path, vid_writer = [None]*sources_len, [None]*sources_len
if webcam:
view_img = check_imshow()
cudnn.benchmark = True # set True to speed up constant image size inference
Expand Down Expand Up @@ -156,21 +159,21 @@ def run(weights='yolov5s.pt', # model.pt path(s)
# Save results (image with detections)
if save_img:
if dataset.mode == 'image':
cv2.imwrite(save_path, im0)
cv2.imwrite(save_path, im0)
else: # 'video' or 'stream'
if vid_path != save_path: # new video
vid_path = save_path
if isinstance(vid_writer, cv2.VideoWriter):
vid_writer.release() # release previous video writer
if vid_path[i] != save_path: # new video
vid_path[i] = save_path
if isinstance(vid_writer[i], cv2.VideoWriter):
vid_writer[i].release() # release previous video writer
if vid_cap: # video
fps = vid_cap.get(cv2.CAP_PROP_FPS)
w = int(vid_cap.get(cv2.CAP_PROP_FRAME_WIDTH))
h = int(vid_cap.get(cv2.CAP_PROP_FRAME_HEIGHT))
else: # stream
fps, w, h = 30, im0.shape[1], im0.shape[0]
save_path += '.mp4'
vid_writer = cv2.VideoWriter(save_path, cv2.VideoWriter_fourcc(*'mp4v'), fps, (w, h))
vid_writer.write(im0)
vid_writer[i] = cv2.VideoWriter(save_path, cv2.VideoWriter_fourcc(*'mp4v'), fps, (w, h))
vid_writer[i].write(im0)

if save_txt or save_img:
s = f"\n{len(list(save_dir.glob('labels/*.txt')))} labels saved to {save_dir / 'labels'}" if save_txt else ''
Expand Down