Skip to content

Commit

Permalink
Changes to fix video streams not working in Ubuntu 22.04 (#3029)
Browse files Browse the repository at this point in the history
  • Loading branch information
guidoAI committed May 3, 2023
1 parent e5fa273 commit 1a985e5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion conf/userconf/tudelft/course_conf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/tudelft/course_orangeavoid_cyberzoo.xml"
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/ahrs_int_cmpl_quat.xml modules/bebop_cam.xml modules/cv_detect_color_object.xml modules/gps.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/ins_extended.xml modules/nav_basic_rotorcraft.xml modules/orange_avoider.xml modules/stabilization_indi_simple.xml modules/video_capture.xml modules/video_rtp_stream.xml"
settings_modules="modules/ahrs_int_cmpl_quat.xml modules/bebop_cam.xml modules/cv_detect_color_object.xml modules/gps.xml modules/guidance_pid_rotorcraft.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/ins_extended.xml modules/nav_rotorcraft.xml modules/orange_avoider.xml modules/stabilization_indi_simple.xml modules/video_capture.xml modules/video_rtp_stream.xml"
gui_color="white"
/>
<aircraft
Expand Down
1 change: 1 addition & 0 deletions sw/tools/rtp_viewer/play_video_bottom_ffmpeg.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ffplay rtp_6000.sdp -protocol_whitelist file,udp,rtp -fflags nobuffer
1 change: 1 addition & 0 deletions sw/tools/rtp_viewer/play_video_front_ffmpeg.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ffplay rtp_5000.sdp -protocol_whitelist file,udp,rtp -fflags nobuffer
4 changes: 4 additions & 0 deletions sw/tools/rtp_viewer/rtp_viewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@
import sys
import argparse
from os import path, getenv
import os

# if PAPARAZZI_HOME not set, then assume the tree containing this
# file is a reasonable substitute
PPRZ_HOME = getenv("PAPARAZZI_HOME", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../')))
sys.path.append(PPRZ_HOME + "/var/lib/python") # pprzlink

# See the issue and solution here: https://github.com/opencv/opencv/issues/10328
os.environ['OPENCV_FFMPEG_CAPTURE_OPTIONS'] = 'protocol_whitelist;file,rtp,udp'

from pprzlink.ivy import IvyMessagesInterface
from pprzlink.message import PprzMessage

Expand Down

0 comments on commit 1a985e5

Please sign in to comment.