Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
Code Computer Vision
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PolySTAR
RoboMaster
Computer Vision
Code Computer Vision
Commits
821c2a4b
Commit
821c2a4b
authored
4 years ago
by
Mathieu Beligon
Browse files
Options
Downloads
Patches
Plain Diff
[CV2FrameGenerator] simplify class
parent
04fc0d12
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/polystar/frame_generators/cv2_frame_generator_abc.py
+13
-21
13 additions, 21 deletions
src/polystar/frame_generators/cv2_frame_generator_abc.py
src/polystar/frame_generators/video_frame_generator.py
+8
-4
8 additions, 4 deletions
src/polystar/frame_generators/video_frame_generator.py
with
21 additions
and
25 deletions
src/polystar/frame_generators/cv2_frame_generator_abc.py
+
13
−
21
View file @
821c2a4b
...
@@ -10,29 +10,21 @@ from polystar.models.image import Image
...
@@ -10,29 +10,21 @@ from polystar.models.image import Image
@dataclass
@dataclass
class
CV2FrameGeneratorABC
(
FrameGeneratorABC
,
ABC
):
class
CV2FrameGeneratorABC
(
FrameGeneratorABC
,
ABC
):
_cap
:
cv2
.
VideoCapture
=
field
(
init
=
False
,
repr
=
False
)
def
__enter__
(
self
):
self
.
_cap
=
cv2
.
VideoCapture
(
*
self
.
_capture_params
())
# self._cap.set(cv2.CAP_PROP_BUFFERSIZE, 1)
assert
self
.
_cap
.
isOpened
()
self
.
_post_opening_operation
()
def
__exit__
(
self
,
exc_type
,
exc_val
,
exc_tb
):
self
.
_cap
.
release
()
def
generate
(
self
)
->
Iterable
[
Image
]:
def
generate
(
self
)
->
Iterable
[
Image
]:
with
self
:
_cap
=
self
.
_open
()
while
1
:
while
1
:
is_open
,
frame
=
self
.
_cap
.
read
()
is_open
,
frame
=
_cap
.
read
()
if
not
is_open
:
if
not
is_open
:
return
break
yield
frame
yield
frame
_cap
.
release
()
def
_open
(
self
)
->
cv2
.
VideoCapture
:
_cap
=
cv2
.
VideoCapture
(
*
self
.
_capture_params
())
_cap
.
set
(
cv2
.
CAP_PROP_BUFFERSIZE
,
0
)
assert
_cap
.
isOpened
()
return
_cap
@abstractmethod
@abstractmethod
def
_capture_params
(
self
)
->
Iterable
[
Any
]:
def
_capture_params
(
self
)
->
Iterable
[
Any
]:
pass
pass
def
_post_opening_operation
(
self
):
pass
This diff is collapsed.
Click to expand it.
src/polystar/frame_generators/video_frame_generator.py
+
8
−
4
View file @
821c2a4b
import
cv2
from
dataclasses
import
dataclass
from
dataclasses
import
dataclass
from
pathlib
import
Path
from
pathlib
import
Path
from
typing
import
Any
,
Iterable
,
Optional
from
typing
import
Any
,
Iterable
,
Optional
...
@@ -18,10 +20,6 @@ class VideoFrameGenerator(CV2FrameGeneratorABC):
...
@@ -18,10 +20,6 @@ class VideoFrameGenerator(CV2FrameGeneratorABC):
def
_capture_params
(
self
)
->
Iterable
[
Any
]:
def
_capture_params
(
self
)
->
Iterable
[
Any
]:
return
(
str
(
self
.
video_path
),)
return
(
str
(
self
.
video_path
),)
def
_post_opening_operation
(
self
):
if
self
.
offset_seconds
:
self
.
_cap
.
set
(
CAP_PROP_POS_FRAMES
,
self
.
_video_fps
*
self
.
offset_seconds
-
2
)
@memoized_property
@memoized_property
def
_video_fps
(
self
)
->
int
:
def
_video_fps
(
self
)
->
int
:
streams_info
=
ffmpeg
.
probe
(
str
(
self
.
video_path
))[
"
streams
"
]
streams_info
=
ffmpeg
.
probe
(
str
(
self
.
video_path
))[
"
streams
"
]
...
@@ -30,3 +28,9 @@ class VideoFrameGenerator(CV2FrameGeneratorABC):
...
@@ -30,3 +28,9 @@ class VideoFrameGenerator(CV2FrameGeneratorABC):
continue
continue
return
round
(
eval
(
stream_info
[
"
avg_frame_rate
"
]))
return
round
(
eval
(
stream_info
[
"
avg_frame_rate
"
]))
raise
ValueError
(
f
"
No fps found for video
{
self
.
video_path
.
name
}
"
)
raise
ValueError
(
f
"
No fps found for video
{
self
.
video_path
.
name
}
"
)
def
_open
(
self
)
->
cv2
.
VideoCapture
:
_cap
=
super
().
_open
()
if
self
.
offset_seconds
:
_cap
.
set
(
CAP_PROP_POS_FRAMES
,
self
.
_video_fps
*
self
.
offset_seconds
-
2
)
return
_cap
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment