File tree Expand file tree Collapse file tree 3 files changed +9
-4
lines changed
Expand file tree Collapse file tree 3 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ name: "mast"
44description : " Camera located on the mast of the rover."
55# Make sure that this camera_id matches the one defined in the udev rules.
66camera_id : 4
7- format : " image/jpeg "
7+ format : " video/x-h264 "
88image_width : 1280
99image_height : 720
1010framerate : 30
Original file line number Diff line number Diff line change @@ -5,8 +5,8 @@ description: "Camera located on the wrist of the rover arm."
55# Make sure that this camera_id matches the one defined in the udev rules.
66camera_id : 0
77format : " video/x-h264"
8- image_width : 1280
9- image_height : 720
8+ image_width : 640
9+ image_height : 360
1010framerate : 30
1111opencv_enabled : 1 # 0 for true, 1 for false
1212# calib_info:
Original file line number Diff line number Diff line change @@ -99,7 +99,12 @@ std::string Camera::getGSTPipe(CameraID camera_id) {
9999 gstr_ss << " ,height=" << static_cast <int >(fs[KEY_IMAGE_HEIGHT]);
100100 gstr_ss << " ,framerate=" << static_cast <int >(fs[KEY_FRAMERATE]) << " /1 ! " ;
101101
102- if (formatLower.find (" jpeg" ) != std::string::npos) {
102+ if (formatLower.find (" h264" ) != std::string::npos) {
103+ gstr_ss << " h264parse ! avdec_h264 ! " ;
104+ } else if (formatLower.find (" h265" ) != std::string::npos ||
105+ formatLower.find (" hevc" ) != std::string::npos) {
106+ gstr_ss << " h265parse ! avdec_h265 ! " ;
107+ } else if (formatLower.find (" jpeg" ) != std::string::npos) {
103108 gstr_ss << " jpegdec ! " ;
104109 }
105110
You can’t perform that action at this time.
0 commit comments