add configure option (--diable-arm-acc) to disable arm hardware acceleration

Conflicts:
	src/driver/fb_accel.h
	src/driver/fb_accel_arm.cpp
	src/gui/channellist.cpp
This commit is contained in:
TangoCash
2020-05-29 00:44:16 +02:00
committed by Thilo Graf
parent 170aaed311
commit 055ced60db
4 changed files with 19 additions and 4 deletions

View File

@@ -229,6 +229,15 @@ if test "$enable_upnp" = "yes"; then
fi fi
AM_CONDITIONAL(ENABLE_UPNP, test "$enable_upnp" = "yes") 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, AC_ARG_ENABLE(extupdate,
AS_HELP_STRING([--enable-extupdate], [enable extended update routine @<:@default=no@:>@]), AS_HELP_STRING([--enable-extupdate], [enable extended update routine @<:@default=no@:>@]),
AC_DEFINE(ENABLE_EXTUPDATE, 1, [enable extended update routine])) AC_DEFINE(ENABLE_EXTUPDATE, 1, [enable extended update routine]))

View File

@@ -225,9 +225,11 @@ class CFbAccelARM
int scale2Res(int size); int scale2Res(int size);
bool fullHdAvailable(); bool fullHdAvailable();
void setOsdResolutions(); void setOsdResolutions();
#if BOXMODEL_BRE2ZE4K || BOXMODEL_HD51 || BOXMODEL_H7 #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); void paintRect(const int x, const int y, const int dx, const int dy, const fb_pixel_t col);
#endif #endif
#endif
}; };
class CFbAccelMIPS class CFbAccelMIPS

View File

@@ -390,7 +390,8 @@ bool CFbAccelARM::fullHdAvailable()
return false; return false;
} }
#if BOXMODEL_BRE2ZE4K || BOXMODEL_HD51 || BOXMODEL_H7 #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) void CFbAccelARM::paintRect(const int x, const int y, const int dx, const int dy, const fb_pixel_t col)
{ {
if(dx <1 || dy <1 ) if(dx <1 || dy <1 )
@@ -401,3 +402,4 @@ void CFbAccelARM::paintRect(const int x, const int y, const int dx, const int dy
blit(); blit();
} }
#endif #endif
#endif

View File

@@ -2535,8 +2535,10 @@ void CChannelList::paint_events(CChannelEventList &evtlist)
ffheight = g_Font[eventFont]->getHeight(); ffheight = g_Font[eventFont]->getHeight();
frameBuffer->paintBoxRel(x+ width,y+ theight+pig_height, infozone_width, infozone_height,COL_MENUCONTENT_PLUS_0); frameBuffer->paintBoxRel(x+ width,y+ theight+pig_height, infozone_width, infozone_height,COL_MENUCONTENT_PLUS_0);
#if BOXMODEL_BRE2ZE4K || BOXMODEL_HD51 || BOXMODEL_H7 #if ENABLE_ARM_ACC
usleep(300); #if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7
usleep(300); // because of CFbAccelARM::paintRect()
#endif
#endif #endif
char startTime[10]; char startTime[10];