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

Cleanup

Browse Source
This commit is contained in:
jojo61 2018-11-18 15:25:43 +01:00
parent 6fd279e695
commit 56932f47e4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openglosd.cpp
View File

@ -788,10 +788,6 @@ bool cOglCmdCopyBufferToOutputFb::Execute(void) {
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
#ifdef PLACEBO #ifdef PLACEBO
// if (posd)
// free(posd);
// posd = MALLOC(unsigned char, (y+fb->Height()) * (x+fb->Width()) * 4);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glPixelStorei(GL_PACK_ALIGNMENT, 1); glPixelStorei(GL_PACK_ALIGNMENT, 1);
if (posd) if (posd)

10
video.c
View File

@ -132,7 +132,7 @@ typedef enum
#ifdef USE_GLX #ifdef USE_GLX
#include <GL/glew.h> #include <GL/glew.h>
#include <GL/gl.h> // For GL_COLOR_BUFFER_BIT #include <GL/gl.h> // For GL_COLOR_BUFFER_BIT
#include <GL/glext.h> // For GL_COLOR_BUFFER_BIT //#include <GL/glext.h> // For GL_COLOR_BUFFER_BIT
//#include <GL/glxew.h> //#include <GL/glxew.h>
#include <GL/glx.h> #include <GL/glx.h>
// only for gluErrorString // only for gluErrorString
@ -144,7 +144,7 @@ typedef enum
#ifdef CUVID #ifdef CUVID
//#define CUDA_API_PER_THREAD_DEFAULT_STREAM //#define CUDA_API_PER_THREAD_DEFAULT_STREAM
#include <GL/gl.h> // For GL_COLOR_BUFFER_BIT #include <GL/gl.h> // For GL_COLOR_BUFFER_BIT
#include <GL/glext.h> // For GL_COLOR_BUFFER_BIT //#include <GL/glext.h> // For GL_COLOR_BUFFER_BIT
#include <libavutil/hwcontext.h> #include <libavutil/hwcontext.h>
#include <cuda.h> #include <cuda.h>
//#include <dynlink_cuda.h> //#include <dynlink_cuda.h>
@ -3568,7 +3568,7 @@ static void CuvidDisplayFrame(void)
struct pl_swapchain_frame frame; struct pl_swapchain_frame frame;
struct pl_render_target target; struct pl_render_target target;
bool ok; bool ok;
static int test; const float black[4] = { 0.0f,0.0f,0.0f,1.0f};
#endif #endif
@ -3599,6 +3599,8 @@ static void CuvidDisplayFrame(void)
pl_render_target_from_swapchain(&target, &frame); // make target frame pl_render_target_from_swapchain(&target, &frame); // make target frame
pl_tex_clear(p->gpu,target.fbo,black); // clear frame
target.repr.sys = PL_COLOR_SYSTEM_RGB; target.repr.sys = PL_COLOR_SYSTEM_RGB;
target.repr.levels = PL_COLOR_LEVELS_PC; target.repr.levels = PL_COLOR_LEVELS_PC;
target.repr.alpha = PL_ALPHA_UNKNOWN; target.repr.alpha = PL_ALPHA_UNKNOWN;
@ -4434,6 +4436,7 @@ void VideoOsdClear(void)
#ifdef PLACEBO #ifdef PLACEBO
OsdShown = 0; OsdShown = 0;
#else #else
VideoThreadLock(); VideoThreadLock();
VideoUsedModule->OsdClear(); VideoUsedModule->OsdClear();
@ -4492,6 +4495,7 @@ void VideoOsdDrawARGB(int xi, int yi, int width, int height, int pitch,
#ifdef USE_OPENGLOSD #ifdef USE_OPENGLOSD
void ActivateOsd(GLuint texture, int x, int y, int xsize, int ysize) { void ActivateOsd(GLuint texture, int x, int y, int xsize, int ysize) {
//printf("OSD open %d %d %d %d\n",x,y,xsize,ysize);
OsdShown = 1; OsdShown = 1;
OSDfb = texture; OSDfb = texture;
OSDtexture = texture; OSDtexture = texture;