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:
Stefan Seyfried
2013-10-19 22:59:41 +02:00
parent fa1eadcc56
commit 48df8f882a
2 changed files with 3 additions and 3 deletions

View File

@@ -118,7 +118,7 @@ void GLFramebuffer::setup()
/* global alpha nontransparent (255) */
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);
ret = vc_dispmanx_display_get_info(display, &info);

View File

@@ -196,6 +196,8 @@ void init_td_api()
if (!initialized)
lt_debug_init();
lt_info("%s begin, initialized=%d, debug=0x%02x\n", __func__, (int)initialized, debuglevel);
if (! avdec)
avdec = new AVDec();
if (! glfb) {
int x = 1280, y = 720; /* default OSD FB resolution */
/*
@@ -218,8 +220,6 @@ void init_td_api()
}
if (! thread)
thread = new Input();
if (! avdec)
avdec = new AVDec();
initialized = true;
}