diff --git a/package.sh b/package.sh index f945d8916..b68d3a687 100755 --- a/package.sh +++ b/package.sh @@ -115,6 +115,20 @@ elif [[ "${PACKAGE_ARCH}" = "arm64" ]]; then -p qopenhd_rk3588_VERSION_ARCH.deb \ --after-install after-install.sh \ ${PLATFORM_PACKAGES} || exit 1 + #Rock5aPackage + + rm /tmp/qopenhd/etc/systemd/system/qopenhd.service + rm /tmp/qopenhd/etc/systemd/system/h264_decode.service + rm /tmp/qopenhd/etc/systemd/system/h265_decode.service + + cp systemd/rock5_qopenhd.service /tmp/qopenhd/etc/systemd/system/qopenhd.service + cp systemd/rock5_h264a_decode.service /tmp/qopenhd/etc/systemd/system/h264_decode.service + cp systemd/rock5_h265a_decode.service /tmp/qopenhd/etc/systemd/system/h265_decode.service + + fpm -a ${PACKAGE_ARCH} -s dir -t deb -n qopenhd_rk3588a -v ${VERSION} -C ${TMPDIR} \ + -p qopenhd_rk3588_VERSION_ARCH.deb \ + --after-install after-install.sh \ + ${PLATFORM_PACKAGES} || exit 1 else echo "everything else" diff --git a/systemd/rock5_h264_decode.service b/systemd/rock5_h264_decode.service index 4e6076330..819b69801 100644 --- a/systemd/rock5_h264_decode.service +++ b/systemd/rock5_h264_decode.service @@ -5,7 +5,7 @@ Description=rock_h264_decode User=root # Video decode via mpp, started by QOpenHD if needed (and stopped if needed) -ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)96, clock-rate=(int)90000, media=(string)video, encoding-name=(string)H264' ! rtph264depay ! h264parse ! mppvideodec format=23 fast-mode=true ! queue ! kmssink plane-id=54 force-modesetting=true" +ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)96, clock-rate=(int)90000, media=(string)video, encoding-name=(string)H264' ! rtph264depay ! h264parse ! mppvideodec format=23 fast-mode=true width=1920 height=1080 ! queue ! kmssink plane-id=54" Restart=always RestartSec=2 diff --git a/systemd/rock5_h264a_decode.service b/systemd/rock5_h264a_decode.service new file mode 100644 index 000000000..098cf26ac --- /dev/null +++ b/systemd/rock5_h264a_decode.service @@ -0,0 +1,14 @@ +[Unit] +Description=rock_h264_decode + +[Service] +User=root + +# Video decode via mpp, started by QOpenHD if needed (and stopped if needed) +ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)96, clock-rate=(int)90000, media=(string)video, encoding-name=(string)H264' ! rtph264depay ! h264parse ! mppvideodec format=23 fast-mode=true width=1920 height=1080 ! queue ! kmssink plane-id=68" + +Restart=always +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/systemd/rock5_h265_decode.service b/systemd/rock5_h265_decode.service index e84d50b9e..f3ff59140 100644 --- a/systemd/rock5_h265_decode.service +++ b/systemd/rock5_h265_decode.service @@ -5,7 +5,7 @@ Description=rock_h265_decode User=root # Video decode via mpp, started by QOpenHD if needed (and stopped if needed) -ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)96, clock-rate=(int)90000, media=(string)video, encoding-name=(string)H265' ! rtph265depay ! h265parse ! mppvideodec format=23 fast-mode=true ! queue ! kmssink plane-id=54 force-modesetting=true" +ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)96, clock-rate=(int)90000, media=(string)video, encoding-name=(string)H265' ! rtph265depay ! h265parse ! mppvideodec format=23 fast-mode=true widt=1920 height=1080 ! queue ! kmssink plane-id=54" Restart=always RestartSec=1 diff --git a/systemd/rock5_h265a_decode.service b/systemd/rock5_h265a_decode.service new file mode 100644 index 000000000..bf272a215 --- /dev/null +++ b/systemd/rock5_h265a_decode.service @@ -0,0 +1,14 @@ +[Unit] +Description=rock_h265_decode + +[Service] +User=root + +# Video decode via mpp, started by QOpenHD if needed (and stopped if needed) +ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)96, clock-rate=(int)90000, media=(string)video, encoding-name=(string)H265' ! rtph265depay ! h265parse ! mppvideodec format=23 fast-mode=true widt=1920 height=1080 ! queue ! kmssink plane-id=68" + +Restart=always +RestartSec=1 + +[Install] +WantedBy=multi-user.target diff --git a/systemd/rock5_mjpega_decode.service b/systemd/rock5_mjpega_decode.service new file mode 100644 index 000000000..2822131a4 --- /dev/null +++ b/systemd/rock5_mjpega_decode.service @@ -0,0 +1,14 @@ +[Unit] +Description=rock_mjpeg_decode + +[Service] +User=root + +# Video decode via mpp, started by QOpenHD if needed (and stopped if needed) +ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)26, clock-rate=(int)90000, media=(string)video, encoding-name=(string)JPEG' ! rtpjpegdepay ! jpegdec ! queue ! kmssink plane-id=68 force-modesetting=true" + +Restart=always +RestartSec=1 + +[Install] +WantedBy=multi-user.target diff --git a/systemd/rock5_qopenhd.service b/systemd/rock5_qopenhd.service index 24341fd12..269466039 100644 --- a/systemd/rock5_qopenhd.service +++ b/systemd/rock5_qopenhd.service @@ -4,11 +4,12 @@ After=multi-user.target [Service] Type=simple -Environment="FONTCONFIG_PATH=/etc/fonts" Environment="QT_QPA_EGLFS_KMS_ATOMIC=1" +Environment="FONTCONFIG_PATH=/etc/fonts" Environment="QT_QPA_EGLFS_KMS_PLANE_INDEX=5" Environment="QT_QPA_EGLFS_FORCE888=1" Environment="QT_QPA_EGLFS_SWAPINTERVAL=0" +Environment="QT_QPA_EGLFS_ALWAYS_SET_MODE=true" Environment="QT_QPA_EGLFS_KMS_CONFIG=/usr/local/share/qopenhd/rock_qt_eglfs_kms_config.json" ExecStart=/usr/local/bin/QOpenHD -platform eglfs User=root