mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "HD1 compat #2; pu/fb-setmode"

Browse Source 
This reverts commit e768096b64.


Origin commit data
------------------
Commit: 48480e94d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
This commit is contained in:
vanhofen
2017-05-08 23:47:39 +02:00
parent cf8a76c2ce
commit 9973792652
4 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/fb_accel.h
View File

@@ -86,11 +86,8 @@ class CFbAccelCSHDx
protected:
OpenThreads::Mutex mutex;
/* Function temporarily disabled for HD1 */
#if BOXMODEL_CS_HD2
int fbCopy(uint32_t *mem_p, int width, int height, int dst_x, int dst_y, int src_x, int src_y, int mode);
int fbFill(int sx, int sy, int width, int height, fb_pixel_t color, int mode=0);
#endif
public:
CFbAccelCSHDx();
@@ -127,8 +124,7 @@ class CFbAccelCSHD1
inline void paintHLineRel(int x, int dx, int y, const fb_pixel_t col) { paintLine(x, y, x+dx, y, col); };
inline void paintVLineRel(int x, int y, int dy, const fb_pixel_t col) { paintLine(x, y, x, y+dy, col); };
void paintBoxRel(const int x, const int y, const int dx, const int dy, const fb_pixel_t col, int radius = 0, int type = CORNER_ALL);
/* Function temporarily disabled for HD1 */
// void fbCopyArea(uint32_t width, uint32_t height, uint32_t dst_x, uint32_t dst_y, uint32_t src_x, uint32_t src_y);
void fbCopyArea(uint32_t width, uint32_t height, uint32_t dst_x, uint32_t dst_y, uint32_t src_x, uint32_t src_y);
void blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff, uint32_t xp = 0, uint32_t yp = 0, bool transp = false, uint32_t unscaled_w = 0, uint32_t unscaled_h = 0); //NI
void blitBox2FB(const fb_pixel_t* boxBuf, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff);
void waitForIdle(const char *func = NULL);

6
src/driver/fb_accel_cs_hd1.cpp
View File

@@ -262,8 +262,6 @@ void CFbAccelCSHD1::paintBoxRel(const int x, const int y, const int dx, const in
checkFbArea(x, y, dx, dy, false);
}
/* Function temporarily disabled for HD1 */
#if 0
void CFbAccelCSHD1::fbCopyArea(uint32_t width, uint32_t height, uint32_t dst_x, uint32_t dst_y, uint32_t src_x, uint32_t src_y)
{
if ((width == 0) || (height == 0))
@@ -282,7 +280,6 @@ void CFbAccelCSHD1::fbCopyArea(uint32_t width, uint32_t height, uint32_t dst_x,
fbCopy(NULL, w_, h_, dst_x, dst_y, src_x, src_y_, mode);
// printf("\033[31m>>>>\033[0m%s hw blit w: %d, h: %d, dst_x: %d, dst_y: %d, src_x: %d, src_y: %d\n", __func_ext__, w_, h_, dst_x, dst_y, src_x, src_y);
}
#endif
void CFbAccelCSHD1::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff, uint32_t xp, uint32_t yp, bool transp, uint32_t unscaled_w, uint32_t unscaled_h) //NI
{
@@ -389,11 +386,8 @@ int CFbAccelCSHD1::setMode(unsigned int, unsigned int, unsigned int)
bpp = screeninfo.bits_per_pixel;
printf(LOGTAG "%dx%dx%d line length %d. using %s graphics accelerator.\n", xRes, yRes, bpp, stride, _fix.id);
/* Function temporarily disabled for HD1 */
#if 0
if (videoDecoder != NULL)
videoDecoder->updateOsdScreenInfo();
#endif
int needmem = stride * yRes * 2;
if (available >= needmem)

6
src/driver/fb_accel_cs_hdx.cpp
View File

@@ -36,8 +36,6 @@ CFbAccelCSHDx::~CFbAccelCSHDx()
}
*/
/* Function temporarily disabled for HD1 */
#if BOXMODEL_CS_HD2
int CFbAccelCSHDx::fbCopy(uint32_t *mem_p, int width, int height,
int dst_x, int dst_y, int src_x, int src_y, int mode)
{
@@ -60,10 +58,7 @@ int CFbAccelCSHDx::fbCopy(uint32_t *mem_p, int width, int height,
mutex.unlock();
return ret;
}
#endif
/* Function temporarily disabled for HD1 */
#if BOXMODEL_CS_HD2
int CFbAccelCSHDx::fbFill(int sx, int sy, int width, int height, fb_pixel_t color, int mode/*=0*/)
{
if (videoDecoder == NULL) {
@@ -79,7 +74,6 @@ int CFbAccelCSHDx::fbFill(int sx, int sy, int width, int height, fb_pixel_t colo
mutex.unlock();
return ret;
}
#endif
#if 0
/* TODO: Run this functions with hardware acceleration */

4
src/gui/streaminfo2.cpp
View File

@@ -560,9 +560,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
snprintf(buf, sizeof(buf), "%dx%d", xres, yres);
g_Font[font_info]->RenderString (xpos+spaceoffset, ypos, box_width2, buf, COL_MENUCONTENT_TEXT);
//#if HAVE_COOL_HARDWARE
/* Function temporarily disabled for HD1 */
#if BOXMODEL_CS_HD2
#if HAVE_COOL_HARDWARE
//Video SYSTEM
ypos += iheight;
snprintf(buf, sizeof(buf), "%s:", g_Locale->getText (LOCALE_STREAMINFO_VIDEOSYSTEM));