frodovdr
/
vdr-plugin-softhdcuvid
mirror of https://github.com/jojo61/vdr-plugin-softhdcuvid.git
1
0
Fork 0
Code Issues Releases Wiki Activity

More OpenGL and DRM fixes

This commit is contained in:
jojo61 2020-01-03 12:22:47 +01:00
parent fe3681f6eb
commit dfe70f4f96
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hdr.c
View File

@ -370,7 +370,7 @@ static void set_hdr_metadata(int color,int trc, AVFrameSideData *sd1, AVFrameSid
if (md) if (md)
memcpy(&md_save,md,sizeof(md_save)); memcpy(&md_save,md,sizeof(md_save));
printf("Update HDR to TRC %d color %d\n",trc,color); Debug(3,"Update HDR to TRC %d color %d\n",trc,color);
if (trc == AVCOL_TRC_BT2020_10) if (trc == AVCOL_TRC_BT2020_10)
trc = AVCOL_TRC_ARIB_STD_B67; trc = AVCOL_TRC_ARIB_STD_B67;
@ -471,6 +471,7 @@ static void set_hdr_metadata(int color,int trc, AVFrameSideData *sd1, AVFrameSid
ret = drmModeCreatePropertyBlob(render->fd_drm, &data, sizeof(data), &blob_id); ret = drmModeCreatePropertyBlob(render->fd_drm, &data, sizeof(data), &blob_id);
if (ret) { if (ret) {
printf("DRM: HDR metadata: failed blob create \n"); printf("DRM: HDR metadata: failed blob create \n");
blob_id = 0;
return; return;
} }
@ -481,11 +482,12 @@ static void set_hdr_metadata(int color,int trc, AVFrameSideData *sd1, AVFrameSid
if (blob_id) if (blob_id)
drmModeDestroyPropertyBlob(render->fd_drm, blob_id); drmModeDestroyPropertyBlob(render->fd_drm, blob_id);
blob_id = 0;
return; return;
} }
m_need_modeset = 1; m_need_modeset = 1;
printf("DRM: HDR metadata: prop set\n"); Debug(3,"DRM: HDR metadata: prop set\n");
} }

2
openglosd.cpp
View File

@ -26,7 +26,7 @@ const char *glversion = "#version 330 core ";
#ifdef RASPI #ifdef RASPI
const char *glversion = "#version 300 es"; const char *glversion = "#version 300 es";
#else #else
const char *glversion = "#version 320 es "; const char *glversion = "#version 300 es ";
#endif #endif
#endif #endif

2
shaders.h
View File

@ -6,7 +6,7 @@ const char *gl_version = "#version 330";
#ifdef RASPI #ifdef RASPI
const char *gl_version = "#version 300 es"; const char *gl_version = "#version 300 es";
#else #else
const char *gl_version = "#version 320 es "; const char *gl_version = "#version 300 es ";
#endif #endif
#endif #endif

8
video.c
View File

@ -5261,6 +5261,9 @@ static void *VideoHandlerThread(void *dummy)
} }
#ifdef PLACEBO #ifdef PLACEBO
pthread_cleanup_pop(NULL); pthread_cleanup_pop(NULL);
#endif
#ifdef USE_DRM
drm_clean_up();
#endif #endif
return dummy; return dummy;
} }
@ -6693,6 +6696,7 @@ void VideoInit(const char *display_name)
/// ///
void VideoExit(void) void VideoExit(void)
{ {
Debug(3,"Video Exit\n");
#ifndef USE_DRM #ifndef USE_DRM
if (!XlibDisplay) { // no init or failed if (!XlibDisplay) { // no init or failed
return; return;
@ -6749,9 +6753,7 @@ void VideoExit(void)
Connection = 0; Connection = 0;
} }
#endif #endif
#ifdef USE_DRM
drm_clean_up();
#endif
} }
#ifdef USE_DRM #ifdef USE_DRM