mirror of
https://github.com/tuxbox-neutrino/libstb-hal.git
synced 2025-08-26 23:13:16 +02:00
raspi: fix ordering of AVDec and GLFB
it looks like the videocore libs are leaking objects if OMX_Init() is called after the dispmanx setup, so do it in the correct order
This commit is contained in:
@@ -118,7 +118,7 @@ void GLFramebuffer::setup()
|
|||||||
/* global alpha nontransparent (255) */
|
/* global alpha nontransparent (255) */
|
||||||
VC_DISPMANX_ALPHA_T alpha = { DISPMANX_FLAGS_ALPHA_FROM_SOURCE, 255, 0 };
|
VC_DISPMANX_ALPHA_T alpha = { DISPMANX_FLAGS_ALPHA_FROM_SOURCE, 255, 0 };
|
||||||
|
|
||||||
bcm_host_init();
|
// bcm_host_init(); // already done in AVDec()
|
||||||
|
|
||||||
display = vc_dispmanx_display_open(0);
|
display = vc_dispmanx_display_open(0);
|
||||||
ret = vc_dispmanx_display_get_info(display, &info);
|
ret = vc_dispmanx_display_get_info(display, &info);
|
||||||
|
@@ -196,6 +196,8 @@ void init_td_api()
|
|||||||
if (!initialized)
|
if (!initialized)
|
||||||
lt_debug_init();
|
lt_debug_init();
|
||||||
lt_info("%s begin, initialized=%d, debug=0x%02x\n", __func__, (int)initialized, debuglevel);
|
lt_info("%s begin, initialized=%d, debug=0x%02x\n", __func__, (int)initialized, debuglevel);
|
||||||
|
if (! avdec)
|
||||||
|
avdec = new AVDec();
|
||||||
if (! glfb) {
|
if (! glfb) {
|
||||||
int x = 1280, y = 720; /* default OSD FB resolution */
|
int x = 1280, y = 720; /* default OSD FB resolution */
|
||||||
/*
|
/*
|
||||||
@@ -218,8 +220,6 @@ void init_td_api()
|
|||||||
}
|
}
|
||||||
if (! thread)
|
if (! thread)
|
||||||
thread = new Input();
|
thread = new Input();
|
||||||
if (! avdec)
|
|
||||||
avdec = new AVDec();
|
|
||||||
initialized = true;
|
initialized = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user