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

Add Window mode and Video suppport(Separate Files) #7

Merged
merged 12 commits into from
Apr 7, 2018
Merged

Add Window mode and Video suppport(Separate Files) #7

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e385142
Add Adjusting Aspect4Frame
tanakataiki Apr 6, 2018
6dcddec
Add Realtime Detection Using Opencv
tanakataiki Apr 6, 2018
13ef5ad
Add fps
tanakataiki Apr 6, 2018
d8dc67c
Add video support
tanakataiki Apr 7, 2018
4d131ae
Add Window mode
tanakataiki Apr 7, 2018
57b1896
remove main and move to yolovideo
tanakataiki Apr 7, 2018
0387018
Separate and Add RealTime Detection Part 4 Usage
tanakataiki Apr 7, 2018
98b7f74
Add yolo_video
tanakataiki Apr 7, 2018
2f57ac5
Add image_detection part here
tanakataiki Apr 7, 2018
06b6f5c
weight file name and comment change
tanakataiki Apr 7, 2018
76eeb12
Add TODO
tanakataiki Apr 7, 2018
e7ebe62
Merge branch 'master' into master
qqwweee Apr 7, 2018
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
Prev Previous commit
Merge branch 'master' into master
  • Loading branch information
@qqwweee
qqwweee authored Apr 7, 2018
commit e7ebe6247c0f1858fea559dc9928ee6d0e7dca9b
2 changes: 1 addition & 1 deletion yolo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ def detect_image(self, image):
def close_session(self):
self.sess.close()


def detect_video(yolo,video_path):
vid = cv2.VideoCapture(video_path) ### TODO: will video path other than 0 be used?
if not vid.isOpened():
Expand All @@ -144,7 +145,6 @@ def detect_video(yolo,video_path):
return_value, frame = vid.read()
image = Image.fromarray(frame)
image = yolo.detect_image(image)

result = np.asarray(image)
curr_time = timer()
exec_time = curr_time - prev_time
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.