From 26f43de7f0bb5227c22668a5f1bf06eceb077d48 Mon Sep 17 00:00:00 2001 From: Consti10 Date: Fri, 5 Apr 2024 12:21:18 +0200 Subject: [PATCH 1/4] fix documentation --- systemd/h264_decode.service | 2 +- systemd/h265_decode.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/systemd/h264_decode.service b/systemd/h264_decode.service index 1a1eb3459..c9311cf61 100644 --- a/systemd/h264_decode.service +++ b/systemd/h264_decode.service @@ -4,7 +4,7 @@ Description=rock_h264_decode [Service] User=root -# Video decode via mpp, started by QOpenHD if needed (and stopped if needed) +# Platform-specific video decode service ExecStart=/usr/local/bin/h264_decode.sh Restart=always diff --git a/systemd/h265_decode.service b/systemd/h265_decode.service index 5e9d38941..4b18eaff4 100644 --- a/systemd/h265_decode.service +++ b/systemd/h265_decode.service @@ -4,7 +4,7 @@ Description=rock_h265_decode [Service] User=root -# Video decode via mpp, started by QOpenHD if needed (and stopped if needed) +# Platform-specific video decode service ExecStart=/usr/local/bin/h265_decode.sh Restart=always From 9c2ff3e661f615963c8f658b12daee1447c0e628 Mon Sep 17 00:00:00 2001 From: Consti10 Date: Fri, 5 Apr 2024 22:24:37 +0200 Subject: [PATCH 2/4] experiment - debug drm / kms --- QOpenHD.pro | 2 ++ app/main.cpp | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/QOpenHD.pro b/QOpenHD.pro index a5e5a2a14..d1d67ba68 100755 --- a/QOpenHD.pro +++ b/QOpenHD.pro @@ -72,6 +72,8 @@ QT +=core quick qml gui \ widgets QT += opengl QT += charts +QT += gui-private +#LIBS += Ldrm INCLUDEPATH += $$PWD/lib INCLUDEPATH += $$PWD/app diff --git a/app/main.cpp b/app/main.cpp index 81d9b5313..5cf39009d 100755 --- a/app/main.cpp +++ b/app/main.cpp @@ -70,6 +70,9 @@ RESOLVEFUNC(SSL_get1_peer_certificate); RESOLVEFUNC(EVP_PKEY_get_base_id); #endif // OPENSSL_VERSION_MAJOR >= 3 +#include +//#include +//#include // Load all the fonts we use ?! static void load_fonts(){ @@ -197,6 +200,39 @@ static void android_check_permissions(){ #endif } +static void debug_kms(){ + qDebug()<<"platform name:"<nativeResourceForIntegration("dri_fd"); + if (drifd) + fd = static_cast(reinterpret_cast(drifd)); + auto * crtcid = pni->nativeResourceForScreen("dri_crtcid", qScreen); + if (crtcid) + crtc = static_cast(reinterpret_cast(crtcid)); + auto * connid = pni->nativeResourceForScreen("dri_connectorid", qScreen); + if (connid) + connector = static_cast(reinterpret_cast(connid)); + auto * atomic = pni->nativeResourceForIntegration("dri_atomic_request"); + if (atomic){ + //auto * request = reinterpret_cast(atomic); + auto * request = atomic; + if (request != nullptr) + useatomic = true; + } + qDebug()< Date: Sun, 7 Apr 2024 17:28:10 +0200 Subject: [PATCH 3/4] disable audio on android --- app/videostreaming/vscommon/audio_playback.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/videostreaming/vscommon/audio_playback.cpp b/app/videostreaming/vscommon/audio_playback.cpp index 240694824..e020d365c 100644 --- a/app/videostreaming/vscommon/audio_playback.cpp +++ b/app/videostreaming/vscommon/audio_playback.cpp @@ -13,8 +13,12 @@ void platform_start_audio_streaming_if_enabled() { + if(QOpenHD::instance().is_android()){ + // audio r.n crashes on android + return; + } QSettings settings; - const bool dev_enable_live_audio_playback=settings.value("dev_enable_live_audio_playback", false).toBool(); + const bool dev_enable_live_audio_playback=settings.value("dev_enable_live_audio_playback", true).toBool(); if(!dev_enable_live_audio_playback){ qDebug()<<"Live audio playback is disabled"; return; From 68a5013e97dd2692cc96583b2fbcaa3e422190ae Mon Sep 17 00:00:00 2001 From: Consti10 Date: Sun, 7 Apr 2024 17:30:18 +0200 Subject: [PATCH 4/4] drm / kms debug off for non-dev branch --- QOpenHD.pro | 2 +- app/main.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/QOpenHD.pro b/QOpenHD.pro index d1d67ba68..51050fabc 100755 --- a/QOpenHD.pro +++ b/QOpenHD.pro @@ -72,7 +72,7 @@ QT +=core quick qml gui \ widgets QT += opengl QT += charts -QT += gui-private +#QT += gui-private #LIBS += Ldrm INCLUDEPATH += $$PWD/lib diff --git a/app/main.cpp b/app/main.cpp index 5cf39009d..613a11a37 100755 --- a/app/main.cpp +++ b/app/main.cpp @@ -70,7 +70,7 @@ RESOLVEFUNC(SSL_get1_peer_certificate); RESOLVEFUNC(EVP_PKEY_get_base_id); #endif // OPENSSL_VERSION_MAJOR >= 3 -#include +//#include //#include //#include @@ -200,7 +200,7 @@ static void android_check_permissions(){ #endif } -static void debug_kms(){ +/*static void debug_kms(){ qDebug()<<"platform name:"<