Skip to content
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

improve/export decoding pipelines #680

Merged
merged 1 commit into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,16 @@ ls -a release/
echo "here we should have built the file correctly"

cp release/QOpenHD /tmp/qopenhd/usr/local/bin/ || exit 1
cp systemd/h264_decode.service /tmp/qopenhd/etc/systemd/system/ || exit 1
cp systemd/h265_decode.service /tmp/qopenhd/etc/systemd/system/ || exit 1

# copying services
if [[ "${PACKAGE_ARCH}" = "armhf" ]]; then
PACKAGE_NAME=qopenhd
cp systemd/rpi_qopenhd.service /tmp/qopenhd/etc/systemd/system/qopenhd.service || exit 1
cp systemd/rpi_h264_decode.service /tmp/qopenhd/etc/systemd/system/h264_decode.service || exit 1
elif [[ "${PACKAGE_ARCH}" = "arm64" ]]; then
mkdir -p /tmp/qopenhd/etc/systemd/system/
cp systemd/rock3_qopenhd.service /tmp/qopenhd/etc/systemd/system/qopenhd.service
# cp systemd/rock3_h264_decode.service /tmp/qopenhd/etc/systemd/system/h264_decode.service
# cp systemd/rock3_h265_decode.service /tmp/qopenhd/etc/systemd/system/h265_decode.service
PACKAGE_NAME=qopenhd_rk3566
else
PACKAGE_NAME=qopenhd
Expand Down Expand Up @@ -103,28 +102,16 @@ elif [[ "${PACKAGE_ARCH}" = "arm64" ]]; then
${PLATFORM_PACKAGES} || exit 1

#Rock5Package

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_h264_decode.service /tmp/qopenhd/etc/systemd/system/h264_decode.service
# cp systemd/rock5_h265_decode.service /tmp/qopenhd/etc/systemd/system/h265_decode.service

fpm -a ${PACKAGE_ARCH} -s dir -t deb -n qopenhd_rk3588 -v ${VERSION} -C ${TMPDIR} \
-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_rk3588a_VERSION_ARCH.deb \
Expand Down
14 changes: 14 additions & 0 deletions systemd/h264_decode.service
Original file line number Diff line number Diff line change
@@ -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=/usr/local/bin/h265.sh

Restart=always
RestartSec=2

[Install]
WantedBy=multi-user.target
14 changes: 14 additions & 0 deletions systemd/h265_decode.service
Original file line number Diff line number Diff line change
@@ -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=/usr/local/bin/h265.sh

Restart=always
RestartSec=1

[Install]
WantedBy=multi-user.target
13 changes: 0 additions & 13 deletions systemd/rock3_h264_decode.service

This file was deleted.

14 changes: 0 additions & 14 deletions systemd/rock3_h265_decode.service

This file was deleted.

14 changes: 0 additions & 14 deletions systemd/rock3_mjpeg_decode.service

This file was deleted.

14 changes: 0 additions & 14 deletions systemd/rock5_h264_decode.service

This file was deleted.

14 changes: 0 additions & 14 deletions systemd/rock5_h264a_decode.service

This file was deleted.

14 changes: 0 additions & 14 deletions systemd/rock5_h265_decode.service

This file was deleted.

14 changes: 0 additions & 14 deletions systemd/rock5_h265a_decode.service

This file was deleted.

14 changes: 0 additions & 14 deletions systemd/rock5_mjpeg_decode.service

This file was deleted.

14 changes: 0 additions & 14 deletions systemd/rock5_mjpega_decode.service

This file was deleted.

18 changes: 0 additions & 18 deletions systemd/rpi_h264_decode.service

This file was deleted.

15 changes: 0 additions & 15 deletions systemd/x86_ubuntu_h264_decode.service

This file was deleted.

15 changes: 0 additions & 15 deletions systemd/x86_ubuntu_h265_decode.service

This file was deleted.

15 changes: 0 additions & 15 deletions systemd/x86_ubuntu_mjpeg_decode.service

This file was deleted.

Loading