-
Notifications
You must be signed in to change notification settings - Fork 3
Add stereo image #1
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.
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
base: master
Are you sure you want to change the base?
Conversation
roystormstout
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
resolved config file conflict
irmark1/parts/controller.py
Outdated
|
|
||
|
|
||
| def run_threaded(self, img_arr=None): | ||
| def run_threaded(self, img_arr=None, rear_img_arr=None): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is the rear_img_arr used?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It isn't used yet. The reason I put it here is that I thought in the future we would need rear_img in autonomous driving. Since we have agreed that we don't need it, you can remove this part.
irmark1/templates/complete.py
Outdated
|
|
||
| V.add(camA, outputs=['cam/image_array_a'], threaded=True) | ||
| V.add(camB, outputs=['cam/image_array_b'], threaded=True) | ||
| if cfg.CAMERA_TYPE == "NANO-MARK1": |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change name to "MARK1" and move it below (not stereo).
irmark1/templates/complete.py
Outdated
| else: | ||
| V.add(cam, inputs=inputs, outputs=['cam/image_array'], threaded=threaded) | ||
| from irmark1.parts.image import Duplicator | ||
| V.add(Duplicator(2), inputs=['cam/image_array'], outputs=['cam/image_array_a', 'cam/image_array_b']) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't use duplicator in drive.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No we shouldn't. This part is basically designed for validating that the dual camera work. If we have confirmed that, we could remove it.
irmark1/parts/camera.py
Outdated
| ''' | ||
| def gstreamer_pipeline(self, capture_width=3280, capture_height=2464, output_width=224, output_height=224, framerate=21, flip_method=0) : | ||
| return 'nvarguscamerasrc ! video/x-raw(memory:NVMM), width=%d, height=%d, format=(string)NV12, framerate=(fraction)%d/1 ! nvvidconv flip-method=%d ! nvvidconv ! video/x-raw, width=(int)%d, height=(int)%d, format=(string)BGRx ! videoconvert ! appsink' % ( | ||
| return 'nvarguscamerasrc sensor-id=0 ! video/x-raw(memory:NVMM), width=%d, height=%d, format=(string)NV12, framerate=(fraction)%d/1 ! nvvidconv flip-method=%d ! nvvidconv ! video/x-raw, width=(int)%d, height=(int)%d, format=(string)BGRx ! videoconvert ! appsink' % ( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not neccessary?
946110d to
1bada75
Compare
1bada75 to
97a2baf
Compare
ecfd458 to
4fc623c
Compare
Please review Carl and Eddy's code