Add CAP_PROP_FRAME_COUNT for YouTube sources (#3193)
This commit is contained in:
1 parent
ae53f50ae7
commit
36b0a9e7d0
1 file changed
+4
-3
+4
-3
@@ -172,7 +172,7 @@ class LoadImages: # for inference
|
|||||||
ret_val, img0 = self.cap.read()
|
ret_val, img0 = self.cap.read()
|
||||||
|
|
||||||
self.frame += 1
|
self.frame += 1
|
||||||
print(f'video {self.count + 1}/{self.nf} ({self.frame}/{self.nframes}) {path}: ', end='')
|
print(f'video {self.count + 1}/{self.nf} ({self.frame}/{self.frames}) {path}: ', end='')
|
||||||
|
|
||||||
else:
|
else:
|
||||||
# Read image
|
# Read image
|
||||||
@@ -193,7 +193,7 @@ class LoadImages: # for inference
|
|||||||
def new_video(self, path):
|
def new_video(self, path):
|
||||||
self.frame = 0
|
self.frame = 0
|
||||||
self.cap = cv2.VideoCapture(path)
|
self.cap = cv2.VideoCapture(path)
|
||||||
self.nframes = int(self.cap.get(cv2.CAP_PROP_FRAME_COUNT))
|
self.frames = int(self.cap.get(cv2.CAP_PROP_FRAME_COUNT))
|
||||||
|
|
||||||
def __len__(self):
|
def __len__(self):
|
||||||
return self.nf # number of files
|
return self.nf # number of files
|
||||||
@@ -285,10 +285,11 @@ class LoadStreams: # multiple IP or RTSP cameras
|
|||||||
w = int(cap.get(cv2.CAP_PROP_FRAME_WIDTH))
|
w = int(cap.get(cv2.CAP_PROP_FRAME_WIDTH))
|
||||||
h = int(cap.get(cv2.CAP_PROP_FRAME_HEIGHT))
|
h = int(cap.get(cv2.CAP_PROP_FRAME_HEIGHT))
|
||||||
self.fps = cap.get(cv2.CAP_PROP_FPS) % 100
|
self.fps = cap.get(cv2.CAP_PROP_FPS) % 100
|
||||||
|
self.frames = int(cap.get(cv2.CAP_PROP_FRAME_COUNT))
|
||||||
|
|
||||||
_, self.imgs[i] = cap.read() # guarantee first frame
|
_, self.imgs[i] = cap.read() # guarantee first frame
|
||||||
thread = Thread(target=self.update, args=([i, cap]), daemon=True)
|
thread = Thread(target=self.update, args=([i, cap]), daemon=True)
|
||||||
print(f' success ({w}x{h} at {self.fps:.2f} FPS).')
|
print(f" success ({f'{self.frames} frames ' if self.frames else ''}{w}x{h} at {self.fps:.2f} FPS).")
|
||||||
thread.start()
|
thread.start()
|
||||||
print('') # newline
|
print('') # newline
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user