From 49b3352f13688d54022d5e24160e75dbe5b57977 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Fri, 29 May 2020 00:44:16 +0200 Subject: [PATCH] add configure option (--diable-arm-acc) to disable arm hardware acceleration Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/dc25b6a1b8dc9c55df90d663a3b1571f6b3d4de9 Author: TangoCash Date: 2020-05-29 (Fri, 29 May 2020) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 9 +++++++++ src/driver/fb_accel.h | 2 ++ src/driver/fb_accel_arm.cpp | 2 ++ src/gui/channellist.cpp | 2 ++ 4 files changed, 15 insertions(+) diff --git a/configure.ac b/configure.ac index fb1210edf..04aad792e 100644 --- a/configure.ac +++ b/configure.ac @@ -228,6 +228,15 @@ if test "$enable_upnp" = "yes"; then fi AM_CONDITIONAL(ENABLE_UPNP, test "$enable_upnp" = "yes") +AC_ARG_ENABLE(arm-acc, + AS_HELP_STRING(--disable-arm-acc,disable arm hardware acceleration), + ,[enable_arm_acc=yes]) + +AM_CONDITIONAL(ENABLE_ARM_ACC,test "$enable_arm_acc" = "yes") +if test "$enable_arm_acc" = "yes"; then + AC_DEFINE(ENABLE_ARM_ACC,1,[enable arm hardware acceleration]) +fi + AC_ARG_ENABLE(extupdate, AS_HELP_STRING([--enable-extupdate], [enable extended update routine @<:@default=no@:>@]), AC_DEFINE(ENABLE_EXTUPDATE, 1, [enable extended update routine])) diff --git a/src/driver/fb_accel.h b/src/driver/fb_accel.h index 2b5e8d168..d6cf31d3c 100644 --- a/src/driver/fb_accel.h +++ b/src/driver/fb_accel.h @@ -225,9 +225,11 @@ class CFbAccelARM int scale2Res(int size); bool fullHdAvailable(); void setOsdResolutions(); +#if ENABLE_ARM_ACC #if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 void paintRect(const int x, const int y, const int dx, const int dy, const fb_pixel_t col); #endif +#endif }; class CFbAccelMIPS diff --git a/src/driver/fb_accel_arm.cpp b/src/driver/fb_accel_arm.cpp index ae6d2b8d9..ebef37629 100644 --- a/src/driver/fb_accel_arm.cpp +++ b/src/driver/fb_accel_arm.cpp @@ -390,6 +390,7 @@ bool CFbAccelARM::fullHdAvailable() return false; } +#if ENABLE_ARM_ACC #if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 void CFbAccelARM::paintRect(const int x, const int y, const int dx, const int dy, const fb_pixel_t col) { @@ -401,3 +402,4 @@ void CFbAccelARM::paintRect(const int x, const int y, const int dx, const int dy blit(); } #endif +#endif diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index dc86d9b7e..9f5816913 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2532,8 +2532,10 @@ void CChannelList::paint_events(CChannelEventList &evtlist) ffheight = g_Font[eventFont]->getHeight(); frameBuffer->paintBoxRel(x+ width,y+ theight+pig_height, infozone_width, infozone_height,COL_MENUCONTENT_PLUS_0); +#if ENABLE_ARM_ACC #if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 usleep(300); // because of CFbAccelARM::paintRect() +#endif #endif char startTime[10];