frodovdr/vdr-plugin-softhdcuvid
1
0
Fork 0
mirror of https://github.com/jojo61/vdr-plugin-softhdcuvid.git synced 2023-10-10 13:37:41 +02:00
Code Issues Releases Wiki Activity

Fixed Vaapi OSD with PLACEBO

Browse Source
This commit is contained in:
jojo61 2019-11-02 15:47:45 +01:00
parent a4bee138f2
commit 499731fc1f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openglosd.cpp
View File

@ -374,7 +374,7 @@ void cOglGlyph::BindTexture(void) {
void cOglGlyph::LoadTexture(FT_BitmapGlyph ftGlyph) { void cOglGlyph::LoadTexture(FT_BitmapGlyph ftGlyph) {
// Disable byte-alignment restriction // Disable byte-alignment restriction
#ifdef VAAPI #if defined (VAAPI) && !defined (PLACEBO)
OSD_release_context(); OSD_release_context();
OSD_get_shared_context(); OSD_get_shared_context();
#endif #endif
@ -399,7 +399,7 @@ void cOglGlyph::LoadTexture(FT_BitmapGlyph ftGlyph) {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
glPixelStorei(GL_UNPACK_ALIGNMENT, 4); glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
#ifdef VAAPI #if defined (VAAPI) && !defined (PLACEBO)
OSD_release_context(); OSD_release_context();
OSD_get_context(); OSD_get_context();
#endif #endif
@ -568,7 +568,7 @@ cOglFb::~cOglFb(void) {
bool cOglFb::Init(void) { bool cOglFb::Init(void) {
initiated = true; initiated = true;
#ifdef VAAPI #if defined (VAAPI) && !defined (PLACEBO)
OSD_release_context(); OSD_release_context();
OSD_get_shared_context(); OSD_get_shared_context();
#endif #endif
@ -587,13 +587,13 @@ bool cOglFb::Init(void) {
if(glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) { if(glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
esyslog("[softhddev]ERROR: %d Framebuffer is not complete!\n",__LINE__); esyslog("[softhddev]ERROR: %d Framebuffer is not complete!\n",__LINE__);
#ifdef VAAPI #if defined (VAAPI) && !defined (PLACEBO)
OSD_release_context(); OSD_release_context();
OSD_get_context(); OSD_get_context();
#endif #endif
return false; return false;
} }
#ifdef VAAPI #if defined (VAAPI) && !defined (PLACEBO)
OSD_release_context(); OSD_release_context();
OSD_get_context(); OSD_get_context();
#endif #endif
@ -1355,7 +1355,7 @@ cOglCmdDrawImage::~cOglCmdDrawImage(void) {
bool cOglCmdDrawImage::Execute(void) { bool cOglCmdDrawImage::Execute(void) {
GLuint texture; GLuint texture;
#ifdef VAAPI #if defined (VAAPI) && !defined (PLACEBO)
OSD_release_context(); OSD_release_context();
OSD_get_shared_context(); OSD_get_shared_context();
#endif #endif
@ -1377,7 +1377,7 @@ bool cOglCmdDrawImage::Execute(void) {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
#ifdef VAAPI #if defined (VAAPI) && !defined (PLACEBO)
OSD_release_context(); OSD_release_context();
OSD_get_context(); OSD_get_context();
#endif #endif
@ -1470,7 +1470,7 @@ cOglCmdStoreImage::~cOglCmdStoreImage(void) {
} }
bool cOglCmdStoreImage::Execute(void) { bool cOglCmdStoreImage::Execute(void) {
#ifdef VAAPI #if defined (VAAPI) && !defined (PLACEBO)
OSD_release_context(); OSD_release_context();
OSD_get_shared_context(); OSD_get_shared_context();
#endif #endif
@ -1492,7 +1492,7 @@ bool cOglCmdStoreImage::Execute(void) {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
#ifdef VAAPI #if defined (VAAPI) && !defined (PLACEBO)
OSD_release_context(); OSD_release_context();
OSD_get_context(); OSD_get_context();
#endif #endif
@ -2090,7 +2090,7 @@ cOglOsd::cOglOsd(int Left, int Top, uint Level, std::shared_ptr<cOglThread> oglT
posd = MALLOC(unsigned char, osdWidth * osdHeight * 4); posd = MALLOC(unsigned char, osdWidth * osdHeight * 4);
#endif #endif
// create output framebuffer // create output framebuffer
#ifdef VAAPI #if defined (VAAPI) && !defined (PLACEBO)
OSD_release_context(); OSD_release_context();
OSD_get_shared_context(); OSD_get_shared_context();
#endif #endif
@ -2098,7 +2098,7 @@ cOglOsd::cOglOsd(int Left, int Top, uint Level, std::shared_ptr<cOglThread> oglT
oFb = new cOglOutputFb(osdWidth, osdHeight); oFb = new cOglOutputFb(osdWidth, osdHeight);
oglThread->DoCmd(new cOglCmdInitOutputFb(oFb)); oglThread->DoCmd(new cOglCmdInitOutputFb(oFb));
} }
#ifdef VAAPI #if defined (VAAPI) && !defined (PLACEBO)
OSD_release_context(); OSD_release_context();
#endif #endif
pthread_mutex_unlock(&OSDMutex); pthread_mutex_unlock(&OSDMutex);