Skip to content

Commit

Permalink
Fix LoadStreams() dataloader frame skip issue (ultralytics#3833)
Browse files Browse the repository at this point in the history
* Update datasets.py to read every 4th frame of streams

* Update datasets.py

Co-authored-by: Glenn Jocher <[email protected]>
  • Loading branch information
feras-oughali and glenn-jocher authored Jun 30, 2021
1 parent 7c70737 commit b577fa4
Showing 1 changed file with 7 additions and 24 deletions.
31 changes: 7 additions & 24 deletions utils/datasets.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import hashlib
import json
import logging
import math
import os
import random
import shutil
Expand All @@ -15,6 +14,7 @@
from threading import Thread

import cv2
import math
import numpy as np
import torch
import torch.nn.functional as F
Expand Down Expand Up @@ -210,15 +210,8 @@ class LoadWebcam: # for inference
def __init__(self, pipe='0', img_size=640, stride=32):
self.img_size = img_size
self.stride = stride

if pipe.isnumeric():
pipe = eval(pipe) # local camera
# pipe = 'rtsp://192.168.1.64/1' # IP camera
# pipe = 'rtsp://username:[email protected]/1' # IP camera with login
# pipe = 'http://wmccpinetop.axiscam.net/mjpg/video.mjpg' # IP golf camera

self.pipe = pipe
self.cap = cv2.VideoCapture(pipe) # video capture object
self.pipe = eval(pipe) if pipe.isnumeric() else pipe
self.cap = cv2.VideoCapture(self.pipe) # video capture object
self.cap.set(cv2.CAP_PROP_BUFFERSIZE, 3) # set buffer size

def __iter__(self):
Expand All @@ -233,18 +226,8 @@ def __next__(self):
raise StopIteration

# Read frame
if self.pipe == 0: # local camera
ret_val, img0 = self.cap.read()
img0 = cv2.flip(img0, 1) # flip left-right
else: # IP camera
n = 0
while True:
n += 1
self.cap.grab()
if n % 30 == 0: # skip frames
ret_val, img0 = self.cap.retrieve()
if ret_val:
break
ret_val, img0 = self.cap.read()
img0 = cv2.flip(img0, 1) # flip left-right

# Print
assert ret_val, f'Camera Error {self.pipe}'
Expand Down Expand Up @@ -308,12 +291,12 @@ def __init__(self, sources='streams.txt', img_size=640, stride=32):

def update(self, i, cap):
# Read stream `i` frames in daemon thread
n, f = 0, self.frames[i]
n, f, read = 0, self.frames[i], 1 # frame number, frame array, inference every 'read' frame
while cap.isOpened() and n < f:
n += 1
# _, self.imgs[index] = cap.read()
cap.grab()
if n % 4: # read every 4th frame
if n % read == 0:
success, im = cap.retrieve()
self.imgs[i] = im if success else self.imgs[i] * 0
time.sleep(1 / self.fps[i]) # wait time
Expand Down

0 comments on commit b577fa4

Please sign in to comment.